Merge branch 'master' into feature/packetmine-rewrite

Author: beanbag44

…/module/modules/movement/TridentBoost.kt …mbda/mixin/items/FilledMapItemMixin.javacommon/src/main/kotlin/com/lambda/module/modules/movement/TridentBoost.kt renamed to common/src/main/java/com/lambda/mixin/items/FilledMapItemMixin.java common/src/main/kotlin/com/lambda/module/modules/movement/TridentBoost.kt renamed to common/src/main/java/com/lambda/mixin/items/FilledMapItemMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * 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
@@ -15,19 +15,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.module.modules.movement
+package com.lambda.mixin.items;
 
-import com.lambda.module.Module
-import com.lambda.module.tag.ModuleTag
+import com.lambda.module.modules.render.MapPreview;
+import net.minecraft.client.item.TooltipData;
+import net.minecraft.item.FilledMapItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
 
-object TridentBoost : Module(
-    name = "TridentBoost",
-    description = "Boosts you with tridents",
-    defaultTags = setOf(ModuleTag.MOVEMENT)
-) {
-    @JvmStatic
-    val tridentSpeed by setting("Speed Factor", 1.0, 0.1..3.0, 0.1, description = "Speed factor of the trident boost")
+import java.util.Optional;
 
-    @JvmStatic
-    val forceUse by setting("Force Use", true, description = "Try to use the trident outside of water or rain")
+@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/items/TridentMixin.java

@@ -0,0 +1,46 @@
+/*
+ * 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.MapPreview;
+import net.minecraft.client.gui.tooltip.BundleTooltipComponent;
+import net.minecraft.client.gui.tooltip.TooltipComponent;
+import net.minecraft.client.item.BundleTooltipData;
+import net.minecraft.client.item.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;
+
+@Mixin(TooltipComponent.class)
+public interface TooltipComponentMixin {
+    @Inject(method = "of(Lnet/minecraft/client/item/TooltipData;)Lnet/minecraft/client/gui/tooltip/TooltipComponent;", at = @At("HEAD"), cancellable = true)
+    private static void of(TooltipData data, CallbackInfoReturnable<TooltipComponent> cir) {
+        if (data instanceof BundleTooltipData) {
+            cir.setReturnValue(new BundleTooltipComponent((BundleTooltipData)data));
+            return;
+        }
+
+        if (data instanceof MapPreview.MapComponent) {
+            cir.setReturnValue((TooltipComponent) data);
+            return;
+        }
+
+        throw new IllegalArgumentException("Unknown TooltipComponent");
+    }
+}

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

@@ -24,6 +24,7 @@ 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.item.TooltipData
 import net.minecraft.item.FilledMapItem
 import net.minecraft.item.ItemStack
 import net.minecraft.item.map.MapState
@@ -37,18 +38,15 @@ object MapPreview : Module(
 ) {
     private val background = Identifier("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)
 
-        override fun drawItems(fontRenderer: TextRenderer, x: Int, y: Int, context: DrawContext) {
+        override fun drawItems(textRenderer: TextRenderer, x: Int, y: Int, context: DrawContext) {
             mapId?.let { id ->
-                // Values taken from net.minecraft.client.render.item.HeldItemRenderer.renderFirstPersonMap
-
                 val matrices = context.matrices
 
                 matrices.push()
@@ -59,7 +57,9 @@ object MapPreview : Module(
                 context.drawTexture(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)
+                matrices.pop()
             }
         }
 

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

@@ -19,7 +19,7 @@
     "input.KeyboardMixin",
     "input.MouseMixin",
     "items.BarrierBlockMixin",
-    "items.TridentMixin",
+    "items.FilledMapItemMixin",
     "network.ClientConnectionMixin",
     "network.ClientLoginNetworkMixin",
     "network.ClientPlayNetworkHandlerMixin",
@@ -29,12 +29,11 @@
     "render.BackgroundRendererMixin",
     "render.BlockRenderManagerMixin",
     "render.CameraMixin",
-    "render.ChatHudMixin",
     "render.CapeFeatureRendererMixin",
+    "render.ChatHudMixin",
     "render.ChatInputSuggestorMixin",
     "render.ChatScreenMixin",
     "render.DebugHudMixin",
-    "render.DrawContextMixin",
     "render.ElytraFeatureRendererMixin",
     "render.GameRendererMixin",
     "render.GlStateManagerMixin",
@@ -49,6 +48,7 @@
     "render.ScreenHandlerMixin",
     "render.SplashOverlayMixin",
     "render.SplashOverlayMixin$LogoTextureMixin",
+    "render.TooltipComponentMixin",
     "render.VertexBufferMixin",
     "render.WorldRendererMixin",
     "world.BlockCollisionSpliteratorMixin",

common/src/main/kotlin/com/lambda/module/modules/movement/RocketExtend.kt

@@ -2,17 +2,17 @@
   "schemaVersion": 1,
   "id": "${modId}",
   "version": "${modVersion}",
-  "name": "Lambda",
+  "name": "${modName}",
   "description": "${modDescription}",
   "authors": [
-    "Constructor"
+    "${modAuthors}"
   ],
   "contact": {
     "homepage": "",
     "sources": ""
   },
   "license": "GNU General Public License v3.0",
-  "icon": "assets/lambda/lambda.png",
+  "icon": "${modIcon}",
   "environment": "*",
   "entrypoints": {
     "client": [
@@ -23,7 +23,7 @@
     ]
   },
   "mixins": [
-    "lambda.mixins.common.json"
+    "${modId}.mixins.common.json"
   ],
   "depends": {
     "fabricloader": ">=${fabricLoaderVersion}",