Add Y Level Information to Prospector and Waypoints

src/main/java/com/nomiceu/nomilabs/gregtech/mixinhelper/OreData.java

@@ -0,0 +1,36 @@
+package com.nomiceu.nomilabs.gregtech.mixinhelper;
+
+public class OreData {
+
+    private byte minY;
+    private byte maxY;
+    private byte avgY;
+
+    public OreData(byte startingY) {
+        minY = startingY;
+        maxY = startingY;
+        avgY = startingY;
+    }
+
+    public byte minY() {
+        return minY;
+    }
+
+    public byte maxY() {
+        return maxY;
+    }
+
+    public byte avgY() {
+        return avgY;
+    }
+
+    public OreData update(byte y) {
+        minY = y < minY ? y : minY;
+        maxY = y > maxY ? y : maxY;
+
+        // Whilst this isn't a perfect average, it puts waypoints in middle of vein, which is good
+        // Note that this implementation is different to the one in GT #2726
+        avgY = (byte) ((minY + maxY) / 2);
+        return this;
+    }
+}

src/main/java/com/nomiceu/nomilabs/mixin/gregtech/WidgetProspectingMapMixin.java

@@ -0,0 +1,157 @@
+package com.nomiceu.nomilabs.mixin.gregtech;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import net.minecraft.client.multiplayer.WorldClient;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.nomiceu.nomilabs.NomiLabs;
+import com.nomiceu.nomilabs.gregtech.mixinhelper.OreData;
+
+import gregtech.api.unification.OreDictUnifier;
+import gregtech.common.terminal.app.prospector.ProspectingTexture;
+import gregtech.common.terminal.app.prospector.widget.WidgetProspectingMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+
+/**
+ * Implements <a href="https://github.com/GregTechCEu/GregTech/pull/2726">GT #2726</a>.
+ */
+@Mixin(value = WidgetProspectingMap.class, remap = false)
+public class WidgetProspectingMapMixin {
+
+    @Shadow
+    private ProspectingTexture texture;
+
+    @Unique
+    private OreData labs$hoveredOreData = null;
+
+    @Unique
+    private Map<String, OreData> labs$nameToData = new Object2ObjectOpenHashMap<>();
+
+    /* Calculation of Ore Height */
+
+    @Inject(method = "drawInForeground", at = @At("HEAD"))
+    private void resetLabsData(int mouseX, int mouseY, CallbackInfo ci) {
+        labs$hoveredOreData = null;
+        labs$nameToData.clear();
+    }
+
+    @Inject(method = "drawInForeground",
+            at = @At(value = "INVOKE", target = "Ljava/util/HashMap;forEach(Ljava/util/function/BiConsumer;)V"),
+            require = 1,
+            locals = LocalCapture.CAPTURE_FAILEXCEPTION)
+    private void initLabsData(int mouseX, int mouseY, CallbackInfo ci, @Local(ordinal = 2) int cX,
+                              @Local(ordinal = 3) int cZ) { // Function Args count in this ordinal
+        for (int i = 0; i < 16; i++) {
+            for (int j = 0; j < 16; j++) {
+                if (this.texture.map[cX * 16 + i][cZ * 16 + j] == null) continue;
+
+                texture.map[cX * 16 + i][cZ * 16 + j].entrySet().forEach((entry) -> {
+                    String name = OreDictUnifier.get(entry.getValue()).getDisplayName();
+
+                    if (!ProspectingTexture.SELECTED_ALL.equals(texture.getSelected()) &&
+                            !texture.getSelected().equals(entry.getValue())) {
+                        return;
+                    }
+
+                    OreData nameData = labs$nameToData.get(name);
+                    if (nameData == null)
+                        labs$nameToData.put(name, new OreData(entry.getKey()));
+                    else
+                        nameData.update(entry.getKey());
+
+                    if (labs$hoveredOreData == null)
+                        labs$hoveredOreData = new OreData(entry.getKey());
+                    else
+                        labs$hoveredOreData.update(entry.getKey());
+                });
+            }
+        }
+    }
+
+    /* Handling in Tooltips */
+
+    // Sorting Tooltips
+    @Redirect(method = "drawInForeground",
+              at = @At(value = "INVOKE", target = "Ljava/util/HashMap;forEach(Ljava/util/function/BiConsumer;)V"),
+              require = 1)
+    private void sortTooltipsByY(HashMap<String, Integer> instance, BiConsumer<String, Integer> biConsumer) {
+        instance.entrySet().stream().sorted((a, b) -> {
+            OreData dataA = labs$nameToData.get(a.getKey());
+            OreData dataB = labs$nameToData.get(b.getKey());
+            if (dataA == null || dataB == null) {
+                return a.getKey().compareTo(b.getKey());
+            }
+
+            // Highest Y Values First
+            return Byte.compare(dataB.minY(), dataA.minY());
+        }).forEach((entry) -> biConsumer.accept(entry.getKey(), entry.getValue()));
+    }
+
+    // Adding to Tooltips
+    @Redirect(method = "lambda$drawInForeground$2",
+              at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 0),
+              require = 1)
+    private <E> boolean addYDataToTooltips(List<E> instance, E e) {
+        if (!(e instanceof String str)) {
+            NomiLabs.LOGGER.error("[ProspectorMixin] Bad Injection!");
+            return instance.add(e);
+        }
+
+        OreData data = labs$nameToData.get(str.split(" --- ")[0]);
+        if (data == null) {
+            NomiLabs.LOGGER.error("[ProspectorMixin] Could not find Y data for name {}!", str.split(" --- ")[0]);
+            return instance.add(e);
+        }
+
+        return instance.add((E) (str + String.format(" (y: %s - %s)", data.minY(), data.maxY())));
+    }
+
+    /* Waypoint Y Handling */
+    @WrapOperation(method = "mouseClicked",
+                   at = @At(value = "INVOKE",
+                            target = "Lnet/minecraft/client/multiplayer/WorldClient;getHeight(II)I",
+                            remap = true),
+                   require = 1,
+                   remap = false)
+    private int useHoveredOreHeightMain(WorldClient instance, int x, int z, Operation<Integer> original) {
+        if (labs$hoveredOreData == null) return original.call(instance, x, z);
+        return labs$hoveredOreData.avgY();
+    }
+
+    @WrapOperation(method = "addVoxelMapWaypoint",
+                   at = @At(value = "INVOKE",
+                            target = "Lnet/minecraft/client/multiplayer/WorldClient;getHeight(II)I",
+                            remap = true),
+                   require = 1,
+                   remap = false)
+    private int useHoveredOreHeightVoxel(WorldClient instance, int x, int z, Operation<Integer> original) {
+        if (labs$hoveredOreData == null) return original.call(instance, x, z);
+        return labs$hoveredOreData.avgY();
+    }
+
+    @WrapOperation(method = "addXaeroMapWaypoint",
+                   at = @At(value = "INVOKE",
+                            target = "Lnet/minecraft/client/multiplayer/WorldClient;getHeight(II)I",
+                            remap = true),
+                   require = 1,
+                   remap = false)
+    private int useHoveredOreHeightXaero(WorldClient instance, int x, int z, Operation<Integer> original) {
+        if (labs$hoveredOreData == null) return original.call(instance, x, z);
+        return labs$hoveredOreData.avgY();
+    }
+}

src/main/resources/mixins.nomilabs.gregtech.json

@@ -45,7 +45,8 @@
     "SteamMetaTileEntityMixin",
     "TileEntityPipeBaseMixin",
     "ToolEventHandlersMixin",
-    "VirtualizedRecipeMapMixin"
+    "VirtualizedRecipeMapMixin",
+    "WidgetProspectingMapMixin"
   ],
   "client": [
     "MetaTileEntityLargeBoilerClientMixin"