fix map ToolTip, and what broke with the last item in the shulker box…

… preview ?
sakura-ryoko · Sep 19, 2024 · a6ce1e1 · a6ce1e1
1 parent a5d44a1
commit a6ce1e1
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 32 deletions.
diff --git a/src/main/java/fi/dy/masa/malilib/MaLiLibInitHandler.java b/src/main/java/fi/dy/masa/malilib/MaLiLibInitHandler.java
@@ -26,8 +26,8 @@ public void registerModHandlers()
         IRenderer renderer = new TestRenderHandler();
         RenderEventHandler.getInstance().registerGameOverlayRenderer(renderer);
         RenderEventHandler.getInstance().registerTooltipLastRenderer(renderer);
-        RenderEventHandler.getInstance().registerWorldPreWeatherRenderer(renderer);
-        RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
+        //RenderEventHandler.getInstance().registerWorldPreWeatherRenderer(renderer);
+        //RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
 
         SyncHandler.getInstance().registerSyncProvider(new TestDataSync());
     }

diff --git a/...mixin/test/IMixinAbstractHorseEntity.java → ...ilib/mixin/IMixinAbstractHorseEntity.java b/...mixin/test/IMixinAbstractHorseEntity.java → ...ilib/mixin/IMixinAbstractHorseEntity.java
@@ -1,4 +1,4 @@
-package fi.dy.masa.malilib.mixin.test;
+package fi.dy.masa.malilib.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

diff --git a/...ib/mixin/test/IMixinDataQueryHandler.java → ...malilib/mixin/IMixinDataQueryHandler.java b/...ib/mixin/test/IMixinDataQueryHandler.java → ...malilib/mixin/IMixinDataQueryHandler.java
@@ -1,4 +1,4 @@
-package fi.dy.masa.malilib.mixin.test;
+package fi.dy.masa.malilib.mixin;
 
 import net.minecraft.client.network.DataQueryHandler;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...xinClientPlayNetworkHandler_NbtQuery.java → ...xinClientPlayNetworkHandler_NbtQuery.java b/...xinClientPlayNetworkHandler_NbtQuery.java → ...xinClientPlayNetworkHandler_NbtQuery.java
@@ -1,4 +1,4 @@
-package fi.dy.masa.malilib.mixin.test;
+package fi.dy.masa.malilib.mixin;
 
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.nbt.NbtCompound;

diff --git a/src/main/java/fi/dy/masa/malilib/mixin/MixinDrawContext.java b/src/main/java/fi/dy/masa/malilib/mixin/MixinDrawContext.java
@@ -1,22 +1,25 @@
 package fi.dy.masa.malilib.mixin;
 
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.item.ItemStack;
 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.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.item.ItemStack;
-
 import fi.dy.masa.malilib.event.RenderEventHandler;
 
 @Mixin(DrawContext.class)
 public abstract class MixinDrawContext
 {
+    @Shadow public abstract void draw();
+
     @Inject(method = "drawItemTooltip", at = @At(value = "RETURN"))
     private void onRenderTooltip(TextRenderer textRenderer, ItemStack stack, int x, int y, CallbackInfo ci)
     {
         ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderTooltipLast((DrawContext) (Object) this, stack, x, y);
+        this.draw();
     }
 }
diff --git a/src/main/java/fi/dy/masa/malilib/mixin/MixinHandledScreen.java b/src/main/java/fi/dy/masa/malilib/mixin/MixinHandledScreen.java
@@ -25,6 +25,7 @@ private void onRenderTooltip(DrawContext drawContext, int x, int y, CallbackInfo
         if (this.focusedSlot != null && this.focusedSlot.hasStack())
         {
             ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderTooltipLast(drawContext, this.focusedSlot.getStack(), x, y);
+            drawContext.draw();
         }
     }
 }
diff --git a/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java b/src/main/java/fi/dy/masa/malilib/mixin/MixinInGameHud.java
@@ -23,12 +23,18 @@ public abstract class MixinInGameHud
     @Inject(method = "<init>", at = @At("TAIL"))
     private void malilib_onInit(CallbackInfo info)
     {
-        this.layeredDrawer.addLayer(this::malilib_onGameOverlayPost);
+        this.layeredDrawer.addLayer(this::malilib_renderGameOverlay);
+    }
+
+    @Inject(method = "render", at = @At("TAIL"))
+    private void malilib_onGameOverlayPost(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci)
+    {
+        this.malilib_renderGameOverlay(context, tickCounter);
+        //((RenderEventHandler) RenderEventHandler.getInstance()).onRenderGameOverlayPost(context, this.client, tickCounter.getTickDelta(false));
     }
 
-    //@Inject(method = "render", at = @At("RETURN"))
     @Unique
-    private void malilib_onGameOverlayPost(DrawContext context, RenderTickCounter tickCounter)
+    private void malilib_renderGameOverlay(DrawContext context, RenderTickCounter tickCounter)
     {
         ((RenderEventHandler) RenderEventHandler.getInstance()).onRenderGameOverlayPost(context, this.client, tickCounter.getTickDelta(false));
     }

