diff --git a/src/main/java/techreborn/partSystem/parts/CablePart.java b/src/main/java/techreborn/partSystem/parts/CablePart.java index cc8e134b0..7657c0041 100644 --- a/src/main/java/techreborn/partSystem/parts/CablePart.java +++ b/src/main/java/techreborn/partSystem/parts/CablePart.java @@ -5,9 +5,6 @@ import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergyConductor; import ic2.api.energy.tile.IEnergyTile; import ic2.core.IC2; -import ic2.core.Ic2Items; -import ic2.core.block.wiring.RenderBlockCable; -import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -104,24 +101,11 @@ public class CablePart extends ModPart implements IEnergyConductor { public void renderDynamic(Vecs3d translation, double delta) { } - //TODO make this static for all cables in the world. - FakeCableWorld fakeCableWorld; @Override public boolean renderStatic(Vecs3d translation, RenderBlocks renderBlocks, int pass) { - if(worldObj!= null){ - if(fakeCableWorld == null){ - fakeCableWorld = new FakeCableWorld(); - } - RenderBlockCable renderBlockCable = new RenderBlockCable(); - return renderBlockCable.renderWorldBlock(fakeCableWorld, getX(), getY(), getZ(), Block.getBlockFromItem(Ic2Items.copperCableBlock.getItem()) , 0, RenderBlocks.getInstance()); - - } -// renderBlocks.renderBlockAllFaces(Blocks.coal_block, getX(), getY(), getZ()); -// renderBlocks.renderStandardBlock(Blocks.coal_block, getX(), getY() + 1, getZ()); - - return true; + return false; } @Override diff --git a/src/main/java/techreborn/partSystem/parts/FakeCableWorld.java b/src/main/java/techreborn/partSystem/parts/FakeCableWorld.java deleted file mode 100644 index 327973588..000000000 --- a/src/main/java/techreborn/partSystem/parts/FakeCableWorld.java +++ /dev/null @@ -1,80 +0,0 @@ -package techreborn.partSystem.parts; - -import ic2.core.Ic2Items; -import ic2.core.block.wiring.TileEntityCable; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraft.entity.Entity; -import net.minecraft.network.NetworkManager; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.WorldSettings; -import net.minecraft.world.WorldType; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; - - -public class FakeCableWorld extends WorldClient { - - public int meta; - - public FakeCableWorld() { - super(new NetHandlerPlayClient(Minecraft.getMinecraft(), null, new NetworkManager(true)), new WorldSettings(0, WorldSettings.GameType.NOT_SET, - false, false, WorldType.DEFAULT), 0, EnumDifficulty.PEACEFUL, Minecraft.getMinecraft().theWorld.theProfiler); - } - - @Override - protected IChunkProvider createChunkProvider() { - return Minecraft.getMinecraft().thePlayer.worldObj.getChunkProvider(); - } - - @Override - protected int func_152379_p() { - return Minecraft.getMinecraft().gameSettings.renderDistanceChunks; - } - - @Override - public Entity getEntityByID(int p_73045_1_) { - return Minecraft.getMinecraft().theWorld.getEntityByID(p_73045_1_); - } - - - @Override - public TileEntity getTileEntity(int x, int y, int z) { - TileEntityCable cable = new TileEntityCable(); - cable.setWorldObj(this); - cable.changeFoam((byte) 1); - cable.changeType((short) 2); - cable.xCoord = x; - cable.yCoord = y; - cable.zCoord = z; - cable.connectivity = (byte)3; - cable.blockType = Block.getBlockFromItem(Ic2Items.copperCableBlock.getItem()); - cable.onRender(); - - return cable; - } - - @Override - public Chunk getChunkFromBlockCoords(int p_72938_1_, int p_72938_2_) { - return Minecraft.getMinecraft().theWorld.getChunkFromBlockCoords(p_72938_1_, p_72938_2_); - } - - @Override - public boolean setBlockMetadataWithNotify(int p_72921_1_, int p_72921_2_, int p_72921_3_, int p_72921_4_, int p_72921_5_) { - meta = p_72921_4_; - return true; - } - - @Override - public int getBlockMetadata(int p_72805_1_, int p_72805_2_, int p_72805_3_) { - return meta; - } - - @Override - public Block getBlock(int p_147439_1_, int p_147439_2_, int p_147439_3_) { - return Block.getBlockFromItem(Ic2Items.copperCableBlock.getItem()); - } -}