From d7d0a2916e0e9f0edb12ad95e6eb6e5fdfd23d35 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 4 Nov 2013 19:28:01 -0800 Subject: [PATCH] Revert Smeltery to working code --- resources/assets/tinker/lang/en_US.lang | 2 + src/tconstruct/blocks/SmelteryBlock.java | 40 +++- .../blocks/component/SmelteryScan.java | 53 +++-- .../blocks/logic/AdaptiveDrainLogic.java | 181 ++++++++++++++++++ .../blocks/logic/AdaptiveSmelteryLogic.java | 13 +- .../blocks/logic/SmelteryDrainLogic.java | 79 ++++---- .../blocks/logic/SmelteryLogic.java | 3 +- src/tconstruct/blocks/logic/TankAirLogic.java | 8 +- src/tconstruct/client/TProxyClient.java | 23 ++- src/tconstruct/client/gui/SmelteryGui.java | 26 +-- src/tconstruct/common/TContent.java | 12 +- .../library/component/TankLayerScan.java | 80 +++++++- src/tconstruct/util/config/PHConstruct.java | 2 + 13 files changed, 434 insertions(+), 88 deletions(-) create mode 100644 src/tconstruct/blocks/logic/AdaptiveDrainLogic.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 7fb5bde5..746bd3c3 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -25,6 +25,8 @@ CraftedSoil.BlueSlime.name=Slimy Mud CraftedSoil.GraveyardSoil.name=Graveyard Soil CraftedSoil.ConsecratedSoil.name=Consecrated Soil tile.CastingChannel.name=Casting Channel +tile.slime.channel.name=Slime Channel +tile.slime.pad.name=Bounce Pad MetalOre.NetherSlag.name=Netherack Slag MetalOre.Cobalt.name=Cobalt Ore diff --git a/src/tconstruct/blocks/SmelteryBlock.java b/src/tconstruct/blocks/SmelteryBlock.java index 19509edf..0e74a223 100644 --- a/src/tconstruct/blocks/SmelteryBlock.java +++ b/src/tconstruct/blocks/SmelteryBlock.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.blocks.logic.MultiServantLogic; +import tconstruct.blocks.logic.AdaptiveDrainLogic; import tconstruct.blocks.logic.SmelteryDrainLogic; import tconstruct.blocks.logic.SmelteryLogic; import tconstruct.client.block.SmelteryRender; @@ -23,6 +24,7 @@ import tconstruct.library.blocks.InventoryBlock; import tconstruct.library.util.IFacingLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; +import tconstruct.util.config.PHConstruct; public class SmelteryBlock extends InventoryBlock { @@ -40,11 +42,11 @@ public class SmelteryBlock extends InventoryBlock /* Rendering */ - /*@Override + @Override public int getRenderType () { - return SmelteryRender.smelteryModel; - }*/ + return PHConstruct.newSmeltery ? 0 : SmelteryRender.smelteryModel; + } @Override public String[] getTextureNames () @@ -217,20 +219,27 @@ public class SmelteryBlock extends InventoryBlock switch (metadata) { case 0: - return new AdaptiveSmelteryLogic(); + if (PHConstruct.newSmeltery) + return new AdaptiveSmelteryLogic(); + else + return new SmelteryLogic(); + case 1: - return new SmelteryDrainLogic(); + if (PHConstruct.newSmeltery) + return new AdaptiveDrainLogic(); + else + return new SmelteryDrainLogic(); case 3: return null; //Furnace } return new MultiServantLogic(); } - - /*@Override + + @Override public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, entityliving, stack); - if (world.getBlockMetadata(x, y, z) == 0) + if (world.getBlockMetadata(x, y, z) == 0 && PHConstruct.newSmeltery) onBlockPlacedElsewhere(world, x, y, z, entityliving); } @@ -240,7 +249,7 @@ public class SmelteryBlock extends InventoryBlock logic.checkValidPlacement(); } - @Override + /*@Override public void breakBlock (World world, int x, int y, int z, int par5, int par6) //Don't drop inventory { world.removeBlockTileEntity(x, y, z); @@ -257,8 +266,10 @@ public class SmelteryBlock extends InventoryBlock } /* Updating */ + @Override public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID) { + //System.out.println("Neighbor changed"); TileEntity logic = world.getBlockTileEntity(x, y, z); if (logic instanceof IServantLogic) { @@ -269,4 +280,15 @@ public class SmelteryBlock extends InventoryBlock ((IMasterLogic) logic).notifyChange(null, x, y, z); } } + + @Override + public void breakBlock (World world, int x, int y, int z, int blockID, int meta) + { + TileEntity logic = world.getBlockTileEntity(x, y, z); + if (logic instanceof IServantLogic) + { + ((IServantLogic) logic).notifyMasterOfChange(); + } + super.breakBlock(world, x, y, z, blockID, meta); + } } diff --git a/src/tconstruct/blocks/component/SmelteryScan.java b/src/tconstruct/blocks/component/SmelteryScan.java index 6f8b7abd..62319a9f 100644 --- a/src/tconstruct/blocks/component/SmelteryScan.java +++ b/src/tconstruct/blocks/component/SmelteryScan.java @@ -28,7 +28,7 @@ public class SmelteryScan extends TankLayerScan lavaTanks.clear(); super.checkValidStructure(); } - + protected boolean checkAir (int x, int y, int z) { Block block = Block.blocksList[world.getBlockId(x, y, z)]; @@ -60,6 +60,7 @@ public class SmelteryScan extends TankLayerScan return false; } + @Override protected void finalizeStructure () { super.finalizeStructure(); @@ -69,13 +70,42 @@ public class SmelteryScan extends TankLayerScan { for (CoordTuple coord : airCoords) { - world.setBlock(coord.x, coord.y, coord.z, TContent.tankAir.blockID); - IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); - servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + if (world.getBlockId(coord.x, coord.y, coord.z) != TContent.tankAir.blockID) + { + world.setBlock(coord.x, coord.y, coord.z, TContent.tankAir.blockID); + IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); + servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } } } } + @Override + protected void invalidateStructure () + { + super.invalidateStructure(); + for (CoordTuple coord : airCoords) + { + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (servant instanceof IServantLogic) + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } + } + + @Override + protected void invalidateBlocksAbove (int height) + { + for (CoordTuple coord : airCoords) + { + if (coord.y < height) + continue; + + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (servant instanceof IServantLogic) + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } + } + @Override public void cleanup () { @@ -91,12 +121,13 @@ public class SmelteryScan extends TankLayerScan } } } - + + //Sync lava tanks for fuel values @Override - public void readFromNBT (NBTTagCompound tags) + public void readNetworkNBT (NBTTagCompound tags) { - super.readFromNBT(tags); - + super.readNetworkNBT(tags); + NBTTagList tanks = tags.getTagList("Tanks"); if (tanks != null) { @@ -110,11 +141,11 @@ public class SmelteryScan extends TankLayerScan } } } - + @Override - public void writeToNBT (NBTTagCompound tags) + public void writeNetworkNBT (NBTTagCompound tags) { - super.writeToNBT(tags); + super.writeNetworkNBT(tags); NBTTagList tanks = new NBTTagList(); for (CoordTuple coord : lavaTanks) diff --git a/src/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/tconstruct/blocks/logic/AdaptiveDrainLogic.java new file mode 100644 index 00000000..820fae0d --- /dev/null +++ b/src/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -0,0 +1,181 @@ +package tconstruct.blocks.logic; + +import tconstruct.TConstruct; +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 AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic//, ISwitchableMaster +{ + byte direction; + + public boolean canUpdate () + { + return false; + } + + @Override + public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z) + { + // TConstruct.logger.info("Master: "+master); + return (master instanceof AdaptiveSmelteryLogic || master instanceof AdaptiveDrainLogic) && !hasMaster; + } + + @Override + public int fill (ForgeDirection from, FluidStack resource, boolean doFill) + { + if (hasValidMaster() && canDrain(from, null)) + { + 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) + { + // TConstruct.logger.info("Attempting drain " + hasValidMaster()); + if (hasValidMaster() && canDrain(from, null)) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + // TConstruct.logger.info("Found master"); + return smeltery.drain(from, maxDrain, doDrain); + } + return null; + } + + @Override + public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) + { + 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) + { + 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) + { + if (hasValidMaster()) + { + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getFillState() > 0; + } + return false; + } + + @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.getTankInfo(ForgeDirection.UNKNOWN); + } + return null; + } + + @Override + public byte getRenderDirection () + { + return direction; + } + + @Override + public ForgeDirection getForgeDirection () + { + return ForgeDirection.VALID_DIRECTIONS[direction]; + } + + @Override + public void setDirection (int side) + { + + } + + @Override + public void setDirection (float yaw, float pitch, EntityLivingBase player) + { + if (pitch > 45) + direction = 1; + else if (pitch < -45) + direction = 0; + else + { + int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; + switch (facing) + { + case 0: + direction = 2; + break; + + case 1: + direction = 5; + break; + + case 2: + direction = 3; + break; + + case 3: + direction = 4; + break; + } + } + } + + public void readFromNBT (NBTTagCompound tags) + { + super.readFromNBT(tags); + direction = tags.getByte("Direction"); + } + + @Override + public void writeToNBT (NBTTagCompound tags) + { + super.writeToNBT(tags); + tags.setByte("Direction", direction); + } + + /* Packets */ + @Override + public Packet getDescriptionPacket () + { + NBTTagCompound tag = new NBTTagCompound(); + writeToNBT(tag); + return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag); + } + + @Override + public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) + { + readFromNBT(packet.data); + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + } +} diff --git a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 43099459..a6076e61 100644 --- a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -40,6 +40,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { byte direction; boolean updateFluids = false; + boolean recheckStructure = false; boolean updateAir = false; SmelteryScan structure = new SmelteryScan(this, TContent.smeltery, TContent.lavaTank); MultiFluidTank multitank = new MultiFluidTank(); @@ -81,6 +82,12 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc updateAir(); updateAir = false; } + + if (recheckStructure) + { + structure.recheckStructure(); + recheckStructure = false; + } } if (tick >= 60) @@ -129,7 +136,11 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc @Override public void notifyChange (IServantLogic servant, int x, int y, int z) { - //Re-check structure here + if (!worldObj.isRemote) + { + //System.out.println("Notifying of change from "+new CoordTuple(x, y, z)); + recheckStructure = true; + } } @Override diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java index a6ee2b38..d4a88159 100644 --- a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -1,23 +1,20 @@ package tconstruct.blocks.logic; -import tconstruct.TConstruct; 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//, ISwitchableMaster +public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { byte direction; @@ -26,68 +23,75 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl return false; } - @Override - public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z) - { - // TConstruct.logger.info("Master: "+master); - return (master instanceof AdaptiveSmelteryLogic || master instanceof SmelteryDrainLogic) && !hasMaster; - } - @Override public int fill (ForgeDirection from, FluidStack resource, boolean doFill) { - if (hasValidMaster() && canDrain(from, null)) + if (hasValidMaster() && resource != null && canFill(from, resource.getFluid())) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.fill(from, resource, doFill); + 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; } - return 0; } @Override public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { - // TConstruct.logger.info("Attempting drain " + hasValidMaster()); if (hasValidMaster() && canDrain(from, null)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - // TConstruct.logger.info("Found master"); - return smeltery.drain(from, maxDrain, doDrain); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.drain(maxDrain, doDrain); + } + else + { + return null; } - return null; } @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - if (hasValidMaster() && canDrain(from, null)) - { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.drain(from, resource, doDrain); - } + // TODO Auto-generated method stub return null; } @Override public boolean canFill (ForgeDirection from, Fluid fluid) { - if (hasValidMaster()) - { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.getFillState() < 2; - } - return false; + return true; + //return from == getForgeDirection();//.getOpposite(); } @Override public boolean canDrain (ForgeDirection from, Fluid fluid) { - if (hasValidMaster()) + // 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); - return smeltery.getFillState() > 0; + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + for (FluidStack fstack : smeltery.moltenMetal) + { + if (fstack.fluidID == fluid.getID()) + { + containsFluid = true; + break; + } + } } - return false; + //return from == getForgeDirection().getOpposite() && containsFluid; + return containsFluid; } @Override @@ -95,8 +99,9 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); - return smeltery.getTankInfo(ForgeDirection.UNKNOWN); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + return smeltery.getMultiTankInfo(); + //return new FluidTankInfo[] { smeltery.getInfo() }; } return null; } diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index 61704cf2..486d2e21 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -1062,7 +1062,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { NBTTagCompound nbt = (NBTTagCompound) liquidTag.tagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); - moltenMetal.add(fluid); + if (fluid != null) + moltenMetal.add(fluid); } //adjustLayers(layers, true); //checkValidPlacement(); diff --git a/src/tconstruct/blocks/logic/TankAirLogic.java b/src/tconstruct/blocks/logic/TankAirLogic.java index a57ba7f2..5382cee3 100644 --- a/src/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/tconstruct/blocks/logic/TankAirLogic.java @@ -33,8 +33,8 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide public void overrideFluids(ArrayList fluids) { - multitank.overrideFluids(fluids); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + /*multitank.overrideFluids(fluids); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);*/ } public boolean hasItem() @@ -55,13 +55,13 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide @Override public void setInventorySlotContents (int slot, ItemStack itemstack) { - inventory[slot] = itemstack; + /*inventory[slot] = itemstack; if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { itemstack.stackSize = getInventoryStackLimit(); worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, itemstack.getItemDamage(), 3); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } + }*/ } @Override diff --git a/src/tconstruct/client/TProxyClient.java b/src/tconstruct/client/TProxyClient.java index 7a268e43..744a27cb 100644 --- a/src/tconstruct/client/TProxyClient.java +++ b/src/tconstruct/client/TProxyClient.java @@ -46,6 +46,7 @@ import tconstruct.library.TConstructRegistry; import tconstruct.library.client.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; +import tconstruct.util.config.PHConstruct; import tconstruct.util.player.*; public class TProxyClient extends TProxyCommon @@ -70,7 +71,12 @@ public class TProxyClient extends TProxyCommon if (ID == frypanGuiID) return new FrypanGui(player.inventory, (FrypanLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == smelteryGuiID) - return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + { + if (PHConstruct.newSmeltery) + return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + else + return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + } if (ID == stencilTableID) return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == toolForgeID) @@ -82,7 +88,7 @@ public class TProxyClient extends TProxyCommon if (ID == craftingStationID) return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z); if (ID == advDrawbridgeID) - return new AdvDrawbridgeGui(player, (AdvancedDrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new AdvDrawbridgeGui(player, (AdvancedDrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == manualGuiID) { @@ -217,6 +223,8 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel()); RenderingRegistry.registerBlockHandler(new SlimeChannelRender()); RenderingRegistry.registerBlockHandler(new SlimePadRender()); + if (!PHConstruct.newSmeltery) + RenderingRegistry.registerBlockHandler(new SmelteryRender()); // Special Renderers ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); @@ -946,10 +954,11 @@ public class TProxyClient extends TProxyCommon return null; } } - + @Override - public void postInit() { - MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); - } - + public void postInit () + { + MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); + } + } diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/tconstruct/client/gui/SmelteryGui.java index f295b7ff..6d9b3ba4 100644 --- a/src/tconstruct/client/gui/SmelteryGui.java +++ b/src/tconstruct/client/gui/SmelteryGui.java @@ -281,13 +281,24 @@ public class SmelteryGui extends NewContainerGui } else { - String name = StatCollector.translateToLocal(FluidRegistry.getFluidName(liquid)); + String name = StatCollector.translateToLocal("fluid."+FluidRegistry.getFluidName(liquid)); list.add("\u00A7f" + name); - if (name.equals("liquified emerald")) + if (name.equals("Liquified Emerald")) { float emeralds = liquid.amount / 320f; list.add("Emeralds: " + emeralds); } + else if (name.equals("Molten Glass")) + { + int ingots = liquid.amount / 1000; + if (ingots > 0) + list.add("Blocks: " + ingots); + int mB = liquid.amount % 144; + if (mB > 0) + { + list.add("mB: " + mB); + } + } else if (name.contains("Molten")) { int ingots = liquid.amount / 144; @@ -315,17 +326,6 @@ public class SmelteryGui extends NewContainerGui list.add("mB: " + mB); } } - else if (name.equals("Molten Glass")) - { - int ingots = liquid.amount / 1000; - if (ingots > 0) - list.add("Blocks: " + ingots); - int mB = liquid.amount % 144; - if (mB > 0) - { - list.add("mB: " + mB); - } - } else { int mB = liquid.amount; diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index a3ca9327..285f270c 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -404,8 +404,16 @@ public class TContent implements IFuelHandler //Smeltery smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); - GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery"); - GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); + if (PHConstruct.newSmeltery) + { + GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain"); + } + else + { + GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); + } GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants"); lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index 20a2bd06..0963aae2 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -18,6 +18,7 @@ public class TankLayerScan extends LogicComponent protected int bricks = 0; protected int airBlocks = 0; + protected int structureTop = 0; protected HashSet layerBlockCoords = new HashSet(); protected HashSet layerAirCoords = new HashSet(); @@ -126,7 +127,7 @@ public class TankLayerScan extends LogicComponent if (lowY != -1) { completeStructure = true; - recurseStructureUp(master.yCoord + 1); + structureTop = recurseStructureUp(master.yCoord + 1); finalizeStructure(); if (!world.isRemote && debug) @@ -139,9 +140,10 @@ public class TankLayerScan extends LogicComponent } } - @SuppressWarnings({ "unchecked" }) + //@SuppressWarnings({ "unchecked" }) protected void finalizeStructure () { + Collections.sort(blockCoords, new CoordTupleSort()); Collections.sort(airCoords, new CoordTupleSort()); for (CoordTuple coord : blockCoords) @@ -344,7 +346,7 @@ public class TankLayerScan extends LogicComponent return -1; } - public void recurseStructureUp (int y) + public int recurseStructureUp (int y) { Iterator i = layerBlockCoords.iterator(); if (i.hasNext()) @@ -391,6 +393,7 @@ public class TankLayerScan extends LogicComponent recurseStructureUp(y + 1); } } + return y - 1; } protected void addAirBlock (int x, int y, int z) @@ -399,6 +402,74 @@ public class TankLayerScan extends LogicComponent airCoords.add(new CoordTuple(x, y, z)); } + /* Checking for valid structures */ + + public void recheckStructure () + { + System.out.println("Rechecking structure"); + int height = -1; + for (CoordTuple coord : blockCoords) + { + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + boolean canPass = false; + if (servant instanceof IServantLogic) + { + canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + if (canPass) + continue; + } + if (!canPass) + { + System.out.println("Coord: "+coord); + height = coord.y; + break; + } + } + + if (height != -1) + { + if (height <= master.yCoord) + invalidateStructure(); + else + invalidateBlocksAbove(height); + } + else + { + if (structureTop == 0) //Workaround for missing data + { + for (CoordTuple coord : blockCoords) + structureTop = coord.y; + } + structureTop = recurseStructureUp(structureTop + 1); + finalizeStructure(); + } + } + + protected void invalidateStructure () + { + completeStructure = false; + for (CoordTuple coord : blockCoords) + { + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (servant instanceof IServantLogic) + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } + master.worldObj.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + } + + protected void invalidateBlocksAbove (int height) + { + for (CoordTuple coord : blockCoords) + { + if (coord.y < height) + continue; + + TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (servant instanceof IServantLogic) + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } + } + /** Do any necessary cleanup here. Remove air blocks, invalidate servants, etc */ public void cleanup () { @@ -414,6 +485,7 @@ public class TankLayerScan extends LogicComponent } } + /* NBT */ @Override public void readFromNBT (NBTTagCompound tags) { @@ -456,6 +528,7 @@ public class TankLayerScan extends LogicComponent airCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } + structureTop = tags.getInteger("structureTop"); } public void readNetworkNBT (NBTTagCompound tags) @@ -487,6 +560,7 @@ public class TankLayerScan extends LogicComponent air.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Air", air); + tags.setInteger("structureTop", structureTop); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index db2e9961..e1542954 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -370,6 +370,7 @@ public class PHConstruct //Experimental functionality throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true); + newSmeltery = config.get("Experimental", "Use new adaptive Smeltery code", false, "Warning: Very buggy").getBoolean(false); //Addon stuff isCleaverTwoHanded = config.get("Battlegear", "Can Cleavers have shields", true).getBoolean(true); @@ -706,6 +707,7 @@ public class PHConstruct //Experimental functionality public static boolean throwableSmeltery; + public static boolean newSmeltery; //Addon stuff public static boolean isCleaverTwoHanded;