From 3b9b803aadb73a3f9c2f311decbb111278050211 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 9 Oct 2013 22:21:19 -0700 Subject: [PATCH] Smeltery Gigantus drains function properly --- src/tconstruct/blocks/TankAirBlock.java | 50 ++++++- .../blocks/component/SmelteryComponent.java | 9 +- .../blocks/component/SmelteryScan.java | 40 ++++-- .../blocks/logic/AdaptiveSmelteryLogic.java | 130 +++++++++++++++++- .../blocks/logic/MultiServantLogic.java | 50 ++++--- .../blocks/logic/SmelteryDrainLogic.java | 78 +++++------ src/tconstruct/blocks/logic/TankAirLogic.java | 2 +- .../client/gui/AdaptiveSmelteryGui.java | 10 +- .../library/component/MultiFluidTank.java | 8 +- .../library/component/TankLayerScan.java | 8 ++ src/tconstruct/library/util/IMasterNode.java | 8 ++ 11 files changed, 298 insertions(+), 95 deletions(-) create mode 100644 src/tconstruct/library/util/IMasterNode.java diff --git a/src/tconstruct/blocks/TankAirBlock.java b/src/tconstruct/blocks/TankAirBlock.java index 3bfbf3e6..252f6165 100644 --- a/src/tconstruct/blocks/TankAirBlock.java +++ b/src/tconstruct/blocks/TankAirBlock.java @@ -1,15 +1,20 @@ package tconstruct.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import tconstruct.blocks.logic.TankAirLogic; import tconstruct.client.block.TankAirRender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TankAirBlock extends BlockContainer { @@ -24,17 +29,17 @@ public class TankAirBlock extends BlockContainer { return new TankAirLogic(); } - + @Override public int getRenderType () { return TankAirRender.model; } - + @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons (IconRegister par1IconRegister) { - + } @Override @@ -48,10 +53,41 @@ public class TankAirBlock extends BlockContainer { return false; } - + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + { + TankAirLogic tank = (TankAirLogic) world.getBlockTileEntity(x, y, z); + if (tank.hasItem()) + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + + return null; + } + + public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 par5Vec3, Vec3 par6Vec3) + { + TankAirLogic tank = (TankAirLogic) world.getBlockTileEntity(x, y, z); + if (tank.hasItem()) + return super.collisionRayTrace(world, x, y, z, par5Vec3, par6Vec3); + + return null; + } + + @Override + public ItemStack getPickBlock (MovingObjectPosition target, World world, int x, int y, int z) { return null; } + + @Override + public boolean isBlockReplaceable (World world, int x, int y, int z) + { + return false; + } + + @Override + public boolean canHarvestBlock(EntityPlayer player, int meta) + { + return false; + } } diff --git a/src/tconstruct/blocks/component/SmelteryComponent.java b/src/tconstruct/blocks/component/SmelteryComponent.java index b26f94ee..ecd7bdf6 100644 --- a/src/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/tconstruct/blocks/component/SmelteryComponent.java @@ -80,7 +80,6 @@ public class SmelteryComponent extends LogicComponent for (int i = 0; i < meltingTemps.length; i++) { meltingTemps[i] = Smeltery.instance.getLiquifyTemperature(master.getStackInSlot(i)); - System.out.println("New temp: " + meltingTemps[i]); } } @@ -101,7 +100,7 @@ public class SmelteryComponent extends LogicComponent hasUse = true; if (activeTemps[i] < maxTemp && activeTemps[i] < meltingTemps[i]) { - activeTemps[i] += 1; + activeTemps[i] += 10; } else if (activeTemps[i] >= meltingTemps[i] && !world.isRemote) { @@ -134,7 +133,7 @@ public class SmelteryComponent extends LogicComponent void updateFuelGague () { - if (activeLavaTank == null || fuelTicks > 0) + if (activeLavaTank == null || fuelTicks > 0 || structure.lavaTanks.size() < 1) return; if (!world.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) @@ -252,8 +251,9 @@ public class SmelteryComponent extends LogicComponent { activeTemps = tags.getIntArray("Temperature"); meltingTemps = tags.getIntArray("Melting"); + fuelAmount = tags.getInteger("Fuel"); int[] tank = tags.getIntArray("LavaTank"); - if (tank != null) + if (tank.length > 0) activeLavaTank = new CoordTuple(tank[0], tank[1], tank[2]); } @@ -261,6 +261,7 @@ public class SmelteryComponent extends LogicComponent { tags.setIntArray("Temperature", activeTemps); tags.setIntArray("Melting", meltingTemps); + tags.setInteger("Fuel", fuelAmount); if (activeLavaTank != null) tags.setIntArray("LavaTank", new int[] { activeLavaTank.x, activeLavaTank.y, activeLavaTank.z }); } diff --git a/src/tconstruct/blocks/component/SmelteryScan.java b/src/tconstruct/blocks/component/SmelteryScan.java index ae57e9e3..ac8843b7 100644 --- a/src/tconstruct/blocks/component/SmelteryScan.java +++ b/src/tconstruct/blocks/component/SmelteryScan.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.Iterator; import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import tconstruct.common.TContent; import tconstruct.library.component.TankLayerScan; @@ -79,17 +82,36 @@ public class SmelteryScan extends TankLayerScan } } } - /*public void cleanup() + + @Override + public void readFromNBT (NBTTagCompound tags) { - System.out.println("Structure cleanup activated. Air blocks: "+airCoords.size()); - super.cleanup(); + super.readFromNBT(tags); - //Temporary - Iterator i = airCoords.iterator(); - while (i.hasNext()) + NBTTagList tanks = tags.getTagList("Tanks"); + if (tanks != null) { - CoordTuple coord = (CoordTuple) i.next(); - world.setBlockToAir(coord.x, coord.y, coord.z); + lavaTanks.clear(); + + for (int i = 0; i < tanks.tagCount(); ++i) + { + NBTTagIntArray tag = (NBTTagIntArray) tanks.tagAt(i); + int[] coord = tag.intArray; + layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); + } } - }*/ + } + + @Override + public void writeToNBT (NBTTagCompound tags) + { + super.writeToNBT(tags); + + NBTTagList tanks = new NBTTagList(); + for (CoordTuple coord : lavaTanks) + { + tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + } + tags.setTag("Tanks", tanks); + } } diff --git a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 4ebdb56c..32c7958b 100644 --- a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -18,7 +18,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import tconstruct.TConstruct; import tconstruct.blocks.component.SmelteryComponent; import tconstruct.blocks.component.SmelteryScan; @@ -33,7 +36,7 @@ import tconstruct.library.util.IActiveLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; -public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder +public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder, IFluidHandler { byte direction; boolean updateFluids = false; @@ -420,6 +423,130 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { return "crafters.Smeltery"; } + + /*@Override + public int fill (ForgeDirection from, FluidStack resource, boolean doFill) + { + if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) + { + if (doFill) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.fill(resource, doFill); + } + else + { + return resource.amount; + } + } + else + { + } + return 0; + } + + @Override + public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) + { + if (hasValidMaster() && canDrain(from, null)) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.drain(maxDrain, doDrain); + } + else + { + return null; + } + } + + @Override + public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) + { + return null; + } + + @Override + public boolean canFill (ForgeDirection from, Fluid fluid) + { + return true; + } + + @Override + public boolean canDrain (ForgeDirection from, Fluid fluid) + { + // Check that the drain is coming from the from the front of the block + // and that the fluid to be drained is in the smeltery. + boolean containsFluid = fluid == null; + if (fluid != null) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + for (FluidStack fstack : smeltery.moltenMetal) + { + if (fstack.fluidID == fluid.getID()) + { + containsFluid = true; + break; + } + } + } + //return from == getForgeDirection().getOpposite() && containsFluid; + return containsFluid; + } + + @Override + public FluidTankInfo[] getTankInfo (ForgeDirection from) + { + if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getMultiTankInfo(); + //return new FluidTankInfo[] { smeltery.getInfo() }; + } + return null; + }*/ + + /* Fluids */ + + @Override + public int fill (ForgeDirection from, FluidStack resource, boolean doFill) + { + return multitank.fill(resource, doFill); + } + + @Override + public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) + { + return multitank.drain(resource.amount, doDrain); + } + + @Override + public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) + { + return multitank.drain(maxDrain, doDrain); + } + + @Override + public boolean canFill (ForgeDirection from, Fluid fluid) + { + return false; + } + + @Override + public boolean canDrain (ForgeDirection from, Fluid fluid) + { + return false; + } + + @Override + public FluidTankInfo[] getTankInfo (ForgeDirection from) + { + return multitank.getMultiTankInfo(); + } + + public int getFillState () + { + return 1; + } /* NBT */ @@ -438,7 +565,6 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { direction = tags.getByte("Direction"); inventory = new ItemStack[tags.getInteger("InvSize")]; - System.out.println("Inventory size: " + inventory.length); structure.readNetworkNBT(tags); multitank.readNetworkNBT(tags); diff --git a/src/tconstruct/blocks/logic/MultiServantLogic.java b/src/tconstruct/blocks/logic/MultiServantLogic.java index 06687648..4950dc2e 100644 --- a/src/tconstruct/blocks/logic/MultiServantLogic.java +++ b/src/tconstruct/blocks/logic/MultiServantLogic.java @@ -29,6 +29,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic if (worldObj.getBlockId(master.x, master.y, master.z) == masterID && worldObj.getBlockMetadata(master.x, master.y, master.z) == masterMeat) return true; + else { hasMaster = false; @@ -58,6 +59,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic masterMeat = 0; } + @Deprecated public boolean verifyMaster (IMasterLogic logic, int x, int y, int z) { if (master.equalCoords(x, y, z) && worldObj.getBlockId(x, y, z) == masterID && worldObj.getBlockMetadata(x, y, z) == masterMeat) @@ -66,13 +68,6 @@ public class MultiServantLogic extends TileEntity implements IServantLogic return false; } - @Override - public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z) - { - // TODO Auto-generated method stub - return true; - } - @Deprecated public boolean setMaster (int x, int y, int z) { @@ -87,6 +82,33 @@ public class MultiServantLogic extends TileEntity implements IServantLogic } } + @Override + public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z) + { + return !hasMaster; + } + + @Override + public boolean verifyMaster (IMasterLogic logic, World world, int x, int y, int z) + { + if (hasMaster) + { + return hasValidMaster(); + } + else + { + overrideMaster(x, y, z); + return true; + } + } + + @Override + public void invalidateMaster (IMasterLogic master, World world, int x, int y, int z) + { + hasMaster = false; + master = null; + } + public void notifyMasterOfChange () { if (hasValidMaster()) @@ -152,18 +174,4 @@ public class MultiServantLogic extends TileEntity implements IServantLogic readCustomNBT(packet.data); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } - - @Override - public boolean verifyMaster (IMasterLogic master, World world, int x, int y, int z) - { - // TODO Auto-generated method stub - return false; - } - - @Override - public void invalidateMaster (IMasterLogic master, World world, int x, int y, int z) - { - hasMaster = false; - master = null; - } } diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java index d4a88159..9dc0c76e 100644 --- a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -2,19 +2,21 @@ package tconstruct.blocks.logic; import tconstruct.library.crafting.AlloyMix; import tconstruct.library.util.IFacingLogic; +import tconstruct.library.util.IMasterLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.util.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic +public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic//, ISwitchableMaster { byte direction; @@ -23,75 +25,68 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl return false; } + @Override + public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z) + { + System.out.println("Master: "+master); + return (master instanceof AdaptiveSmelteryLogic || master instanceof SmelteryDrainLogic) && !hasMaster; + } + @Override public int fill (ForgeDirection from, FluidStack resource, boolean doFill) { - if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) + if (hasValidMaster() && canDrain(from, null)) { - if (doFill) - { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.fill(resource, doFill); - } - else - { - return resource.amount; - } - } - else - { - return 0; + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.fill(from, resource, doFill); } + return 0; } @Override public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { + System.out.println("Attempting drain "+hasValidMaster()); if (hasValidMaster() && canDrain(from, null)) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.drain(maxDrain, doDrain); - } - else - { - return null; + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + System.out.println("Found master"); + return smeltery.drain(from, maxDrain, doDrain); } + return null; } @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - // TODO Auto-generated method stub + if (hasValidMaster() && canDrain(from, null)) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.drain(from, resource, doDrain); + } return null; } @Override public boolean canFill (ForgeDirection from, Fluid fluid) { - return true; - //return from == getForgeDirection();//.getOpposite(); + if (hasValidMaster()) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getFillState() < 2; + } + return false; } @Override public boolean canDrain (ForgeDirection from, Fluid fluid) { - // Check that the drain is coming from the from the front of the block - // and that the fluid to be drained is in the smeltery. - boolean containsFluid = fluid == null; - if (fluid != null) + if (hasValidMaster()) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - for (FluidStack fstack : smeltery.moltenMetal) - { - if (fstack.fluidID == fluid.getID()) - { - containsFluid = true; - break; - } - } + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getFillState() > 0; } - //return from == getForgeDirection().getOpposite() && containsFluid; - return containsFluid; + return false; } @Override @@ -99,9 +94,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.getMultiTankInfo(); - //return new FluidTankInfo[] { smeltery.getInfo() }; + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getTankInfo(ForgeDirection.UNKNOWN); } return null; } diff --git a/src/tconstruct/blocks/logic/TankAirLogic.java b/src/tconstruct/blocks/logic/TankAirLogic.java index be17f519..a75c459c 100644 --- a/src/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/tconstruct/blocks/logic/TankAirLogic.java @@ -60,7 +60,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide { itemstack.stackSize = getInventoryStackLimit(); worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, itemstack == null ? 0 : itemstack.getItemDamage(), 3); - //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/tconstruct/client/gui/AdaptiveSmelteryGui.java index ec647cba..09f99cf4 100644 --- a/src/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -1,17 +1,12 @@ package tconstruct.client.gui; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Icon; import net.minecraft.util.ResourceLocation; @@ -26,8 +21,7 @@ import org.lwjgl.opengl.GL12; import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.SmelteryContainer; -import cpw.mods.fml.common.network.PacketDispatcher; +import tconstruct.inventory.AdaptiveSmelteryContainer; public class AdaptiveSmelteryGui extends NewContainerGui { @@ -97,7 +91,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui this.currentScroll = 1.0F; } - int s = ((SmelteryContainer) this.container).scrollTo(this.currentScroll); + int s = ((AdaptiveSmelteryContainer) this.container).scrollTo(this.currentScroll); if (s != -1) slotPos = s; } diff --git a/src/tconstruct/library/component/MultiFluidTank.java b/src/tconstruct/library/component/MultiFluidTank.java index db86694a..b02d9bc0 100644 --- a/src/tconstruct/library/component/MultiFluidTank.java +++ b/src/tconstruct/library/component/MultiFluidTank.java @@ -1,13 +1,14 @@ package tconstruct.library.component; import java.util.ArrayList; +import java.util.List; -import tconstruct.library.crafting.Smeltery; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import tconstruct.library.crafting.Smeltery; public class MultiFluidTank extends LogicComponent implements IFluidTank { @@ -150,6 +151,11 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank return null; return fluidlist.get(0); } + + public List getAllFluids() + { + return fluidlist; + } @Override public FluidTankInfo getInfo () diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index ce156bb5..edaa51a5 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import tconstruct.common.TContent; import tconstruct.library.util.CoordTuple; import tconstruct.library.util.CoordTupleSort; import tconstruct.library.util.IFacingLogic; @@ -145,6 +146,13 @@ public class TankLayerScan extends LogicComponent protected void finalizeStructure () { Collections.sort(airCoords, new CoordTupleSort()); + + for (CoordTuple coord : blockCoords) + { + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (servant instanceof IServantLogic) + ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } } public boolean isComplete () diff --git a/src/tconstruct/library/util/IMasterNode.java b/src/tconstruct/library/util/IMasterNode.java new file mode 100644 index 00000000..edf609ba --- /dev/null +++ b/src/tconstruct/library/util/IMasterNode.java @@ -0,0 +1,8 @@ +package tconstruct.library.util; + +public interface IMasterNode extends IMasterLogic, IServantLogic +{ + public boolean isCurrentlyMaster(); + + public boolean isEquivalentMaster(IMasterLogic master); +}