diff --git a/src/main/java/fi/dy/masa/malilib/render/InventoryOverlay.java b/src/main/java/fi/dy/masa/malilib/render/InventoryOverlay.java
@@ -468,6 +468,7 @@ else if (type == InventoryRenderType.BREWING_STAND)
 
                     if (stack.isEmpty() == false)
                     {
+                        //System.out.printf("renderInventoryStacks - slot[%d/%d]: [%s]\n", slot, slots, stack);
                         renderStackAt(stack, x, y, 1, mc, drawContext, mouseX, mouseY);
                     }
 
@@ -566,6 +567,7 @@ public static void renderStackAt(ItemStack stack, float x, float y, float scale,
 
     public static void renderStackAt(ItemStack stack, float x, float y, float scale, MinecraftClient mc, DrawContext drawContext, double mouseX, double mouseY)
     {
+        //String count = stack.getCount() > 1 ? Integer.toString(stack.getCount()) : null;
         MatrixStack matrixStack = drawContext.getMatrices();
         matrixStack.push();
         matrixStack.translate(x, y, 0.f);
@@ -577,6 +579,7 @@ public static void renderStackAt(ItemStack stack, float x, float y, float scale,
         drawContext.drawItem(stack, 0, 0);
 
         RenderUtils.color(1f, 1f, 1f, 1f);
+        //System.out.printf("renderStackAt - [%s] // [%s]\n", stack, count);
         drawContext.drawItemInSlot( mc.textRenderer, stack, 0, 0);
 
         RenderUtils.color(1f, 1f, 1f, 1f);

diff --git a/src/main/java/fi/dy/masa/malilib/render/RenderUtils.java b/src/main/java/fi/dy/masa/malilib/render/RenderUtils.java
@@ -1179,12 +1179,12 @@ private static void blockTargetingOverlayTranslations(double x, double y, double
         matrix4fStack.translate((float) (-x), (float) (-y), (float) ((-z) + 0.510));
     }
 
-    public static void renderMapPreview(ItemStack stack, int x, int y, int dimensions)
+    public static void renderMapPreview(ItemStack stack, int x, int y, int dimensions, DrawContext drawContext)
     {
-        renderMapPreview(stack, x, y, dimensions, true);
+        renderMapPreview(stack, x, y, dimensions, true, drawContext);
     }
 
-    public static void renderMapPreview(ItemStack stack, int x, int y, int dimensions, boolean requireShift)
+    public static void renderMapPreview(ItemStack stack, int x, int y, int dimensions, boolean requireShift, DrawContext drawContext)
     {
         if (stack.getItem() instanceof FilledMapItem && (!requireShift || GuiBase.isShiftDown()))
         {
@@ -1195,18 +1195,29 @@ public static void renderMapPreview(ItemStack stack, int x, int y, int dimension
             int x1 = x + 8;
             int x2 = x1 + dimensions;
             int z = 300;
+            int uv = 0xF000F0;
 
             MapState mapState = FilledMapItem.getMapState(stack, mc().world);
             ComponentMap data = stack.getComponents();
             MapIdComponent mapId = data.get(DataComponentTypes.MAP_ID);
 
             Identifier bgTexture = mapState == null ? TEXTURE_MAP_BACKGROUND : TEXTURE_MAP_BACKGROUND_CHECKERBOARD;
-            bindTexture(bgTexture);
-            setupBlend();
+            //bindTexture(bgTexture);
+            VertexConsumer vertex = bindTexture(bgTexture, drawContext);
+            Matrix4f matrix4f = drawContext.getMatrices().peek().getPositionMatrix();
+            //setupBlend();
 
-            RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX_COLOR);
+            vertex.vertex(matrix4f, x1, y2, z).color(-1).texture(0.0f, 1.0f).light(uv);
+            vertex.vertex(matrix4f, x2, y2, z).color(-1).texture(1.0f, 1.0f).light(uv);
+            vertex.vertex(matrix4f, x2, y1, z).color(-1).texture(1.0f, 0.0f).light(uv);
+            vertex.vertex(matrix4f, x1, y1, z).color(-1).texture(0.0f, 0.0f).light(uv);
+
+            forceDraw(drawContext);
+
+            //RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX_COLOR);
             //RenderSystem.setShader(GameRenderer::getPositionTexProgram);
             //RenderSystem.applyModelViewMatrix();
+            /*
             Tessellator tessellator = Tessellator.getInstance();
             BufferBuilder buffer = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
             BuiltBuffer builtBuffer;
@@ -1225,6 +1236,7 @@ public static void renderMapPreview(ItemStack stack, int x, int y, int dimension
             catch (Exception ignored) { }
 
             RenderSystem.disableBlend();
+             */
 
             if (mapState != null)
             {
@@ -1241,7 +1253,7 @@ public static void renderMapPreview(ItemStack stack, int x, int y, int dimension
 
                 MapRenderState mapRenderState = new MapRenderState();
                 mc().getMapRenderer().update(mapId, mapState, mapRenderState);
-                mc().getMapRenderer().draw(mapRenderState, matrixStack, consumer, false, 0xF000F0);
+                mc().getMapRenderer().draw(mapRenderState, matrixStack, consumer, false, uv);
                 consumer.draw();
                 matrixStack.pop();
             }
@@ -1294,7 +1306,7 @@ public static void renderShulkerBoxPreview(ItemStack stack, int baseX, int baseY
             enableDiffuseLightingGui3D();
 
             Inventory inv = InventoryUtils.getAsInventory(items);
-            InventoryOverlay.renderInventoryStacks(type, inv, x + props.slotOffsetX, y + props.slotOffsetY, props.slotsPerRow, 0, ShulkerBoxBlockEntity.INVENTORY_SIZE, mc(), drawContext);
+            InventoryOverlay.renderInventoryStacks(type, inv, x + props.slotOffsetX, y + props.slotOffsetY, props.slotsPerRow, 0, (inv.size()), mc(), drawContext);
 
             matrix4fStack.popMatrix();
             //drawContext.getMatrices().pop();

diff --git a/src/main/java/fi/dy/masa/malilib/test/TestDataSync.java b/src/main/java/fi/dy/masa/malilib/test/TestDataSync.java
@@ -19,7 +19,7 @@
 
 import fi.dy.masa.malilib.MaLiLibConfigs;
 import fi.dy.masa.malilib.interfaces.ISyncProvider;
-import fi.dy.masa.malilib.mixin.test.IMixinDataQueryHandler;
+import fi.dy.masa.malilib.mixin.IMixinDataQueryHandler;
 import fi.dy.masa.malilib.sync.cache.SyncCache;
 import fi.dy.masa.malilib.sync.fbe.FakeBlockEntity;
 import fi.dy.masa.malilib.sync.fe.FakeEntity;

diff --git a/src/main/java/fi/dy/masa/malilib/test/TestRenderHandler.java b/src/main/java/fi/dy/masa/malilib/test/TestRenderHandler.java
@@ -100,7 +100,7 @@ public void onRenderTooltipLast(DrawContext drawContext, ItemStack stack, int x,
         {
             if (MaLiLibConfigs.Test.TEST_CONFIG_BOOLEAN.getBooleanValue() && GuiBase.isShiftDown())
             {
-                RenderUtils.renderMapPreview(stack, x, y, 160, false);
+                RenderUtils.renderMapPreview(stack, x, y, 160, false, drawContext);
             }
         }
         else if (stack.getComponents().contains(DataComponentTypes.CONTAINER) && InventoryUtils.shulkerBoxHasItems(stack))

diff --git a/src/main/java/fi/dy/masa/malilib/util/InventoryUtils.java b/src/main/java/fi/dy/masa/malilib/util/InventoryUtils.java
@@ -380,13 +380,13 @@ else if (state.getBlock() instanceof CrafterBlock && te instanceof CrafterBlockE
      * @param stackShulkerBox
      * @return
      */
-    public static boolean shulkerBoxHasItems(ItemStack stackShulkerBox)
+    public static boolean shulkerBoxHasItems(ItemStack stack)
     {
-        ContainerComponent countContainer = stackShulkerBox.getComponents().get(DataComponentTypes.CONTAINER);
+        ContainerComponent container = stack.getComponents().get(DataComponentTypes.CONTAINER);
 
-        if (countContainer != null)
+        if (container != null)
         {
-            return countContainer.iterateNonEmpty().iterator().hasNext();
+            return container.iterateNonEmpty().iterator().hasNext();
         }
 
         return false;
@@ -504,11 +504,13 @@ public static DefaultedList<ItemStack> getStoredItems(ItemStack stackIn)
         {
             Iterator<ItemStack> iter = container.streamNonEmpty().iterator();
             DefaultedList<ItemStack> items = DefaultedList.ofSize((int) container.streamNonEmpty().count());
+            int i = 0;
 
             // Using 'container.copyTo(items)' will break Litematica's Material List
             while (iter.hasNext())
             {
-                items.add(iter.next());
+                items.add(iter.next().copy());
+                i++;
             }
 
             return items;
@@ -549,14 +551,18 @@ public static DefaultedList<ItemStack> getStoredItems(ItemStack stackIn, int slo
 
             for (int i = 0; i < slotCount; i++)
             {
+                ItemStack entry;
+
                 if (iter.hasNext())
                 {
-                    items.add(iter.next());
+                    entry = iter.next();
                 }
                 else
                 {
-                    items.add(ItemStack.EMPTY);
+                    entry = ItemStack.EMPTY;
                 }
+
+                items.add(entry.copy());
             }
 
             return items;

diff --git a/src/main/resources/mixins.malilib.json b/src/main/resources/mixins.malilib.json
@@ -19,9 +19,9 @@
     "MixinPiglinEntity",
     "MixinSimpleInventory",
     "MixinWorldRenderer",
-    "test.IMixinAbstractHorseEntity",
-    "test.IMixinDataQueryHandler",
-    "test.MixinClientPlayNetworkHandler_NbtQuery"
+    "IMixinAbstractHorseEntity",
+    "IMixinDataQueryHandler",
+    "MixinClientPlayNetworkHandler_NbtQuery"
   ],
   "injectors": {
     "defaultRequire": 1