diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 4c3b15459..b9e4c06cf 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -28,7 +28,9 @@ public class TransmitterNetworkRegistry private HashSet networksToChange = Sets.newHashSet(); private HashSet invalidTransmitters = Sets.newHashSet(); + private HashMap orphanTransmitters = Maps.newHashMap(); + private HashMap newOrphanTransmitters = Maps.newHashMap(); private Logger logger = LogManager.getLogger("MekanismTransmitters"); @@ -48,6 +50,7 @@ public class TransmitterNetworkRegistry getInstance().networksToChange.clear(); getInstance().invalidTransmitters.clear(); getInstance().orphanTransmitters.clear(); + getInstance().newOrphanTransmitters.clear(); } public static void invalidateTransmitter(IGridTransmitter transmitter) @@ -57,7 +60,7 @@ public class TransmitterNetworkRegistry public static void registerOrphanTransmitter(IGridTransmitter transmitter) { - getInstance().orphanTransmitters.put(transmitter.coord(), transmitter); + getInstance().newOrphanTransmitters.put(transmitter.coord(), transmitter); } public static void registerChangedNetwork(DynamicNetwork network) @@ -131,6 +134,9 @@ public class TransmitterNetworkRegistry public void assignOrphans() { + orphanTransmitters = (HashMap)newOrphanTransmitters.clone(); + newOrphanTransmitters.clear(); + if(MekanismAPI.debug && !orphanTransmitters.isEmpty()) { logger.info("Dealing with " + orphanTransmitters.size() + " orphan Transmitters"); diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 553b5810f..fa733fc45 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -14,6 +14,7 @@ import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; @@ -47,12 +48,18 @@ public class RenderTickHandler World world = mc.thePlayer.worldObj; FontRenderer font = mc.fontRendererObj; RayTraceResult pos = player.rayTrace(40.0D, 1.0F); + + if(font == null) + { + return; + } if(pos != null) { Coord4D obj = new Coord4D(pos.getBlockPos(), world); + Block block = obj.getBlock(world); - if(MekanismAPI.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) + if(block != null && MekanismAPI.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) { String tileDisplay = ""; @@ -64,7 +71,7 @@ public class RenderTickHandler } } - font.drawStringWithShadow("Block: " + obj.getBlock(world).getUnlocalizedName(), 1, 1, 0x404040); + font.drawStringWithShadow("Block: " + block.getUnlocalizedName(), 1, 1, 0x404040); font.drawStringWithShadow("Metadata: " + obj.getBlockState(world), 1, 10, 0x404040); font.drawStringWithShadow("Location: " + MekanismUtils.getCoordDisplay(obj), 1, 19, 0x404040); font.drawStringWithShadow("TileEntity: " + tileDisplay, 1, 28, 0x404040); diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 0fc027a5e..2c3253b19 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -69,13 +69,8 @@ public abstract class PartTransmitter> extends } @Override - public void onWorldSeparate() {} - - @Override - public void onUnloaded() + public void onWorldSeparate() { - super.onUnloaded(); - unloaded = true; if(!getWorld().isRemote) @@ -88,20 +83,6 @@ public abstract class PartTransmitter> extends } } - @Override - public void onRemoved() - { - if(!getWorld().isRemote) - { - TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); - } - else { - getTransmitter().setTransmitterNetwork(null); - } - - super.onRemoved(); - } - @Override public void markDirtyTransmitters() {