the great unjankening (by adding more jank code)

GregTechCEu · Dec 29, 2024 · f67ae91 · f67ae91
1 parent fd45b70
commit f67ae91
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 5 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ftbchunks/FTBChunksClientMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ftbchunks/FTBChunksClientMixin.java
@@ -0,0 +1,42 @@
+package com.gregtechceu.gtceu.core.mixins.ftbchunks;
+
+import com.gregtechceu.gtceu.integration.map.ftbchunks.veins.fluid.FluidVeinIcon;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.math.Axis;
+import dev.ftb.mods.ftbchunks.api.client.icon.MapIcon;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClientConfig;
+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.Slice;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = FTBChunksClient.class)
+public class FTBChunksClientMixin {
+
+    @Inject(method = "renderHud",
+            at = @At(value = "INVOKE",
+                     target = "Lcom/mojang/blaze3d/vertex/PoseStack;scale(FFF)V",
+                     shift = At.Shift.AFTER),
+            slice = @Slice(from = @At(value = "INVOKE",
+                                      target = "Ldev/ftb/mods/ftbchunks/api/client/icon/MapIcon;getPos(F)Lnet/minecraft/world/phys/Vec3;"),
+                           to = @At(value = "INVOKE",
+                                    target = "Ldev/ftb/mods/ftbchunks/api/client/icon/MapIcon;draw(Ldev/ftb/mods/ftbchunks/api/client/icon/MapType;Lnet/minecraft/client/gui/GuiGraphics;IIIIZI)V")))
+    private void gtceu$injectRenderHud(GuiGraphics graphics, float tickDelta, CallbackInfo ci, @Local MapIcon icon) {
+        if (icon instanceof FluidVeinIcon) {
+            var mc = Minecraft.getInstance();
+            var rotationLocked = FTBChunksClientConfig.MINIMAP_LOCKED_NORTH.get() ||
+                    FTBChunksClientConfig.SQUARE_MINIMAP.get();
+            var poseStack = graphics.pose();
+            var minimapRotation = (rotationLocked ? 180F : -mc.player.getYRot()) % 360F;
+            poseStack.translate(0.5, 0.5, 0);
+            poseStack.mulPose(Axis.ZP.rotationDegrees(minimapRotation + 180f));
+            poseStack.translate(-0.5, -0.5, 0);
+        }
+    }
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java b/src/main/java/com/gregtechceu/gtceu/integration/map/ftbchunks/veins/fluid/FluidVeinIcon.java
@@ -62,7 +62,7 @@ public int getColor() {
 
     @Override
     public double getIconScale(MapType mapType) {
-        return mapType.isMinimap() ? FTBChunksClientConfig.MINIMAP_SCALE.get() : size;
+        return mapType.isMinimap() ? FTBChunksClientConfig.MINIMAP_ZOOM.get() : size;
     }
 
     @Override

diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json
@@ -15,14 +15,15 @@
         "LevelRendererMixin",
         "ModelManagerMixin",
         "MultiPlayerGameModeMixin",
+        "ftbchunks.LargeMapScreenMixin",
+        "ftbchunks.RegionMapPanelMixin",
+        "ftbchunks.FTBChunksClientMixin",
         "journeymap.FullscreenMixin",
         "rei.FluidEntryRendererMixin",
-        "ftbchunks.RegionMapPanelMixin",
-        "ftbchunks.LargeMapScreenMixin",
-        "xaeroworldmap.GuiMapMixin",
-        "xaeroworldmap.MapElementRenderHandlerBuilderMixin",
         "xaerominimap.HighlighterRegistryMixin",
         "xaerominimap.MinimapFBORendererMixin",
+        "xaeroworldmap.GuiMapMixin",
+        "xaeroworldmap.MapElementRenderHandlerBuilderMixin",
         "xaeroworldmap.WorldMapSessionMixin"
     ],
     "mixins": [