fix changes in 1.19.4 which break in 1.20

DFOnline · Jun 11, 2023 · 4811e4a · 4811e4a
1 parent 6318bf4
commit 4811e4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/dev/dfonline/codeclient/config/Config.java b/src/main/java/dev/dfonline/codeclient/config/Config.java
@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 import dev.dfonline.codeclient.CodeClient;
 import dev.dfonline.codeclient.FileManager;
-import dev.dfonline.codeclient.actiondump.ActionDump;
+import dev.dfonline.codeclient.hypercube.actiondump.ActionDump;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.controller.*;
 import net.minecraft.text.Text;

diff --git a/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MItemRenderer.java b/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MItemRenderer.java
@@ -4,21 +4,28 @@
 import com.google.gson.JsonParser;
 import dev.dfonline.codeclient.hypercube.item.Scope;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtString;
 import net.minecraft.text.Text;
+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;
 
-@Mixin(ItemRenderer.class)
-public class MItemRenderer {
-    @Inject(method = "renderGuiItemOverlay(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;push()V", shift = At.Shift.AFTER))
-    private void additionalItemRendering(MatrixStack matrices, TextRenderer textRenderer, ItemStack stack, int x, int y, String countLabel, CallbackInfo ci) {
+@Mixin(DrawContext.class)
+public abstract class MItemRenderer {
+    @Shadow @Final private MatrixStack matrices;
+
+    @Shadow public abstract int drawText(TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow);
+
+    @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;push()V", shift = At.Shift.AFTER))
+    private void additionalItemRendering(TextRenderer textRenderer, ItemStack stack, int x, int y, String countOverride, CallbackInfo ci) {
         NbtCompound nbt = stack.getNbt();
         if(nbt == null) return;
         NbtCompound pbv = (NbtCompound) nbt.get("PublicBukkitValues");
@@ -30,9 +37,9 @@ private void additionalItemRendering(MatrixStack matrices, TextRenderer textRend
         JsonObject data = var.get("data").getAsJsonObject();
         String scopeName = data.get("scope").getAsString();
 
-        matrices.translate(0.0F, 0.0F, 200.0F);
+        this.matrices.translate(0.0F, 0.0F, 200.0F);
         Scope scope = Scope.valueOf(scopeName);
-        textRenderer.drawWithShadow(matrices,Text.literal(scope.shortName).formatted(scope.color),x,y,0xFFFFFF);
+        this.drawText(textRenderer,Text.literal(scope.shortName).formatted(scope.color),x,y,0xFFFFFF,false);
         matrices.translate(0.0F, 0.0F, -200.0F);
     }
 }