Fix bug where pick block on unmapped machines gives ID 0

Author: robotgryphon

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) [year] [fullname]
+Copyright (c) 2021 Compact Mods Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/main/java/com/robotgryphon/compactmachines/block/BlockCompactMachine.java

@@ -226,7 +226,7 @@ public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockRea
         nbt.putString("size", this.size.getName());
 
         CompactMachineTile tileEntity = (CompactMachineTile) world.getBlockEntity(pos);
-        if (tileEntity != null) {
+        if (tileEntity != null && tileEntity.mapped()) {
             nbt.putInt("coords", tileEntity.machineId);
         }
 

src/main/java/com/robotgryphon/compactmachines/compat/theoneprobe/providers/CompactMachineProvider.java

@@ -1,6 +1,7 @@
 package com.robotgryphon.compactmachines.compat.theoneprobe.providers;
 
 import com.mojang.authlib.GameProfile;
+import com.robotgryphon.compactmachines.CompactMachines;
 import com.robotgryphon.compactmachines.api.core.Tooltips;
 import com.robotgryphon.compactmachines.block.tiles.CompactMachineTile;
 import com.robotgryphon.compactmachines.block.tiles.TunnelWallTile;
@@ -10,11 +11,14 @@
 import com.robotgryphon.compactmachines.util.TranslationUtil;
 import mcjty.theoneprobe.api.IProbeHitData;
 import mcjty.theoneprobe.api.IProbeInfo;
+import mcjty.theoneprobe.api.ITextStyle;
 import mcjty.theoneprobe.api.ProbeMode;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.IFormattableTextComponent;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
@@ -36,11 +40,19 @@ private static void addProbeInfo(IProbeInfo info, World world, IProbeHitData hit
         if (te instanceof CompactMachineTile) {
             CompactMachineTile machine = (CompactMachineTile) te;
 
-            IFormattableTextComponent id = TranslationUtil
-                    .tooltip(Tooltips.Machines.ID, machine.machineId)
-                    .withStyle(TextFormatting.GREEN);
+            if(machine.mapped()) {
+                IFormattableTextComponent id = TranslationUtil
+                        .tooltip(Tooltips.Machines.ID, machine.machineId)
+                        .withStyle(TextFormatting.GREEN);
 
-            info.text(id);
+                info.text(id);
+            } else {
+                IFormattableTextComponent newMachine = TranslationUtil
+                        .message(new ResourceLocation(CompactMachines.MOD_ID, "new_machine"))
+                        .withStyle(TextFormatting.GREEN);
+
+                info.text(newMachine);
+            }
 
             machine.getOwnerUUID().ifPresent(ownerID -> {
                 // Owner Name

src/main/java/com/robotgryphon/compactmachines/teleportation/DimensionalPosition.java

@@ -83,6 +83,9 @@ public RegistryKey<World> getDimension() {
     }
 
     private String getDimensionString() {
+        if(this.dimension == null)
+            return "";
+
         return this.dimension.location().toString();
     }