From 4f2e656998db6e26e38998abf7a271a61f08b2da Mon Sep 17 00:00:00 2001 From: Jamie Date: Sun, 2 Feb 2025 15:27:26 +0000 Subject: [PATCH 1/3] Update to 1.21.4 --- build.gradle | 2 +- gradle.properties | 14 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../removehud/mixin/RemoveHudButNotHand.java | 72 +++++++++++-------- 4 files changed, 52 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 0136235..0f1af7a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 3b90e38..5d70025 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.21 - yarn_mappings=1.21+build.4 - loader_version=0.15.11 + minecraft_version=1.21.4 + yarn_mappings=1.21.4+build.8 + loader_version=0.16.10 # Mod Properties - mod_version = 1.3b5 + mod_version = 1.3b6 maven_group = ca.blutopia archives_base_name = removehud # Dependencies - fabric_version=0.100.4+1.21 - modmenu_version=11.0.1 - clothconfig_version=15.0.127 + fabric_version=0.115.1+1.21.4 + modmenu_version=13.0.1 + clothconfig_version=17.0.144 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..e48eca5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ca/blutopia/removehud/mixin/RemoveHudButNotHand.java b/src/main/java/ca/blutopia/removehud/mixin/RemoveHudButNotHand.java index 45005f2..1082592 100644 --- a/src/main/java/ca/blutopia/removehud/mixin/RemoveHudButNotHand.java +++ b/src/main/java/ca/blutopia/removehud/mixin/RemoveHudButNotHand.java @@ -28,8 +28,8 @@ public void renderHotBar(DrawContext context, RenderTickCounter tickCounter, Cal method = "renderHotbar(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/render/RenderTickCounter;)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 1) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 2) private int modifyHotbarX(int value) { return value + ModConfig.INSTANCE.HotBarXOffset; } @@ -38,8 +38,8 @@ private int modifyHotbarX(int value) { method = "renderHotbar(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/render/RenderTickCounter;)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 2) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 3) private int modifyHotbarY(int value) { return value + ModConfig.INSTANCE.HotBarYOffset; } @@ -137,8 +137,8 @@ private static void renderArmor(DrawContext context, PlayerEntity player, int i, method = "renderArmor(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;IIII)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 1) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 2) private static int modifyArmorBarX(int value) { return value + ModConfig.INSTANCE.ArmorXOffset; } @@ -147,8 +147,8 @@ private static int modifyArmorBarX(int value) { method = "renderArmor(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;IIII)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 2) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 3) private static int modifyArmorBarY(int value) { return value + ModConfig.INSTANCE.ArmorYOffset; } @@ -164,8 +164,8 @@ public void renderFood(DrawContext context, PlayerEntity player, int top, int ri method = "renderFood(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;II)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 1) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 2) private int modifyFoodBarX(int value) { return value + ModConfig.INSTANCE.FoodXOffset; } @@ -174,23 +174,37 @@ private int modifyFoodBarX(int value) { method = "renderFood(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;II)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 2) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 3) private int modifyFoodBarY(int value) { return value + ModConfig.INSTANCE.FoodYOffset; } - @Redirect(method = "renderStatusBars(Lnet/minecraft/client/gui/DrawContext;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", ordinal = 0)) - private void renderAirBubbles(DrawContext instance, Identifier texture, int x, int y, int width, int height) { - if (ModConfig.INSTANCE.AirBar) { - instance.drawGuiTexture(texture, x + ModConfig.INSTANCE.AirXOffset, y + ModConfig.INSTANCE.AirYOffset, width, height); + @Inject(method = "renderAirBubbles(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;III)V", at = @At("HEAD"), cancellable = true) + public void renderAirBubbles(DrawContext context, PlayerEntity player, int heartCount, int top, int left, CallbackInfo ci) { + if (!ModConfig.INSTANCE.AirBar) { + ci.cancel(); } } - @Redirect(method = "renderStatusBars(Lnet/minecraft/client/gui/DrawContext;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", ordinal = 1)) - private void renderBurstingAirBubble(DrawContext instance, Identifier texture, int x, int y, int width, int height) { - if (ModConfig.INSTANCE.AirBar) { - instance.drawGuiTexture(texture, x + ModConfig.INSTANCE.AirXOffset, y + ModConfig.INSTANCE.AirYOffset, width, height); - } + + @ModifyArg( + method = "renderAirBubbles(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;III)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 2) + private int modifyAirBubblesX(int value) { + return value + ModConfig.INSTANCE.AirXOffset; + } + + @ModifyArg( + method = "renderAirBubbles(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;III)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 3) + private int modifyAirBubblesY(int value) { + return value + ModConfig.INSTANCE.AirYOffset; } @Inject(method = "renderMountHealth(Lnet/minecraft/client/gui/DrawContext;)V", at = @At("HEAD"), cancellable = true) @@ -294,8 +308,8 @@ public void renderExperienceBar(DrawContext context, int x, CallbackInfo ci) { method = "renderExperienceBar(Lnet/minecraft/client/gui/DrawContext;I)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 1) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 2) private int modifyExperienceBarBackgroundX(int value) { return value + ModConfig.INSTANCE.ExpBarXOffset; } @@ -304,8 +318,8 @@ private int modifyExperienceBarBackgroundX(int value) { method = "renderExperienceBar(Lnet/minecraft/client/gui/DrawContext;I)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"), - index = 2) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"), + index = 3) private int modifyExperienceBarBackgroundY(int value) { return value + ModConfig.INSTANCE.ExpBarYOffset; } @@ -314,8 +328,8 @@ private int modifyExperienceBarBackgroundY(int value) { method = "renderExperienceBar(Lnet/minecraft/client/gui/DrawContext;I)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIIIIII)V"), - index = 5) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIIIII)V"), + index = 6) private int modifyExperienceBarForegroundX(int value) { return value + ModConfig.INSTANCE.ExpBarXOffset; } @@ -324,8 +338,8 @@ private int modifyExperienceBarForegroundX(int value) { method = "renderExperienceBar(Lnet/minecraft/client/gui/DrawContext;I)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIIIIII)V"), - index = 6) + target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIIIII)V"), + index = 7) private int modifyExperienceBarForegroundY(int value) { return value + ModConfig.INSTANCE.ExpBarYOffset; } From 93d7188055ca504f8033d11ae51d7a44f50e2bb6 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:23:22 -0500 Subject: [PATCH 2/3] update build pipelines --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3075a21..1409127 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: run: ./gradlew build - name: capture build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ From d22de1b7698b1d03fc7c5e779764000ca8821c7d Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:24:20 -0500 Subject: [PATCH 3/3] oops wrong version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1409127..3a0a1f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: run: ./gradlew build - name: capture build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Artifacts path: build/libs/