Fix the rest of the mixins

Author: Madis0

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/mixin/BarMixin.java

@@ -11,7 +11,7 @@
 
 @Mixin(value = ContextualBarRenderer.class)
 public interface BarMixin {
-    @Inject(method = "renderExperienceLevel", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractExperienceLevel", at = @At(value = "HEAD"), cancellable = true)
     private static void hideXpLevel(GuiGraphicsExtractor context, Font textRenderer, int level, CallbackInfo ci){
         if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isCompatModeEnabled())
             ci.cancel();

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/ExperienceBarMixin.java

@@ -11,13 +11,13 @@
 
 @Mixin(value = ExperienceBarRenderer.class)
 public abstract class ExperienceBarMixin {
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
             ci.cancel();
     }
 
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
             ci.cancel();

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

@@ -25,7 +25,7 @@ public abstract class InGameHudMixin {
     private OneBarElements oneBarElements;
     private boolean showOneBar = false;
 
-    @Inject(at = @At("HEAD"), method = "render")
+    @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
@@ -37,13 +37,13 @@ public void render(GuiGraphicsExtractor context, DeltaTracker tickCounter, Callb
         PlayerProperties.setLocatorBarAvailable(minecraft.player.connection.getWaypointManager().hasWaypoints());
     }
 
-    @Inject(method = "renderPlayerHealth", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractPlayerHealth", at = @At(value = "HEAD"), cancellable = true)
     private void hideHud(GuiGraphicsExtractor context, CallbackInfo ci){
         if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
             ci.cancel();
     }
 
-    @Inject(method = "renderVehicleHealth", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractVehicleHealth", at = @At(value = "HEAD"), cancellable = true)
     private void hideMountHealth(GuiGraphicsExtractor context, CallbackInfo ci) {
         if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
             ci.cancel();
@@ -61,7 +61,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/JumpBarMixin.java

@@ -14,13 +14,13 @@
 @Mixin(value = JumpableVehicleBarRenderer.class)
 public abstract class JumpBarMixin {
 
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
             ci.cancel();
     }
 
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
             ci.cancel();

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
     )
@@ -41,13 +41,13 @@ private int modifyHeightAddons(int original) {
         return MixinConfigQuery.getLocatorBarHeight();
     }
 
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isLocatorBarEnabled())
             ci.cancel();
     }
 
-    @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
     private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
         if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isLocatorBarEnabled())
             ci.cancel();