diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index c1520eca..f571b368 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -128,10 +128,6 @@ public class TConstruct VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); try { - //if (MinecraftServer.getServer().getMinecraftVersion().equals("1.6.4")) - /*ComparableVersion cv = new ComparableVersion(new CallableMinecraftVersion(null).minecraftVersion()); - ComparableVersion compare = new ComparableVersion("1.6.4"); - if (compare.compareTo(cv) > 0)*///<-- Probably not right if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4")) { MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); diff --git a/src/tconstruct/blocks/SmelteryBlock.java b/src/tconstruct/blocks/SmelteryBlock.java index 17868435..e5a9bfd3 100644 --- a/src/tconstruct/blocks/SmelteryBlock.java +++ b/src/tconstruct/blocks/SmelteryBlock.java @@ -13,6 +13,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; +import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.blocks.logic.MultiServantLogic; import tconstruct.blocks.logic.SmelteryDrainLogic; import tconstruct.blocks.logic.SmelteryLogic; @@ -138,7 +139,8 @@ public class SmelteryBlock extends InventoryBlock @Override public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) { - return TConstruct.proxy.smelteryGuiID; + return -1; + //return TConstruct.proxy.smelteryGuiID; } public void randomDisplayTick (World world, int x, int y, int z, Random random) @@ -214,7 +216,7 @@ public class SmelteryBlock extends InventoryBlock switch (metadata) { case 0: - return new SmelteryLogic(); + return new AdaptiveSmelteryLogic(); case 1: return new SmelteryDrainLogic(); case 3: diff --git a/src/tconstruct/blocks/component/SmelteryScan.java b/src/tconstruct/blocks/component/SmelteryScan.java index a224509f..0b074672 100644 --- a/src/tconstruct/blocks/component/SmelteryScan.java +++ b/src/tconstruct/blocks/component/SmelteryScan.java @@ -51,13 +51,15 @@ public class SmelteryScan extends TankLayerScan protected void addAirBlock (int x, int y, int z) { super.addAirBlock(x, y, z); - world.setBlock(x, y, z, Block.leaves.blockID); + world.setBlock(x, y, z, Block.glass.blockID); } public void cleanup() { System.out.println("Structure cleanup activated. Air blocks: "+airCoords.size()); super.cleanup(); + + //Temporary Iterator i = airCoords.iterator(); while (i.hasNext()) { diff --git a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 26f43304..fa7db123 100644 --- a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -22,6 +22,7 @@ import tconstruct.library.blocks.AdaptiveInventoryLogic; import tconstruct.library.component.IComponentHolder; import tconstruct.library.component.LogicComponent; import tconstruct.library.component.MultiFluidTank; +import tconstruct.library.util.CoordTuple; import tconstruct.library.util.IActiveLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; @@ -41,29 +42,37 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc if (tick % 4 == 0) smeltery.heatItems(); - if (tick % 20 == 0) + if (tick % 20 == 0 && structure.isComplete()) + { + smeltery.update(); + } + + if (tick >= 60) { if (!structure.isComplete()) { structure.checkValidStructure(); if (structure.isComplete()) { - smeltery.adjustSize(structure.getAirSize(), true); - multitank.setCapacity(structure.getAirSize() * (TConstruct.ingotLiquidValue * 18)); + validateSmeltery(); } } - else - { - smeltery.update(); - } - } - - if (tick == 60) - { tick = 0; } } + @Override + public List getComponents () + { + ArrayList ret = new ArrayList(3); + ret.add(structure); + ret.add(multitank); + ret.add(smeltery); + return ret; + } + + /* Structure */ + @Override public void setWorldObj (World world) { @@ -72,6 +81,37 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc smeltery.setWorld(world); } + @Override + public void notifyChange (IServantLogic servant, int x, int y, int z) + { + + } + + @Override + public void placeBlock (EntityLivingBase entity, ItemStack itemstack) + { + structure.checkValidStructure(); + if (structure.isComplete()) + { + validateSmeltery(); + } + } + + void validateSmeltery() + { + adjustInventory(structure.getAirSize(), true); + smeltery.adjustSize(structure.getAirSize(), true); + multitank.setCapacity(structure.getAirSize() * (TConstruct.ingotLiquidValue * 18)); + } + + @Override + public void removeBlock () + { + structure.cleanup(); + } + + /* Direction */ + @Override public byte getRenderDirection () { @@ -125,6 +165,30 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { } + + /* Inventory */ + + @Override + public int getInventoryStackLimit () + { + return 1; + } + + @Override + public void setInventorySlotContents (int slot, ItemStack itemstack) + { + inventory[slot] = itemstack; + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + updateAirBlocks(slot, itemstack); + } + } + + void updateAirBlocks (int slot, ItemStack itemstack) + { + //CoordTuple coord = structure.airCoords.; + } @Override public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) @@ -137,60 +201,20 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { return "crafters.Smeltery"; } - - @Override - public List getComponents () - { - ArrayList ret = new ArrayList(3); - ret.add(structure); - ret.add(multitank); - ret.add(smeltery); - return ret; - } - - @Override - public void notifyChange (IServantLogic servant, int x, int y, int z) - { - - } - - @Override - public void placeBlock (EntityLivingBase entity, ItemStack itemstack) - { - structure.checkValidStructure(); - if (structure.isComplete()) - { - smeltery.adjustSize(structure.getAirSize(), true); - multitank.setCapacity(structure.getAirSize() * (TConstruct.ingotLiquidValue * 18)); - } - } - - @Override - public void removeBlock () - { - structure.cleanup(); - } + + /* Network */ @Override public void readFromNBT (NBTTagCompound tags) { super.readFromNBT(tags); + readNetworkNBT(tags); structure.readFromNBT(tags); multitank.readFromNBT(tags); smeltery.readFromNBT(tags); } - @Override - public void writeToNBT (NBTTagCompound tags) - { - super.writeToNBT(tags); - - structure.writeToNBT(tags); - multitank.writeToNBT(tags); - smeltery.writeToNBT(tags); - } - public void readNetworkNBT (NBTTagCompound tags) { direction = tags.getByte("Direction"); @@ -200,6 +224,17 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc smeltery.readNetworkNBT(tags); } + @Override + public void writeToNBT (NBTTagCompound tags) + { + super.writeToNBT(tags); + writeNetworkNBT(tags); + + structure.writeToNBT(tags); + multitank.writeToNBT(tags); + smeltery.writeToNBT(tags); + } + public void writeNetworkNBT (NBTTagCompound tags) { tags.setByte("Direction", direction); diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 325c426b..8ad5f9c5 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -444,7 +444,8 @@ public class TContent implements IFuelHandler liquidMetal = new MaterialLiquid(MapColor.tntColor); moltenIronFluid = new Fluid("fluid.iron.molten"); - FluidRegistry.registerFluid(moltenIronFluid); + if (!FluidRegistry.registerFluid(moltenIronFluid)) + moltenIronFluid = FluidRegistry.getFluid("fluid.iron.molten"); moltenIron = new LiquidMetalFinite(PHConstruct.moltenIron, moltenIronFluid, "liquid_iron").setUnlocalizedName("metal.molten.iron"); GameRegistry.registerBlock(moltenIron, "metal.molten.iron"); moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000); diff --git a/src/tconstruct/library/component/LogicComponent.java b/src/tconstruct/library/component/LogicComponent.java index 7e070435..9c8a3922 100644 --- a/src/tconstruct/library/component/LogicComponent.java +++ b/src/tconstruct/library/component/LogicComponent.java @@ -14,12 +14,7 @@ public class LogicComponent public void readFromNBT (NBTTagCompound tags) { - - } - - public void writeToNBT (NBTTagCompound tags) - { - + readNetworkNBT(tags); } public void readNetworkNBT (NBTTagCompound tags) @@ -27,8 +22,13 @@ public class LogicComponent } + public void writeToNBT (NBTTagCompound tags) + { + writeNetworkNBT(tags); + } + public void writeNetworkNBT (NBTTagCompound tags) { - } + } } \ No newline at end of file diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/tconstruct/library/component/TankLayerScan.java index 2bb2c08c..362c211d 100644 --- a/src/tconstruct/library/component/TankLayerScan.java +++ b/src/tconstruct/library/component/TankLayerScan.java @@ -1,8 +1,9 @@ package tconstruct.library.component; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; -import java.util.TreeSet; +import java.util.HashSet; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +11,7 @@ import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import tconstruct.library.util.CoordTuple; +import tconstruct.library.util.CoordTupleSort; import tconstruct.library.util.IFacingLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; @@ -19,21 +21,21 @@ public class TankLayerScan extends LogicComponent protected TileEntity master; protected IMasterLogic imaster; protected Block[] scanBlocks; + protected CoordTuple masterCoord; protected boolean completeStructure; - protected int lowestY; protected int bricks = 0; protected int airBlocks = 0; - protected TreeSet layerBlockCoords = new TreeSet(); - protected TreeSet layerAirCoords = new TreeSet(); + protected HashSet layerBlockCoords = new HashSet(); + protected HashSet layerAirCoords = new HashSet(); - public TreeSet blockCoords = new TreeSet(); - public TreeSet airCoords = new TreeSet(); + protected ArrayList blockCoords = new ArrayList(); + protected ArrayList airCoords = new ArrayList(); protected ArrayList validAirCoords = new ArrayList(); protected CoordTuple returnStone; - private boolean debug = false; + private boolean debug = true; public TankLayerScan(TileEntity te, Block... ids) { @@ -41,6 +43,7 @@ public class TankLayerScan extends LogicComponent master = te; imaster = (IMasterLogic) te; scanBlocks = ids; + masterCoord = new CoordTuple(te.xCoord, te.yCoord, te.zCoord); validAirCoords.add(new int[] { 1, 0 }); validAirCoords.add(new int[] { -1, 0 }); validAirCoords.add(new int[] { 0, 1 }); @@ -118,15 +121,16 @@ public class TankLayerScan extends LogicComponent if (sealed) { - layerAirCoords = new TreeSet(airCoords); - layerBlockCoords = new TreeSet(blockCoords); + blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); //Don't forget me! + layerAirCoords = new HashSet(airCoords); + layerBlockCoords = new HashSet(blockCoords); int lowY = recurseStructureDown(master.yCoord - 1); if (lowY != -1) { - lowestY = lowY; completeStructure = true; recurseStructureUp(master.yCoord + 1); + sortStructure(); if (!world.isRemote && debug) { @@ -147,6 +151,17 @@ public class TankLayerScan extends LogicComponent } } + void sortStructure () + { + Collections.sort(airCoords, new CoordTupleSort()); + if (!world.isRemote) + { + System.out.println("Sorted coords:"); + for (CoordTuple coord : airCoords) + System.out.println(coord.toString()); + } + } + public boolean isComplete () { return completeStructure; @@ -167,7 +182,7 @@ public class TankLayerScan extends LogicComponent protected boolean checkAir (int x, int y, int z) { Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block == null || block.isAirBlock(world, x, y, z)) + if (block == null || block.isAirBlock(world, x, y, z))// || block == Block.glass) return true; return false; @@ -266,6 +281,7 @@ public class TankLayerScan extends LogicComponent if (checkAir(coord.x, y, coord.z)) { boolean valid = true; + addAirBlock(coord.x, y, coord.z); //Don't skip first one //Air blocks while (i.hasNext()) @@ -318,7 +334,7 @@ public class TankLayerScan extends LogicComponent } } if (valid) - return y+1; + return y + 1; } } @@ -387,9 +403,13 @@ public class TankLayerScan extends LogicComponent while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); - if (servant != null) - servant.invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + TileEntity te = world.getBlockTileEntity(coord.x, coord.y, coord.z); + if (te != null && te instanceof IServantLogic) + { + IServantLogic servant = (IServantLogic) te; + if (servant != null) + servant.invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); + } } } @@ -408,7 +428,7 @@ public class TankLayerScan extends LogicComponent layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } - + NBTTagList blocks = tags.getTagList("AirLayer"); if (blocks != null) { @@ -421,7 +441,7 @@ public class TankLayerScan extends LogicComponent blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } - + NBTTagList air = tags.getTagList("AirLayer"); if (air != null) { @@ -434,6 +454,13 @@ public class TankLayerScan extends LogicComponent airCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } + + super.readFromNBT(tags); + } + + public void readNetworkNBT (NBTTagCompound tags) + { + completeStructure = tags.getBoolean("Complete"); } @Override @@ -445,19 +472,26 @@ public class TankLayerScan extends LogicComponent layerAir.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); } tags.setTag("AirLayer", layerAir); - + NBTTagList blocks = new NBTTagList(); for (CoordTuple coord : blockCoords) { blocks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Blocks", blocks); - + NBTTagList air = new NBTTagList(); for (CoordTuple coord : airCoords) { air.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Air", air); + + super.writeToNBT(tags); + } + + public void writeNetworkNBT (NBTTagCompound tags) + { + tags.setBoolean("Complete", completeStructure); } } diff --git a/src/tconstruct/library/util/CoordTuple.java b/src/tconstruct/library/util/CoordTuple.java index 2d79b0be..c7b8e468 100644 --- a/src/tconstruct/library/util/CoordTuple.java +++ b/src/tconstruct/library/util/CoordTuple.java @@ -62,15 +62,6 @@ public class CoordTuple implements Comparable if (coord.equals(this)) return 0; - if (coord.y != y) - return y - coord.y; - - if (coord.x != x) - return x - coord.x; - - if (coord.z != z) - return z - coord.z; - - return 0; + return (x - coord.x) + (y - coord.y) + (z - coord.z); } } diff --git a/src/tconstruct/library/util/CoordTupleSort.java b/src/tconstruct/library/util/CoordTupleSort.java new file mode 100644 index 00000000..93aed234 --- /dev/null +++ b/src/tconstruct/library/util/CoordTupleSort.java @@ -0,0 +1,25 @@ +package tconstruct.library.util; + +import java.util.Comparator; + +public class CoordTupleSort implements Comparator +{ + @Override + public int compare (Object o1, Object o2) + { + CoordTuple c1 = (CoordTuple) o1; + CoordTuple c2 = (CoordTuple) o2; + + //Sort by y, then x, then z + if (c1.y != c2.y) + return c1.y - c2.y; + + if (c1.x != c2.x) + return c1.x - c2.x; + + if (c1.z != c2.z) + return c1.z - c2.z; + + return 0; + } +}