Better map tooltip

Author: emyfops

common/src/main/java/com/lambda/mixin/items/FilledMapItemMixin.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.items;
+
+import com.lambda.module.modules.render.MapPreview;
+import net.minecraft.item.FilledMapItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipData;
+import org.spongepowered.asm.mixin.Mixin;
+
+import java.util.Optional;
+
+@Mixin(FilledMapItem.class)
+public class FilledMapItemMixin extends Item {
+    public FilledMapItemMixin(Item.Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    public Optional<TooltipData> getTooltipData(ItemStack stack) {
+        return Optional.of(new MapPreview.MapComponent(stack));
+    }
+}

common/src/main/java/com/lambda/mixin/render/DrawContextMixin.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.ContainerPreview;
+import com.lambda.module.modules.render.MapPreview;
+import net.minecraft.client.gui.tooltip.BundleTooltipComponent;
+import net.minecraft.client.gui.tooltip.ProfilesTooltipComponent;
+import net.minecraft.client.gui.tooltip.TooltipComponent;
+import net.minecraft.item.tooltip.BundleTooltipData;
+import net.minecraft.item.tooltip.TooltipData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(TooltipComponent.class)
+public interface TooltipComponentMixin {
+    @Inject(method = "of(Lnet/minecraft/item/tooltip/TooltipData;)Lnet/minecraft/client/gui/tooltip/TooltipComponent;", at = @At("HEAD"), cancellable = true)
+    private static void of(TooltipData tooltipData, CallbackInfoReturnable<TooltipComponent> cir) {
+        Objects.requireNonNull(tooltipData);
+
+        cir.setReturnValue((switch (tooltipData) {
+            case MapPreview.MapComponent mapComponent -> mapComponent;
+            case ContainerPreview.ShulkerComponent shulkerComponent -> shulkerComponent;
+
+            case BundleTooltipData bundleTooltipData -> new BundleTooltipComponent(bundleTooltipData.contents());
+            case ProfilesTooltipComponent.ProfilesData profilesData -> new ProfilesTooltipComponent(profilesData);
+            default -> throw new IllegalArgumentException("Unknown TooltipComponent");
+        }));
+    }
+}

common/src/main/java/com/lambda/mixin/render/TooltipComponentMixin.java

@@ -24,9 +24,14 @@ import com.mojang.blaze3d.systems.RenderSystem
 import net.minecraft.client.font.TextRenderer
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.tooltip.TooltipComponent
+import net.minecraft.client.render.MapRenderState
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.component.DataComponentTypes
+import net.minecraft.component.type.MapIdComponent
 import net.minecraft.item.FilledMapItem
 import net.minecraft.item.ItemStack
 import net.minecraft.item.map.MapState
+import net.minecraft.item.tooltip.TooltipData
 import net.minecraft.util.Identifier
 
 
@@ -35,35 +40,36 @@ object MapPreview : Module(
     description = "Preview maps in your inventory",
     defaultTags = setOf(ModuleTag.RENDER)
 ) {
-    private val background = Identifier("textures/map/map_background.png")
+    private val background = Identifier.ofVanilla("textures/map/map_background.png")
 
-    // The map component is added via the draw context mixin, thanks mojang
-    class MapComponent(val stack: ItemStack) : TooltipComponent {
+    class MapComponent(val stack: ItemStack) : TooltipData, TooltipComponent {
         val state: MapState?
             get() = FilledMapItem.getMapState(stack, mc.world)
 
-        val mapId: Int?
-            get() = FilledMapItem.getMapId(stack)
+        val mapId: MapIdComponent?
+            get() = stack.getOrDefault(DataComponentTypes.MAP_ID, null)
 
-        override fun drawItems(fontRenderer: TextRenderer, x: Int, y: Int, context: DrawContext) {
+        override fun drawItems(textRenderer: TextRenderer, x: Int, y: Int, width: Int, height: Int, context: DrawContext) {
             mapId?.let { id ->
-                // Values taken from net.minecraft.client.render.item.HeldItemRenderer.renderFirstPersonMap
-
                 val matrices = context.matrices
 
                 matrices.push()
                 matrices.translate(x + 4.0, y + 4.0, 500.0)
                 matrices.scale(0.7f, 0.7f, 1f)
 
                 RenderSystem.enableBlend()
-                context.drawTexture(background, -7, -7, 0f, 0f, 142, 142, 142, 142)
+                context.drawTexture(RenderLayer::getGuiTextured, background, -7, -7, 0f, 0f, 142, 142, 142, 142)
 
                 matrices.translate(0.0, 0.0, 1.0)
-                mc.gameRenderer.mapRenderer.draw(matrices, context.vertexConsumers, id, state, true, 240)
+
+                val renderState = MapRenderState()
+                mc.mapRenderer.update(id, state, renderState)
+                context.draw { mc.mapRenderer.draw(renderState, matrices, it, true, 0xF000F0) }
+                matrices.pop()
             }
         }
 
-        override fun getHeight(): Int {
+        override fun getHeight(textRenderer: TextRenderer): Int {
             return if (FilledMapItem.getMapState(stack, mc.world) != null) 100
             else 0
         }