From 8329fc1eef5c02afa8da2ab9cd6b74b9de44c191 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 7 Sep 2014 19:27:30 +0800 Subject: [PATCH] #981 Performance decrease using redstone conduits. --- .../crazypants/enderio/conduit/AbstractConduit.java | 6 ++++++ .../enderio/conduit/BlockConduitBundle.java | 2 +- .../java/crazypants/enderio/conduit/IConduit.java | 3 +++ .../crazypants/enderio/conduit/IConduitBundle.java | 3 +++ .../enderio/conduit/TileConduitBundle.java | 12 ++++++++++++ .../enderio/conduit/redstone/RedstoneConduit.java | 6 ++++++ 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 19934228..df46497c 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; @@ -477,6 +478,11 @@ public abstract class AbstractConduit implements IConduit { } return false; } + + @Override + public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + return onNeighborBlockChange(world.getBlock(tileX, tileY, tileZ)); + } @Override public Collection createCollidables(CacheKey key) { diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index de46ebfc..eec0eda1 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -613,7 +613,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { TileEntity conduit = world.getTileEntity(x, y, z); if(conduit instanceof IConduitBundle) { - ((IConduitBundle) conduit).onNeighborBlockChange(world.getBlock(tileX, tileY, tileZ)); + ((IConduitBundle) conduit).onNeighborChange(world, x, y, z, tileX, tileY, tileZ); } } diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 76ab39ca..da4dff54 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; @@ -122,5 +123,7 @@ public interface IConduit { void updateEntity(World worldObj); boolean onNeighborBlockChange(Block blockId); + + boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); } diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index f325fadd..f12ba6c3 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -7,6 +7,7 @@ import java.util.Set; import mekanism.api.gas.IGasHandler; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; @@ -57,6 +58,8 @@ public interface IConduitBundle extends IInternalPowerReceptor, IFluidHandler, I // events void onNeighborBlockChange(Block blockId); + + void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); void onBlockRemoved(); diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index bc5cd0d8..634986b8 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -285,6 +286,17 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { dirty(); } } + + @Override + public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + boolean needsUpdate = false; + for (IConduit conduit : conduits) { + needsUpdate |= conduit.onNeighborChange(world, x, y, z, tileX, tileY, tileZ); + } + if(needsUpdate) { + dirty(); + } + } @Override public TileConduitBundle getEntity() { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index 1f6c8977..6e39f19b 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -11,6 +11,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; @@ -243,5 +244,10 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit } return 0; } + + @Override + public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + return false; + } }