diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 8fd32fa5c..dd6f0321f 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -3,7 +3,9 @@ package mekanism.api; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.List; +import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -20,6 +22,7 @@ import net.minecraft.util.Vec3i; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.Chunk.EnumCreateEntityType; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; /** @@ -44,6 +47,11 @@ public class Coord4D extends BlockPos dimensionId = 0; } + + public Coord4D(int x, int y, int z, World world) + { + this(x, y, z, world.provider.getDimensionId()); + } public Coord4D(double x, double y, double z) { @@ -130,7 +138,42 @@ public class Coord4D extends BlockPos return (tile != null && tile.hasWorldObj() && !tile.isInvalid()) ? tile : null; } - + + public TileEntity safeTileGet(World world) + { + if(!exists(world)) + { + return null; + } + + TileEntity tile = world.getChunkFromBlockCoords(this).getTileEntity(this, EnumCreateEntityType.CHECK); + + if(tile != null) + { + return tile; + } + + for(TileEntity iter : world.loadedTileEntityList) + { + if(!iter.isInvalid() && iter.getPos().equals(this)) + { + return iter; + } + } + + List added = (List)MekanismUtils.getPrivateValue(world, World.class, ObfuscatedNames.World_addedTileEntityList); + + for(TileEntity iter : added) + { + if(!iter.isInvalid() && iter.getPos().equals(this)) + { + return iter; + } + } + + return null; + } + /** * Gets the Block value of the block representing this Coord4D. * @param world - world this Coord4D is in diff --git a/src/main/java/mekanism/common/ObfuscatedNames.java b/src/main/java/mekanism/api/ObfuscatedNames.java similarity index 89% rename from src/main/java/mekanism/common/ObfuscatedNames.java rename to src/main/java/mekanism/api/ObfuscatedNames.java index 81e5d8d83..cdcbde660 100644 --- a/src/main/java/mekanism/common/ObfuscatedNames.java +++ b/src/main/java/mekanism/api/ObfuscatedNames.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.api; public final class ObfuscatedNames { @@ -13,4 +13,5 @@ public final class ObfuscatedNames public static String[] SoundManager_invPlayingSounds = new String[] {"invPlayingSounds", "field_148630_i"}; public static String[] AbstractClientPlayer_getPlayerInfo = new String[] {"getPlayerInfo", "func_110303_q"}; public static String[] NetworkPlayerInfo_locationCape = new String[] {"locationCape", "field_178862_f"}; + public static String[] World_addedTileEntityList = new String[] {"addedTileEntityList", "field_147484_a"}; } \ No newline at end of file diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 2d5799eec..8e73e9dd4 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -13,13 +13,13 @@ import java.util.Map; import java.util.Set; import mekanism.api.IClientTicker; +import mekanism.api.ObfuscatedNames; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; import mekanism.client.sound.SoundHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.ObfuscatedNames; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 8cbcfad14..a45ce8717 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -2,8 +2,8 @@ package mekanism.client.gui.element; import java.util.List; +import mekanism.api.ObfuscatedNames; import mekanism.client.gui.IGuiWrapper; -import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 5a0ca1722..0383824fc 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; +import mekanism.api.ObfuscatedNames; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.OreGas; @@ -17,7 +18,6 @@ import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; -import mekanism.common.ObfuscatedNames; import mekanism.common.base.IMetaItem; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 1c25d5064..9665a82cd 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -3,7 +3,7 @@ package mekanism.client.sound; import java.util.HashMap; import java.util.Map; -import mekanism.common.ObfuscatedNames; +import mekanism.api.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index a7a703b0b..895435867 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -1,5 +1,6 @@ package mekanism.common; +import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; import mekanism.common.entity.EntityFlame; import mekanism.common.item.ItemFlamethrower; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 7d157515f..e4f8494e3 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -851,20 +851,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple return type != null && type.tileEntityClass != null; } - - @Override - public void onBlockAdded(World world, BlockPos pos, IBlockState state) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if(!world.isRemote) - { - if(tileEntity instanceof TileEntityBasicBlock) - { - ((TileEntityBasicBlock)tileEntity).onAdded(); - } - } - } @Override public TileEntity createTileEntity(World world, IBlockState state) @@ -886,7 +872,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple int side = MathHelper.floor_double((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int height = Math.round(placer.rotationPitch); int change = 3; - + if(tileEntity.canSetFacing(0) && tileEntity.canSetFacing(1)) { if(height >= 65) @@ -953,8 +939,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { ((IBoundingBlock)tileEntity).onBreak(); } - - System.out.println(world.getTileEntity(pos)); super.breakBlock(world, pos, state); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c0b22aa78..a24437399 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1085,20 +1085,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return super.getRenderColor(state); } - - @Override - public void onBlockAdded(World world, BlockPos pos, IBlockState state) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if(!world.isRemote) - { - if(tileEntity instanceof TileEntityBasicBlock) - { - ((TileEntityBasicBlock)tileEntity).onAdded(); - } - } - } @Override public boolean canConnectRedstone(IBlockAccess world, BlockPos pos, EnumFacing side) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index ced1759f5..e5cd225bb 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -43,7 +43,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol return true; } - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); return tile instanceof TileEntityPressureDisperser || tile instanceof TileEntitySuperheatingElement; } @@ -58,7 +58,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol for(Coord4D coord : innerNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityPressureDisperser) { @@ -89,7 +89,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol for(int z = 1; z < structure.volWidth-1; z++) { Coord4D coord4D = pos.add(x, 0, z); - TileEntity tile = pointer.getWorld().getTileEntity(coord4D); + TileEntity tile = coord4D.safeTileGet(pointer.getWorld()); if(!(tile instanceof TileEntityPressureDisperser)) { @@ -112,7 +112,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public boolean isValid(Coord4D coord) { - return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement; + return coord.safeTileGet(pointer.getWorld()) instanceof TileEntitySuperheatingElement; } }).calculate(elements.iterator().next()); } @@ -244,7 +244,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityBoilerValve) + if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityBoilerValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 5960c72c7..574aba571 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -12,7 +12,6 @@ import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -35,7 +34,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol @Override public boolean isValidInnerNode(int x, int y, int z) { - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); if(tile != null && (tile instanceof TileEntityInductionCell || tile instanceof TileEntityInductionProvider)) { @@ -81,7 +80,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol { for(Coord4D coord : innerNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInductionCell) { diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index c952729ef..a7f94a07a 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -90,7 +90,7 @@ public class TankUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityDynamicValve) + if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityDynamicValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5f7eedd77..a04576257 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -32,13 +32,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; -import buildcraft.api.tools.IToolWrench; -import cofh.api.item.IToolHammer; +import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import buildcraft.api.tools.IToolWrench; +import cofh.api.item.IToolHammer; @InterfaceList({ @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft") @@ -69,7 +69,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { Block block = world.getBlockState(pos).getBlock(); TileEntity tile = world.getTileEntity(pos); - + if(getState(stack).isConfigurating()) //Configurate { if(tile instanceof ISideConfiguration && ((ISideConfiguration)tile).getConfig().supports(getState(stack).getTransmission())) diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 6251cf4f6..544ac01ea 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -291,7 +291,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(int x, int y, int z) { - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); if(tile instanceof IStructuralMultiblock) { @@ -316,7 +316,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(BlockPos pos) { - TileEntity tile = pointer.getWorld().getTileEntity(pos); + TileEntity tile = new Coord4D(pos, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { @@ -422,7 +422,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structureFound.internalLocations) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -437,7 +437,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structure.internalLocations) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -448,7 +448,7 @@ public abstract class UpdateProtocol> public void killInnerNode(Coord4D coord) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -469,12 +469,12 @@ public abstract class UpdateProtocol> { if(!structureFound.locations.contains(coord)) { - System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); + System.out.println("No contain " + coord + " " + coord.safeTileGet(pointer.getWorld())); System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); for(Coord4D newCoord : iteratedNodes) { - TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); + TileEntity tile = newCoord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { @@ -500,7 +500,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); + TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock && ((TileEntityMultiblock)tileEntity).cachedID != null) { @@ -540,7 +540,7 @@ public abstract class UpdateProtocol> cache.apply((T)structureFound); structureFound.inventoryID = idToUse; - + System.out.println("Success"); onFormed(); List structures = new ArrayList(); @@ -548,7 +548,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); + TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock) { @@ -573,9 +573,10 @@ public abstract class UpdateProtocol> } } else { + System.out.println("No structure"); for(Coord4D coord : iteratedNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 10c2381a7..e75ea9513 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -29,11 +29,10 @@ public class PacketDataRequest implements IMessageHandler> extend public TileEntityMultiblock(String name) { super(name); + + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) + System.out.println("CREATE"); } @Override @@ -67,7 +72,7 @@ public abstract class TileEntityMultiblock> extend { if(!prevStructure) { - //Mekanism.proxy.doMultiblockSparkle(this); + Mekanism.proxy.doMultiblockSparkle(this); } } @@ -111,8 +116,9 @@ public abstract class TileEntityMultiblock> extend for(EnumFacing side : EnumFacing.VALUES) { Coord4D obj = Coord4D.get(this).offset(side); + TileEntity tile = obj.safeTileGet(worldObj); - if(!obj.isAirBlock(worldObj) && (obj.getTileEntity(worldObj) == null || obj.getTileEntity(worldObj).getClass() != getClass())) + if(!obj.isAirBlock(worldObj) && (tile == null || tile.getClass() != getClass())) { obj.getBlock(worldObj).onNeighborChange(worldObj, obj, getPos()); } @@ -170,7 +176,7 @@ public abstract class TileEntityMultiblock> extend { for(Coord4D obj : getSynchronizedData().locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(worldObj); + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.safeTileGet(worldObj); if(tileEntity != null && tileEntity.isRendering) { diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index 8c4875637..3cbc5e529 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -19,9 +19,11 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - if(master.getTileEntity(worldObj) instanceof IMultiblock) + TileEntity masterTile = master.safeTileGet(worldObj); + + if(masterTile instanceof IMultiblock) { - return ((IMultiblock)master.getTileEntity(worldObj)).onActivate(player); + return ((IMultiblock)masterTile).onActivate(player); } else { master = null; @@ -36,9 +38,11 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - if(master.getTileEntity(worldObj) instanceof IMultiblock) + TileEntity masterTile = master.safeTileGet(worldObj); + + if(masterTile instanceof IMultiblock) { - ((IMultiblock)master.getTileEntity(worldObj)).doUpdate(); + ((IMultiblock)masterTile).doUpdate(); } else { master = null; @@ -84,13 +88,13 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); - TileEntity tile = coord.getTileEntity(worldObj); + TileEntity tile = coord.safeTileGet(worldObj); if(!iterated.contains(coord)) { if(tile instanceof IMultiblock) { - found = (IMultiblock)coord.getTileEntity(worldObj); + found = (IMultiblock)tile; return; } else if(tile instanceof IStructuralMultiblock)