Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 29 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
name: Java CI - Build on Push
name: Build FTB Backups 3 (NeoForge 26.2)

on:
push:
branches: [ main, dev, "1.**" ]
branches: [ "**" ]
pull_request:
branches: [ "**" ]
workflow_dispatch:
inputs:
skip_maven_publish:
description: 'Skip Maven publishing'
required: true
default: 'false'

jobs:
build:
if: |
!contains(github.event.head_commit.message, '[ciskip]')
uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
with:
curse-publish-task: ""
maven-snapshots: true
java-version: 25
secrets:
ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
saps-token: ${{ secrets.SAPS_TOKEN }}
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Setup Java 25
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '25'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Make gradlew executable
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew jar -x test --warning-mode=none

- name: Upload Build Artifacts
uses: actions/upload-artifact@v4
with:
name: ftb-backups-3-jars
path: build/libs/*.jar
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java-library'
id 'idea'
id 'maven-publish'
id 'net.neoforged.moddev' version '2.0.140'
id 'net.neoforged.moddev' version '2.0.148'
id "me.modmuss50.mod-publish-plugin" version "2.1.1"
}

Expand Down Expand Up @@ -75,6 +75,7 @@ configurations {
}

repositories {
mavenLocal()
mavenCentral()
commonMavenRepos(repositories)
}
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=true
org.gradle.daemon=false
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.configuration-cache=false

archives_base_name=ftb-backups-3
maven_group=dev.ftb.mods

mod_id=ftbbackups3
mod_name=FTB Backups 3
mod_version=2
mod_version=1

minecraft_version=26.1.2
supported_minecraft_versions=26.1,26.1.1,26.1.2
minecraft_version_range=[26.1,27)
minecraft_version=26.2
supported_minecraft_versions=26.2
minecraft_version_range=[26.2,27)

neoforge_version=26.1.2.95
neoforge_version_range=[26.1.2.71,27)
neoforge_version=26.2.0.88
neoforge_version_range=[26.2.0.88,27)
neoforge_loader_version=4

#CurseForge
curseforge_id=1294188

#Deps
ftb_library_version=26.1.2.7
ftb_library_version_range=[26.1.2.7,27)
ftb_library_version=26.2.0.10-SNAPSHOT
ftb_library_version_range=[26.2.0.10,27)
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private static void addRestoreButton(ScreenEvent.Init.Post event) {
Component btnLabel = Component.translatable("ftbbackups3.gui.restore").append("...");
Component title = Component.translatable("ftbbackups3.gui.restore");
int w = sws.getMinecraft().font.width(btnLabel) + 20;
event.addListener(Button.builder(btnLabel, _ -> Minecraft.getInstance().setScreen(new RestoreBackupScreen(sws, title)))
event.addListener(Button.builder(btnLabel, _ -> Minecraft.getInstance().gui.setScreen(new RestoreBackupScreen(sws, title)))
.bounds(sws.width - w - 10, 22, w, 20)
.tooltip(Tooltip.create(Component.translatable("ftbbackups3.gui.restore.tooltip")))
.build(RestoreButton::new)
Expand All @@ -56,7 +56,7 @@ private static void addRestoreButton(ScreenEvent.Init.Post event) {
}

public static void repositionRestoreButton() {
if (Minecraft.getInstance().screen instanceof SelectWorldScreen sws) {
if (Minecraft.getInstance().gui.screen() instanceof SelectWorldScreen sws) {
sws.children().forEach(w -> {
if (w instanceof RestoreButton btn) {
btn.setPosition(sws.width - btn.getWidth() - 10, 22);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ private void onActivate() {
BackupsList.Entry selected = backupsList.getSelected();

if (selected != null) {
minecraft.setScreen(new ConfirmScreen(confirmed -> doRestore(confirmed, selected),
minecraft.gui.setScreen(new ConfirmScreen(confirmed -> doRestore(confirmed, selected),
Component.translatable("ftbbackups3.gui.confirm_restore", selected.backup.worldName(), selected.backup.fileId()),
Component.translatable("ftbbackups3.gui.confirm_restore.line_2"))
);
}
}

private void doRestore(boolean confirmed, BackupsList.Entry selected) {
minecraft.setScreen(this);
minecraft.gui.setScreen(this);

if (confirmed) {
Path backupsFolder = FTBBackupsServerConfig.getBackupFolder();
Expand Down Expand Up @@ -137,7 +137,7 @@ protected void setInitialFocus() {

@Override
public void onClose() {
minecraft.setScreen(prevScreen);
minecraft.gui.setScreen(prevScreen);
}

@Override
Expand Down