fix title overlay

KessokuTeaTime · Mar 6, 2024 · 419707a · 419707a
1 parent c71b6a5
commit 419707a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/src/main/java/net/krlite/verticality/mixin/InGameHudBarAdjustor.java b/src/main/java/net/krlite/verticality/mixin/InGameHudBarAdjustor.java
@@ -19,10 +19,11 @@ public abstract class InGameHudBarAdjustor {
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/gui/hud/InGameHud;drawTextBackground(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/font/TextRenderer;III)V",
-                    shift = At.Shift.BEFORE
+                    shift = At.Shift.BEFORE,
+                    ordinal = 0
             )
     )
-    private void renderOverlay(DrawContext context, float tickDelta, CallbackInfo ci) {
+    private void renderOverlayMessage(DrawContext context, float tickDelta, CallbackInfo ci) {
         context.getMatrices().translate(
                 0,
                 Verticality.hotbarShift() * Verticality.later() + (Verticality.HOTBAR_FULL_HEIGHT + Verticality.GAP) * Verticality.alternativeTransition(),

diff --git a/src/main/java/net/krlite/verticality/mixin/InGameHudItemAdjustor.java b/src/main/java/net/krlite/verticality/mixin/InGameHudItemAdjustor.java
@@ -14,8 +14,7 @@
 
 @Mixin(InGameHud.class)
 public abstract class InGameHudItemAdjustor {
-    @Shadow
-    protected abstract void renderHotbarItem(DrawContext context, int x, int y, float tickDelta, PlayerEntity playerEntity, ItemStack itemStack, int seed);
+    @Shadow protected abstract void renderHotbarItem(DrawContext context, int x, int y, float tickDelta, PlayerEntity playerEntity, ItemStack itemStack, int seed);
 
     @Redirect(
             method = "renderHotbar",

diff --git a/src/main/java/net/krlite/verticality/mixin/InGameHudMixin.java b/src/main/java/net/krlite/verticality/mixin/InGameHudMixin.java
@@ -33,44 +33,47 @@
 
 @Mixin(InGameHud.class)
 public abstract class InGameHudMixin {
-	@Shadow @Final private static Identifier HOTBAR_OFFHAND_LEFT_TEXTURE;
+	@Shadow @Final private MinecraftClient client;
+	@Shadow @Final private Random random;
+	@Shadow private long heartJumpEndTick;
+	@Shadow private int ticks;
+	@Shadow private int renderHealthValue;
 
-	@Shadow @Final private static Identifier HOTBAR_OFFHAND_RIGHT_TEXTURE;
 
-	@Shadow public abstract TextRenderer getTextRenderer();
 
-	@Shadow @Final private MinecraftClient client;
+	@Shadow @Final private static Identifier HOTBAR_OFFHAND_LEFT_TEXTURE;
+	@Shadow @Final private static Identifier HOTBAR_OFFHAND_RIGHT_TEXTURE;
 
 	@Shadow @Final private static Identifier JUMP_BAR_BACKGROUND_TEXTURE;
 	@Shadow @Final private static Identifier JUMP_BAR_COOLDOWN_TEXTURE;
 	@Shadow @Final private static Identifier JUMP_BAR_PROGRESS_TEXTURE;
+
 	@Shadow @Final private static Identifier EXPERIENCE_BAR_PROGRESS_TEXTURE;
 	@Shadow @Final private static Identifier EXPERIENCE_BAR_BACKGROUND_TEXTURE;
 
-	@Shadow protected abstract void drawHeart(DrawContext context, InGameHud.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half);
-
-	@Shadow private long heartJumpEndTick;
-	@Shadow private int ticks;
-	@Shadow private int renderHealthValue;
-
-	@Shadow protected abstract int getHeartCount(LivingEntity entity);
-
-	@Shadow protected abstract LivingEntity getRiddenEntity();
-
 	@Shadow @Final private static Identifier FOOD_EMPTY_HUNGER_TEXTURE;
 	@Shadow @Final private static Identifier FOOD_HALF_HUNGER_TEXTURE;
 	@Shadow @Final private static Identifier FOOD_FULL_HUNGER_TEXTURE;
 	@Shadow @Final private static Identifier FOOD_EMPTY_TEXTURE;
 	@Shadow @Final private static Identifier FOOD_HALF_TEXTURE;
 	@Shadow @Final private static Identifier FOOD_FULL_TEXTURE;
+
 	@Shadow @Final private static Identifier VEHICLE_CONTAINER_HEART_TEXTURE;
 	@Shadow @Final private static Identifier VEHICLE_HALF_HEART_TEXTURE;
 	@Shadow @Final private static Identifier VEHICLE_FULL_HEART_TEXTURE;
+
 	@Shadow @Final private static Identifier ARMOR_HALF_TEXTURE;
 	@Shadow @Final private static Identifier ARMOR_FULL_TEXTURE;
+
 	@Shadow @Final private static Identifier AIR_BURSTING_TEXTURE;
 	@Shadow @Final private static Identifier AIR_TEXTURE;
-	@Shadow @Final private Random random;
+
+
+
+	@Shadow public abstract TextRenderer getTextRenderer();
+	@Shadow protected abstract int getHeartCount(LivingEntity entity);
+	@Shadow protected abstract LivingEntity getRiddenEntity();
+	@Shadow protected abstract void drawHeart(DrawContext context, InGameHud.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half);
 
 	@Unique int stackedInfo = 0;