TOP improvements, show tunnel info when looking at machines

Author: robotgryphon

src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/CompactMachineProvider.java

@@ -3,21 +3,25 @@
 import com.mojang.authlib.GameProfile;
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.core.Tooltips;
+import dev.compactmods.machines.core.MissingDimensionException;
+import dev.compactmods.machines.i18n.TranslationUtil;
 import dev.compactmods.machines.machine.CompactMachineBlock;
 import dev.compactmods.machines.machine.CompactMachineBlockEntity;
-import dev.compactmods.machines.i18n.TranslationUtil;
-import mcjty.theoneprobe.api.IProbeHitData;
-import mcjty.theoneprobe.api.IProbeInfo;
-import mcjty.theoneprobe.api.IProbeInfoProvider;
-import mcjty.theoneprobe.api.ProbeMode;
+import dev.compactmods.machines.tunnel.TunnelItem;
+import dev.compactmods.machines.tunnel.data.RoomTunnelData;
+import mcjty.theoneprobe.api.*;
+import mcjty.theoneprobe.apiimpl.styles.ItemStyle;
+import mcjty.theoneprobe.apiimpl.styles.LayoutStyle;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 
+import java.util.stream.Collectors;
+
 public class CompactMachineProvider implements IProbeInfoProvider {
 
     @Override
@@ -27,14 +31,16 @@ public ResourceLocation getID() {
 
     @Override
     public void addProbeInfo(ProbeMode probeMode, IProbeInfo info, Player player, Level level, BlockState blockState, IProbeHitData hitData) {
-        if(!(blockState.getBlock() instanceof CompactMachineBlock mach))
+        if (!(blockState.getBlock() instanceof CompactMachineBlock mach))
             return;
 
-        BlockEntity te = level.getBlockEntity(hitData.getPos());
+        final var server = level.getServer();
+        final var te = level.getBlockEntity(hitData.getPos());
+
         if (te instanceof CompactMachineBlockEntity machine) {
-            if(machine.mapped()) {
+            if (machine.mapped()) {
                 MutableComponent id = TranslationUtil
-                        .tooltip(Tooltips.Machines.ID, machine.machineId)
+                        .tooltip(Tooltips.Machines.ID, machine.machineId, hitData.getSideHit())
                         .withStyle(ChatFormatting.GREEN);
 
                 info.text(id);
@@ -59,7 +65,45 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo info, Player player, Le
                 }
             });
 
-            // TODO - Connected Tunnels horizontal preview?
+            machine.getInternalChunkPos().ifPresent(room -> {
+                try {
+                    final var tunnels = RoomTunnelData.get(server, room);
+                    final var graph = tunnels.getGraph();
+
+                    final var applied = graph.getTypesForSide(machine.machineId, hitData.getSideHit())
+                            .collect(Collectors.toSet());
+
+                    switch (probeMode) {
+                        case NORMAL:
+                            final var group = info.horizontal(new LayoutStyle()
+                                    .alignment(ElementAlignment.ALIGN_TOPLEFT)
+                                    .padding(0)
+                                    .spacing(0));
+
+                            applied.forEach(tn -> {
+                                ItemStack item = TunnelItem.createStack(tn);
+                                group.item(item, new ItemStyle().bounds(8, 8));
+                            });
+                            break;
+
+                        case EXTENDED:
+                            final var tgg = info.vertical(new LayoutStyle().alignment(ElementAlignment.ALIGN_TOPLEFT));
+                            applied.forEach(tn -> {
+                                final var tg = tgg.horizontal(new LayoutStyle()
+                                    .alignment(ElementAlignment.ALIGN_CENTER)
+                                    .hPadding(2).vPadding(2)
+                                    .spacing(0));
+
+                                ItemStack item = TunnelItem.createStack(tn);
+                                tg.item(item, new ItemStyle().bounds(8, 8));
+                                tg.itemLabel(item);
+                            });
+                            break;
+                    }
+                } catch (MissingDimensionException e) {
+                    CompactMachines.LOGGER.fatal(e);
+                }
+            });
         }
     }
 }

src/main/java/dev/compactmods/machines/tunnel/TunnelItem.java

@@ -61,6 +61,13 @@ public static void setTunnelType(ItemStack stack, TunnelDefinition definition) {
         defTag.putString("id", definition.getRegistryName().toString());
     }
 
+    @Nonnull
+    public static ItemStack createStack(TunnelDefinition definition) {
+        var stack = new ItemStack(Tunnels.ITEM_TUNNEL.get(), 1);
+        setTunnelType(stack, definition);
+        return stack;
+    }
+
     @Override
     public Component getName(ItemStack stack) {
         String key = getDefinition(stack)

src/main/resources/assets/compactmachines/lang/en_us.json

@@ -70,7 +70,7 @@
   "tooltip.compactmachines.details.psd": "Used as in-game documentation and to enter Compact Machines.",
   "tooltip.compactmachines.details.solid_wall": "Warning! Unbreakable for non-creative players!",
   "tooltip.compactmachines.hint.hold_shift": "Hold shift for details.",
-  "tooltip.compactmachines.machine.id": "Machine ID: %s",
+  "tooltip.compactmachines.machine.id": "Machine #%s (%s)",
   "tooltip.compactmachines.machine.owner": "Owner: %s",
   "tooltip.compactmachines.machine.size": "Internal Size: %1$sx%1$sx%1$s",
   "tooltip.compactmachines.tunnel_type": "Type ID: %1$s",