From f37fef7ea717b7f37c350877be47286a99e2dbef Mon Sep 17 00:00:00 2001 From: Boxadactle Date: Mon, 19 Aug 2024 21:53:37 -0700 Subject: [PATCH] update to 1.20.4 --- .github/workflows/build.yml | 4 ++-- .github/workflows/compile.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- build.gradle | 6 ++--- .../mixin/ControlsScreenMixin.java | 24 +++++++++---------- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 15 ++++++------ 7 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 481a9bd..95b3377 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Set up gradlew diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index f419928..e77782f 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Set up gradlew diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index be12d86..b913478 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Set up gradlew diff --git a/build.gradle b/build.gradle index 4d74973..f439e2b 100644 --- a/build.gradle +++ b/build.gradle @@ -41,12 +41,12 @@ subprojects { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } // Configure Maven publishing. diff --git a/common/src/main/java/dev/boxadactle/debugkeybind/mixin/ControlsScreenMixin.java b/common/src/main/java/dev/boxadactle/debugkeybind/mixin/ControlsScreenMixin.java index 1bb66c4..80eaf9e 100644 --- a/common/src/main/java/dev/boxadactle/debugkeybind/mixin/ControlsScreenMixin.java +++ b/common/src/main/java/dev/boxadactle/debugkeybind/mixin/ControlsScreenMixin.java @@ -2,18 +2,24 @@ import dev.boxadactle.debugkeybind.gui.DebugKeybindsScreen; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.OptionsList; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.controls.ControlsScreen; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.List; + @Mixin(ControlsScreen.class) public abstract class ControlsScreenMixin extends Screen { + @Shadow @Nullable private OptionsList list; + protected ControlsScreenMixin(Component component) { super(component); } @@ -29,19 +35,11 @@ private void addButton(CallbackInfo ci) { (b) -> minecraft.setScreen(new DebugKeybindsScreen(this)) ).bounds(j, k, 150, 20).build() ); - } - @ModifyArg( - method = "init", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/gui/components/Button$Builder;bounds(IIII)Lnet/minecraft/client/gui/components/Button$Builder;", - ordinal = 2 - ), - index = 1 - ) - private int modifyButtonY(int y) { - return y + 24; + list.addSmall(List.of(Button.builder( + Component.translatable("controls.keybinds.debug"), + (b) -> minecraft.setScreen(new DebugKeybindsScreen(this)) + ).build())); } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index a0b2c93..f31ad0a 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -27,6 +27,6 @@ side="BOTH" [[dependencies.debugkeybind]] modId="boxlib" mandatory=true -versionRange="[11.0.0,12.0.0)" +versionRange="[13.0.0,14.0.0)" ordering="NONE" side="CLIENT" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 28b85a0..7628d6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,24 +3,25 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 10.0.0 +mod_version = 11.0.0 maven_group = dev.boxadactle archives_name = DebugKeybind enabled_platforms = fabric,forge # Minecraft properties -minecraft_version = 1.20.4 +minecraft_version = 1.20.6 # Dependencies fabric_loader_version = 0.15.11 -fabric_api_version = 0.97.1+1.20.4 -forge_version = 49.1.4 +fabric_api_version = 0.100.4+1.20.6 +neoforge_version = 20.6.119 +forge_version = 50.1.12 -modmenu_version = 9.2.0 -boxlib_version = 12.1.3 +modmenu_version = 10.0.0 +boxlib_version = 13.3.2 #publishing -game_versions = 1.20.4,1.20.3 +game_versions = 1.20.6,1.20.5 project_id_curseforge = 901782 project_id_modrinth = DX9ioka8 release_type = release