From 28de853166e040fac837085747741943b96880c6 Mon Sep 17 00:00:00 2001 From: Enrico Messall Date: Wed, 18 Sep 2024 09:59:28 +0200 Subject: [PATCH 1/2] Fixes #163 + Adjusted RenderEventHandler to be added to layeredDrawer --- .../dy/masa/malilib/mixin/MixinInGameHud.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java b/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java index c987a2b243..fb0028f08a 100644 --- a/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java +++ b/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java @@ -1,25 +1,33 @@ package fi.dy.masa.malilib.mixin; +import fi.dy.masa.malilib.event.RenderEventHandler; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.LayeredDrawer; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.render.RenderTickCounter; import org.spongepowered.asm.mixin.Final; 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.callback.CallbackInfo; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.render.RenderTickCounter; -import fi.dy.masa.malilib.event.RenderEventHandler; -@Mixin(InGameHud.class) -public abstract class MixinInGameHud -{ - @Shadow @Final private MinecraftClient client; +@Mixin(value = InGameHud.class) +public abstract class MixinInGameHud { + @Shadow + @Final + private MinecraftClient client; + @Shadow + @Final + private LayeredDrawer layeredDrawer; + + @Inject(method = "", at = @At("TAIL")) + private void onInit(CallbackInfo info) { + this.layeredDrawer.addLayer(this::renderChatOverwrite); + } - @Inject(method = "render", at = @At("RETURN")) - private void onGameOverlayPost(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) - { + private void renderChatOverwrite(DrawContext context, RenderTickCounter tickCounter) { ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderGameOverlayPost(context, this.client, tickCounter.getTickDelta(false)); } } From fdbab69be1ef7a3f56feeff8be7263b337107f4d Mon Sep 17 00:00:00 2001 From: Enrico Messall Date: Wed, 18 Sep 2024 10:03:22 +0200 Subject: [PATCH 2/2] Fixes #163 + Adjusted naming to match malilib --- src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java b/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java index fb0028f08a..6f6827e713 100644 --- a/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java +++ b/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java @@ -24,10 +24,10 @@ public abstract class MixinInGameHud { @Inject(method = "", at = @At("TAIL")) private void onInit(CallbackInfo info) { - this.layeredDrawer.addLayer(this::renderChatOverwrite); + this.layeredDrawer.addLayer(this::renderGameOverlayPost); } - private void renderChatOverwrite(DrawContext context, RenderTickCounter tickCounter) { + private void renderGameOverlayPost(DrawContext context, RenderTickCounter tickCounter) { ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderGameOverlayPost(context, this.client, tickCounter.getTickDelta(false)); } }