Fix RemoteAccessor (#19)

GTNewHorizons · Jan 3, 2025 · 81ee82a · 81ee82a
1 parent d9e593e
commit 81ee82a
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/main/java/remoteio/common/item/ItemRemoteAccessor.java b/src/main/java/remoteio/common/item/ItemRemoteAccessor.java
@@ -13,6 +13,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
+import org.lwjgl.input.Keyboard;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import remoteio.common.RemoteIO;
 import remoteio.common.core.TabRemoteIO;
 import remoteio.common.lib.DimensionalCoords;
@@ -55,18 +59,25 @@ public IIcon getIcon(ItemStack stack, int pass) {
         }
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean debug) {
         DimensionalCoords coords = ItemRemoteAccessor.getCoordinates(stack);
-        if (!player.isSneaking()) {
+        final boolean isShiftHeld = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+        if (!isShiftHeld) {
             if (coords != null) {
-                list.add("Dimension: " + DimensionManager.getProvider(coords.dimensionID).getDimensionName());
+                if (DimensionManager.getWorld(coords.dimensionID) != null)
+                    list.add("Dimension: " + DimensionManager.getProvider(coords.dimensionID).getDimensionName());
+                else list.add("Dimension: " + coords.dimensionID);
                 list.add("X: " + coords.x + " Y: " + coords.y + " Z: " + coords.z);
             }
         } else {
             if (coords != null) {
-                list.add("Dimension: " + DimensionManager.getProvider(coords.dimensionID).getDimensionName());
-                list.add("Block: " + player.worldObj.getBlock(coords.x, coords.y, coords.z).getLocalizedName());
+                if (DimensionManager.getWorld(coords.dimensionID) != null)
+                    list.add("Dimension: " + DimensionManager.getProvider(coords.dimensionID).getDimensionName());
+                else list.add("Dimension: " + coords.dimensionID);
+                if (player.worldObj.provider.dimensionId == coords.dimensionID)
+                    list.add("Block: " + player.worldObj.getBlock(coords.x, coords.y, coords.z).getLocalizedName());
             }
         }
     }