Merge branch 'main' into hud-api

Author: Madis0

.github/workflows/build.yml

@@ -12,16 +12,16 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          21,    # Current Java LTS
+          25,    # Current Java LTS
         ]
     runs-on: ubuntu-22.04
     steps:
       - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v5
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5.2.0
         with:
           java-version: ${{ matrix.java }}
           distribution: 'microsoft'
@@ -30,8 +30,8 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
-        uses: actions/upload-artifact@v4
+        if: ${{ matrix.java == '25' }} # Only upload artifacts built from latest java
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: Artifacts
           path: build/libs/

build.gradle

@@ -73,7 +73,7 @@ java {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}"}
 	}
 }
 

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.configuration-cache=false
 	loom_version=1.15-SNAPSHOT
 
 # Mod Properties
-	mod_version = 5.3.0
+	mod_version = 5.2.1
 	maven_group = io.github.madis0
 	archives_base_name = onebar
 

src/main/java/io/github/madis0/OneBarElements.java

@@ -30,6 +30,7 @@ public class OneBarElements {
     private final PlayerProperties playerProperties = new PlayerProperties();
     private final Minecraft client = Minecraft.getInstance();
     private final Difficulty difficulty = Objects.requireNonNull(client.getCameraEntity()).level().getDifficulty();
+    private final GuiGraphicsExtractor drawContext;
     private final Font textRenderer = client.font;
     private GuiGraphicsExtractor drawContext;
 

src/main/java/io/github/madis0/mixin/BossBarHudMixin.java

@@ -10,7 +10,7 @@
 @Mixin(BossHealthOverlay.class)
 public abstract class BossBarHudMixin {
     @ModifyConstant(
-            method = "render(Lnet/minecraft/client/gui/GuiGraphics;)V",
+            method = "extractRenderState(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V",
             constant = @Constant(intValue = 12)
     )
     private int adjustBossBarStartY(int original) {

src/main/java/io/github/madis0/mixin/InGameHudMixin.java

@@ -10,13 +10,40 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.Gui.ContextualInfo;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.world.entity.LivingEntity;
 
 @Mixin(value = Gui.class)
 public abstract class InGameHudMixin {
     @Shadow protected abstract LivingEntity getPlayerVehicleWithHealth();
 
-    private boolean showOneBar = MixinConfigQuery.isOneBarEnabled();;
+    private OneBarElements oneBarElements;
+    private boolean showOneBar = false;
+
+    @Inject(at = @At("HEAD"), method = "extractRenderState")
+    public void render(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci) {
+        oneBarElements = new OneBarElements(context);
+        showOneBar = MixinConfigQuery.isOneBarEnabled(); // This var exists because it also shows whether oneBarElements is initialized
+
+        boolean barsVisible = !minecraft.options.hideGui && Objects.requireNonNull(minecraft.gameMode).canHurtPlayer();
+        if(showOneBar && barsVisible) oneBarElements.renderOneBar();
+        if(showOneBar && MixinConfigQuery.showMountJump() && !minecraft.options.hideGui) oneBarElements.mountJumpBar();
+
+        PlayerProperties.setLocatorBarAvailable(minecraft.player.connection.getWaypointManager().hasWaypoints());
+    }
+
+    @Inject(method = "extractPlayerHealth", at = @At(value = "HEAD"), cancellable = true)
+    private void hideHud(GuiGraphicsExtractor context, CallbackInfo ci){
+        if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
+            ci.cancel();
+    }
+
+    @Inject(method = "extractVehicleHealth", at = @At(value = "HEAD"), cancellable = true)
+    private void hideMountHealth(GuiGraphicsExtractor context, CallbackInfo ci) {
+        if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
+            ci.cancel();
+        oneBarElements.mountBar(getPlayerVehicleWithHealth());
+    }
 
     @Inject(method = "nextContextualInfoState", at = @At("HEAD"), cancellable = true)
     private void forceLocatorBar(CallbackInfoReturnable<ContextualInfo> cir) {
@@ -29,7 +56,7 @@ private void forceLocatorBar(CallbackInfoReturnable<ContextualInfo> cir) {
         }
     }
 
-    @ModifyVariable(method = "renderSelectedItemName", at = @At(value = "STORE"), ordinal = 2)
+    @ModifyVariable(method = "extractSelectedItemName", at = @At(value = "STORE"), name = "y")
     private int renderHeldItemTooltip(int k) {
         if (!showOneBar || !MixinConfigQuery.isHotbarTooltipsDown()) {
             return k;

src/main/java/io/github/madis0/mixin/LocatorBarMixin.java

@@ -15,10 +15,10 @@
 public abstract class LocatorBarMixin {
 
     @ModifyArg(
-            method = "renderBackground(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V",
+            method = "extractBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V"
+                    target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V"
             ),
             index = 3
     )
@@ -30,7 +30,7 @@ private int modifyHeightBar(int original) {
     }
 
     @ModifyVariable(
-            method = "render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V",
+            method = "extractRenderState(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V",
             at = @At("STORE"), // Could also use "LOAD" depending on when you want to intercept
             index = 3
     )

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
   "accessWidener": "guicontextualinfo.accesswidener",
   "depends": {
     "fabric-api": "*",
-    "cloth-config2": "*",
+    "cloth-config": "*",
     "minecraft": ">=26.1-"
   },
   "suggests": {