From 520bf463323f1c13aaef7618f108d30df603a524 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 8 Aug 2014 21:51:37 +0100 Subject: [PATCH 1/4] Fix my typo --- src/main/java/mekanism/common/entity/EntityRobit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index db8abee5a..0c4bc68c1 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -44,7 +44,7 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; -@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticrat API") +@Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API") public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable { public double MAX_ELECTRICITY = 100000; From 4d4926d0df6343e0d3404ed7d19c20007e5c369c Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Fri, 8 Aug 2014 21:21:28 -0400 Subject: [PATCH 2/4] Fixed Dynamic Tanks not updating when being filled with buckets. I knew I missed something. --- src/main/java/mekanism/common/tile/TileEntityDynamicTank.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index ad5fc2dd7..2da92ae74 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -15,8 +15,8 @@ import mekanism.common.tank.DynamicTankCache; import mekanism.common.tank.SynchronizedTankData; import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.tank.TankUpdateProtocol; -import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -497,7 +497,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock implements I if(tileEntity != null && tileEntity.isRendering) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } } } From a0b8ab0331ebe09f8ea9346e9b44ea7db83ccef6 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Fri, 8 Aug 2014 21:25:59 -0400 Subject: [PATCH 3/4] Quick cleanup --- src/main/java/mekanism/common/util/CableUtils.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index b0af6c156..a676801f8 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -22,18 +22,12 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.mj.IBatteryObject; import buildcraft.api.mj.MjAPI; import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.IPowerReceptor; +import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; public final class CableUtils { - private static Set allSides; - - static - { - allSides = EnumSet.allOf(ForgeDirection.class); - allSides.remove(ForgeDirection.UNKNOWN); - } + private static Set allSides = EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN)); /** * Gets all the connected energy acceptors, whether IC2-based or BuildCraft-based, surrounding a specific tile entity. @@ -152,6 +146,7 @@ public final class CableUtils return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler && ((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) || + (MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) || (MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerEmitter && ((IPowerEmitter)tileEntity).canEmitPowerFrom(side.getOpposite())); } From ed919fa19aa6b5046bf877e244f4c073fc11092d Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 8 Aug 2014 22:08:55 -0400 Subject: [PATCH 4/4] Fixed the no-update issues --- .../common/multipart/PartSidedPipe.java | 14 ++++++--- .../common/multipart/PartTransmitter.java | 4 +-- .../common/tile/TileEntityDynamicTank.java | 4 +-- .../tile/TileEntitySalinationController.java | 13 +++------ .../tile/TileEntitySalinationValve.java | 29 ++++++++++++++++++- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index d3f7a1cd8..357510fd0 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -40,6 +40,7 @@ import codechicken.lib.render.CCModel; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Vector3; import codechicken.microblock.ISidedHollowConnect; +import codechicken.multipart.INeighborTileChange; import codechicken.multipart.IconHitEffects; import codechicken.multipart.JIconHitEffects; import codechicken.multipart.JNormalOcclusion; @@ -52,7 +53,7 @@ import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter +public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, INeighborTileChange { public static IndexedCuboid6[] smallSides = new IndexedCuboid6[7]; public static IndexedCuboid6[] largeSides = new IndexedCuboid6[7]; @@ -513,11 +514,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, super.onChunkLoad(); refreshConnections(); } - + @Override - public void onNeighborChanged() + public void onNeighborTileChanged(int side, boolean weak) { - super.onNeighborChanged(); refreshConnections(); } @@ -665,4 +665,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, return values()[ordinal()+1]; } } + + @Override + public boolean weakTileChanges() + { + return false; + } } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 20e4aa8f9..f6780a184 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -197,9 +197,9 @@ public abstract class PartTransmitter> extends Pa } @Override - public void onNeighborChanged() + public void onNeighborTileChanged(int side, boolean weak) { - super.onNeighborChanged(); + super.onNeighborTileChanged(side, weak); if(!world().isRemote) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 2da92ae74..1f9eb3dcc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -173,9 +173,9 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock implements I { Coord4D obj = Coord4D.get(this).getFromSide(side); - if(!(obj.getTileEntity(worldObj) instanceof TileEntityDynamicTank)) + if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntityDynamicTank)) { - worldObj.notifyBlockOfNeighborChange(obj.xCoord, obj.yCoord, obj.zCoord, getBlockType()); + obj.getBlock(worldObj).onNeighborChange(worldObj, obj.xCoord, obj.yCoord, obj.zCoord, xCoord, yCoord, zCoord); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java index 05dd14c2c..85d2ee778 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java @@ -165,6 +165,9 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp temperature = Math.min(getMaxTemperature(), getTemperature()); } + else { + clearStructure(); + } } } } @@ -379,15 +382,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp structured = scanTopLayer(startPoint); height = structured ? height : 0; - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - - for(TileEntitySalinationTank tank : tankParts) - { - if(tank != this && tank instanceof TileEntitySalinationValve) - { - worldObj.notifyBlocksOfNeighborChange(tank.xCoord, tank.yCoord, tank.zCoord, tank.getBlockType()); - } - } + markDirty(); return structured; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java index e20b58612..2bba1f93f 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import mekanism.api.Coord4D; +import mekanism.common.util.PipeUtils; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -9,6 +11,31 @@ import net.minecraftforge.fluids.IFluidHandler; public class TileEntitySalinationValve extends TileEntitySalinationTank implements IFluidHandler { + public boolean prevMaster = false; + + @Override + public void onUpdate() + { + super.onUpdate(); + + if(!worldObj.isRemote) + { + if((master != null) != prevMaster) + { + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + Coord4D obj = Coord4D.get(this).getFromSide(side); + + if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntitySalinationTank)) + { + obj.getBlock(worldObj).onNeighborChange(worldObj, obj.xCoord, obj.yCoord, obj.zCoord, xCoord, yCoord, zCoord); + } + } + } + + prevMaster = (master != null); + } + } @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { @@ -54,7 +81,7 @@ public class TileEntitySalinationValve extends TileEntitySalinationTank implemen { if(master == null) { - return new FluidTankInfo[0]; + return PipeUtils.EMPTY; } return new FluidTankInfo[] {new FluidTankInfo(master.waterTank), new FluidTankInfo(master.brineTank)};