From b57eb8bed110f214267da6df4889f7fab2fdb327 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sun, 1 Dec 2013 19:46:08 -0500 Subject: [PATCH] remove redundant classes that are in mantle, use mantle's implementations --- .../java/tconstruct/blocks/FurnaceSlab.java | 2 +- .../blocks/component/SmelteryComponent.java | 10 +- .../blocks/component/SmelteryScan.java | 18 +-- .../blocks/logic/AdaptiveDrainLogic.java | 12 +- .../blocks/logic/AdaptiveSmelteryLogic.java | 14 +-- .../blocks/logic/CastingChannelLogic.java | 2 +- .../tconstruct/blocks/logic/FaucetLogic.java | 4 +- .../tconstruct/blocks/logic/FrypanLogic.java | 2 +- .../tconstruct/blocks/logic/FurnaceLogic.java | 2 +- .../blocks/logic/MultiServantLogic.java | 14 +-- .../blocks/logic/SmelteryDrainLogic.java | 8 +- .../blocks/logic/SmelteryLogic.java | 18 +-- .../tconstruct/blocks/logic/TankAirLogic.java | 2 +- .../blocks/logic/TowerFurnaceLogic.java | 2 +- .../client/block/SmelteryRender.java | 2 +- .../library/component/TankLayerScan.java | 57 +++++----- .../tconstruct/library/util/CoordTuple.java | 104 ------------------ .../library/util/CoordTuplePair.java | 19 ---- .../library/util/CoordTupleSort.java | 25 ----- .../tconstruct/library/util/IActiveLogic.java | 8 -- .../library/util/IServantLogic.java | 1 + 21 files changed, 87 insertions(+), 239 deletions(-) delete mode 100644 src/main/java/tconstruct/library/util/CoordTuple.java delete mode 100644 src/main/java/tconstruct/library/util/CoordTuplePair.java delete mode 100644 src/main/java/tconstruct/library/util/CoordTupleSort.java delete mode 100644 src/main/java/tconstruct/library/util/IActiveLogic.java diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 694cb0d995b..0fe278b0152 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -12,7 +12,7 @@ import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; import mantle.blocks.abstracts.InventorySlab; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import mantle.blocks.iface.IFacingLogic; public class FurnaceSlab extends InventorySlab diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java index 59790d01393..fc0420d1d75 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import mantle.world.CoordTuple; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -14,7 +15,6 @@ import tconstruct.library.component.LogicComponent; import tconstruct.library.component.MultiFluidTank; import tconstruct.library.crafting.Smeltery; -import tconstruct.library.util.CoordTuple; public class SmelteryComponent extends LogicComponent { @@ -138,14 +138,14 @@ void updateFuelGague () if (activeLavaTank == null || fuelTicks > 0 || structure.lavaTanks.size() < 1) return; - if (!world.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + if (!world.blockExists(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z())) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = world.getBlockTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = world.getBlockTileEntity(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z()); if (tankContainer == null) { fuelAmount = 0; @@ -182,7 +182,7 @@ void updateFuelGague () while (!foundTank) { CoordTuple possibleTank = structure.lavaTanks.get(iter); - TileEntity newTankContainer = world.getBlockTileEntity(possibleTank.x, possibleTank.y, possibleTank.z); + TileEntity newTankContainer = world.getBlockTileEntity(possibleTank.x(), possibleTank.y(), possibleTank.z()); if (newTankContainer instanceof IFluidHandler) { FluidStack newliquid = ((IFluidHandler) newTankContainer).drain(ForgeDirection.UNKNOWN, drainFuelAmount(), false); @@ -276,6 +276,6 @@ public void writeNetworkNBT (NBTTagCompound tags) tags.setIntArray("Melting", meltingTemps); tags.setInteger("Fuel", fuelAmount); if (activeLavaTank != null) - tags.setIntArray("LavaTank", new int[] { activeLavaTank.x, activeLavaTank.y, activeLavaTank.z }); + tags.setIntArray("LavaTank", new int[] { activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z() }); } } diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index 476d68f1dd3..12b19d9f106 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.Iterator; +import mantle.world.CoordTuple; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; @@ -11,7 +12,6 @@ import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.component.TankLayerScan; -import tconstruct.library.util.CoordTuple; import tconstruct.library.util.IServantLogic; public class SmelteryScan extends TankLayerScan @@ -71,10 +71,10 @@ protected void finalizeStructure () { for (CoordTuple coord : airCoords) { - if (world.getBlockId(coord.x, coord.y, coord.z) != TRepo.tankAir.blockID) + if (world.getBlockId(coord.x(), coord.y(), coord.z()) != TRepo.tankAir.blockID) { - world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir.blockID); - IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); + world.setBlock(coord.x(), coord.y(), coord.z(), TRepo.tankAir.blockID); + IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x(), coord.y(), coord.z()); servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -87,7 +87,7 @@ protected void invalidateStructure () super.invalidateStructure(); for (CoordTuple coord : airCoords) { - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + 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); } @@ -98,10 +98,10 @@ protected void invalidateBlocksAbove (int height) { for (CoordTuple coord : airCoords) { - if (coord.y < height) + if (coord.y() < height) continue; - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + 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); } @@ -115,7 +115,7 @@ public void cleanup () while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - TileEntity te = world.getBlockTileEntity(coord.x, coord.y, coord.z); + TileEntity te = world.getBlockTileEntity(coord.x(), coord.y(), coord.z()); if (te != null && te instanceof IServantLogic) { ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); @@ -151,7 +151,7 @@ public void writeNetworkNBT (NBTTagCompound tags) NBTTagList tanks = new NBTTagList(); for (CoordTuple coord : lavaTanks) { - tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x(), coord.y(), coord.z() })); } tags.setTag("Tanks", tanks); } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 70f8e3ba851..5ce43855b9b 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -36,7 +36,7 @@ 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); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.fill(from, resource, doFill); } return 0; @@ -48,7 +48,7 @@ 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); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); // TConstruct.logger.info("Found master"); return smeltery.drain(from, maxDrain, doDrain); } @@ -60,7 +60,7 @@ public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDra { if (hasValidMaster() && canDrain(from, null)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.drain(from, resource, doDrain); } return null; @@ -71,7 +71,7 @@ public boolean canFill (ForgeDirection from, Fluid fluid) { if (hasValidMaster()) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.getFillState() < 2; } return false; @@ -82,7 +82,7 @@ public boolean canDrain (ForgeDirection from, Fluid fluid) { if (hasValidMaster()) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.getFillState() > 0; } return false; @@ -93,7 +93,7 @@ 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); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.getTankInfo(ForgeDirection.UNKNOWN); } return null; diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 0d4be92859a..92e4e00726d 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -32,8 +32,8 @@ 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 mantle.blocks.iface.IActiveLogic; +import mantle.world.CoordTuple; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; @@ -285,7 +285,7 @@ void updateWorldBlock (int slot, ItemStack itemstack) CoordTuple air = structure.getAirByIndex(slot); if (air != null) { - TileEntity te = worldObj.getBlockTileEntity(air.x, air.y, air.z); + TileEntity te = worldObj.getBlockTileEntity(air.x(), air.y(), air.z()); if (te != null && te instanceof TankAirLogic) { ((TankAirLogic) te).setInventorySlotContents(0, itemstack); @@ -306,7 +306,7 @@ public void distributeFluids () { //Base calculations per liquid LiquidData data = new LiquidData(fluid.amount, size); - int baseY = structure.airCoords.get(0).y; + int baseY = structure.airCoords.get(0).y(); int layerSize = structure.getAirLayerSize(); //Calculate where to distribute liquids @@ -314,7 +314,7 @@ public void distributeFluids () { LiquidDataInstance instance; CoordTuple coord = structure.airCoords.get(i); - int height = 16 * (coord.y - baseY); + int height = 16 * (coord.y() - baseY); int position = i % layerSize; if (!airUpdates.containsKey(coord)) @@ -407,7 +407,7 @@ protected void updateFluidBlocks () { Map.Entry pairs = (Map.Entry) iter.next(); CoordTuple coord = (CoordTuple) pairs.getKey(); - TileEntity te = worldObj.getBlockTileEntity(coord.x, coord.y, coord.z); + TileEntity te = worldObj.getBlockTileEntity(coord.x(), coord.y(), coord.z()); if (te instanceof TankAirLogic) { ((TankAirLogic) te).overrideFluids(((LiquidDataInstance) pairs.getValue()).fluids); @@ -420,7 +420,7 @@ protected void updateFluidBlocks () public void updateAir () { for (CoordTuple loc : structure.airCoords) - worldObj.markBlockForUpdate(loc.x, loc.y, loc.z); + worldObj.markBlockForUpdate(loc.x(), loc.y(), loc.z()); } class LiquidData diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index 2ac85d101a6..ee8b47d71db 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -15,7 +15,7 @@ import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; import tconstruct.TConstruct; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index 798fbe3046b..8f6572d7c61 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -1,8 +1,8 @@ package tconstruct.blocks.logic; import tconstruct.TConstruct; -import tconstruct.library.util.IActiveLogic; -import mantle.blocks.iface.IFacingLogic;; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index dcbaba5dde6..cbd12324762 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -1,7 +1,7 @@ package tconstruct.blocks.logic; import tconstruct.inventory.FrypanContainer; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 0674a848f9a..ce46ffd80c1 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -21,7 +21,7 @@ import net.minecraftforge.common.ForgeDirection; import tconstruct.inventory.FurnaceContainer; import mantle.blocks.abstracts.InventoryLogic; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import mantle.blocks.iface.IFacingLogic; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java b/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java index 33c66849de1..3ab2c647f76 100644 --- a/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java +++ b/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java @@ -1,12 +1,12 @@ package tconstruct.blocks.logic; +import mantle.world.CoordTuple; 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.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.library.util.CoordTuple; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; @@ -27,7 +27,7 @@ public boolean hasValidMaster () if (!hasMaster) return false; - if (worldObj.getBlockId(master.x, master.y, master.z) == masterID && worldObj.getBlockMetadata(master.x, master.y, master.z) == masterMeat) + if (worldObj.getBlockId(master.x(), master.y(), master.z()) == masterID && worldObj.getBlockMetadata(master.x(), master.y(), master.z()) == masterMeat) return true; else @@ -71,7 +71,7 @@ public boolean verifyMaster (IMasterLogic logic, int x, int y, int z) @Deprecated public boolean setMaster (int x, int y, int z) { - if (!hasMaster || worldObj.getBlockId(master.x, master.y, master.z) != masterID || (worldObj.getBlockMetadata(master.x, master.y, master.z) != masterMeat)) + if (!hasMaster || worldObj.getBlockId(master.x(), master.y(), master.z()) != masterID || (worldObj.getBlockMetadata(master.x(), master.y(), master.z()) != masterMeat)) { overrideMaster(x, y, z); return true; @@ -113,7 +113,7 @@ public void notifyMasterOfChange () { if (hasValidMaster()) { - IMasterLogic logic = (IMasterLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + IMasterLogic logic = (IMasterLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); logic.notifyChange(this, xCoord, yCoord, zCoord); } } @@ -137,9 +137,9 @@ public void writeCustomNBT (NBTTagCompound tags) tags.setBoolean("TiedToMaster", hasMaster); if (hasMaster) { - tags.setInteger("xCenter", master.x); - tags.setInteger("yCenter", master.y); - tags.setInteger("zCenter", master.z); + tags.setInteger("xCenter", master.x()); + tags.setInteger("yCenter", master.y()); + tags.setInteger("zCenter", master.z()); tags.setShort("MasterID", masterID); tags.setByte("masterMeat", masterMeat); } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index 7cf41856134..3ae8fb87e61 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -29,7 +29,7 @@ public int fill (ForgeDirection from, FluidStack resource, boolean doFill) { if (doFill) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.fill(resource, doFill); } else @@ -48,7 +48,7 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) { if (hasValidMaster() && canDrain(from, null)) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.drain(maxDrain, doDrain); } else @@ -79,7 +79,7 @@ public boolean canDrain (ForgeDirection from, Fluid fluid) boolean containsFluid = fluid == null; if (fluid != null) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); for (FluidStack fstack : smeltery.moltenMetal) { if (fstack.fluidID == fluid.getID()) @@ -98,7 +98,7 @@ public FluidTankInfo[] getTankInfo (ForgeDirection from) { if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { - SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x(), master.y(), master.z()); return smeltery.getMultiTankInfo(); //return new FluidTankInfo[] { smeltery.getInfo() }; } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 64fe4c703f3..95c90aceea7 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -35,9 +35,9 @@ import tconstruct.inventory.SmelteryContainer; import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.Smeltery; -import tconstruct.library.util.CoordTuple; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import mantle.blocks.iface.IFacingLogic; +import mantle.world.CoordTuple; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; import tconstruct.util.SmelteryDamageSource; @@ -306,7 +306,7 @@ public void updateEntity () void detectEntities () { - AxisAlignedBB box = AxisAlignedBB.getAABBPool().getAABB(centerPos.x, centerPos.y, centerPos.z, centerPos.x + 1.0D, centerPos.y + 1.0D, centerPos.z + 1.0D).expand(1.0D, 0.0D, 1.0D); + AxisAlignedBB box = AxisAlignedBB.getAABBPool().getAABB(centerPos.x(), centerPos.y(), centerPos.z(), centerPos.x() + 1.0D, centerPos.y() + 1.0D, centerPos.z() + 1.0D).expand(1.0D, 0.0D, 1.0D); List list = worldObj.getEntitiesWithinAABB(Entity.class, box); for (Object o : list) @@ -522,14 +522,14 @@ public void updateFuelDisplay () if (activeLavaTank == null || useTime > 0) return; - if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + if (!worldObj.blockExists(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z())) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = worldObj.getBlockTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = worldObj.getBlockTileEntity(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z()); if (tankContainer == null) { fuelAmount = 0; @@ -563,14 +563,14 @@ void updateFuelGague () //TODO: Call this method when the GUI is opened if (activeLavaTank == null || useTime > 0) return; - if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + if (!worldObj.blockExists(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z())) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = worldObj.getBlockTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = worldObj.getBlockTileEntity(activeLavaTank.x(), activeLavaTank.y(), activeLavaTank.z()); if (tankContainer == null) { fuelAmount = 0; @@ -607,7 +607,7 @@ void updateFuelGague () //TODO: Call this method when the GUI is opened while (!foundTank) { CoordTuple possibleTank = lavaTanks.get(iter); - TileEntity newTankContainer = worldObj.getBlockTileEntity(possibleTank.x, possibleTank.y, possibleTank.z); + TileEntity newTankContainer = worldObj.getBlockTileEntity(possibleTank.x(), possibleTank.y(), possibleTank.z()); if (newTankContainer instanceof IFluidHandler) { //TConstruct.logger.info("Tank: "+possibleTank.toString()); @@ -1113,7 +1113,7 @@ public void writeToNBT (NBTTagCompound tags) if (centerPos == null) center = new int[] { xCoord, yCoord, zCoord }; else - center = new int[] { centerPos.x, centerPos.y, centerPos.z }; + center = new int[] { centerPos.x(), centerPos.y(), centerPos.z() }; tags.setIntArray("CenterPos", center); tags.setByte("Direction", direction); diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index a25c1ba3f0d..9ec224d098d 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -17,7 +17,7 @@ import tconstruct.TConstruct; import tconstruct.blocks.component.TankAirComponent; import mantle.blocks.abstracts.InventoryLogic; -import tconstruct.library.util.CoordTuple; +import mantle.world.CoordTuple; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; diff --git a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java index 68b3e6cffc4..1d2ce2c2486 100644 --- a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java @@ -1,7 +1,7 @@ package tconstruct.blocks.logic; import tconstruct.library.blocks.AdaptiveInventoryLogic; -import tconstruct.library.util.IActiveLogic; +import mantle.blocks.iface.IActiveLogic; import mantle.blocks.iface.IFacingLogic; import tconstruct.library.util.IMasterLogic; diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index 9aae4b3ed25..4ffc9851c48 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -46,7 +46,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); if (logic.validStructure) { - int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1; + int posX = logic.centerPos.x() - 1, posY = logic.centerPos.y(), posZ = logic.centerPos.z() - 1; //Melting if (logic.getSizeInventory() > 0) { diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 23c00bc1742..ab0ba845db6 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,11 +1,14 @@ package tconstruct.library.component; import java.util.*; + import net.minecraft.block.Block; import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; import tconstruct.TConstruct; -import tconstruct.library.util.*; +import tconstruct.library.util.IMasterLogic; +import tconstruct.library.util.IServantLogic; +import mantle.world.*; import mantle.blocks.iface.IFacingLogic; public class TankLayerScan extends LogicComponent @@ -149,7 +152,7 @@ protected void finalizeStructure () for (CoordTuple coord : blockCoords) { - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + 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); } @@ -265,7 +268,7 @@ protected boolean floodTest (int x, int y, int z) { if (checkAir(x + offset[0], y, z + offset[1])) { - addAirBlock(coord.x, y, coord.z); + addAirBlock(coord.x(), y, coord.z()); floodTest(x + offset[0], y, z + offset[1]); } else if (!blockCoords.contains(coord) && checkServant(x + offset[0], y, z + offset[1])) @@ -284,18 +287,18 @@ public int recurseStructureDown (int y) if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) + if (checkAir(coord.x(), y, coord.z())) { boolean valid = true; - addAirBlock(coord.x, y, coord.z); //Don't skip first one + addAirBlock(coord.x(), y, coord.z()); //Don't skip first one //Air blocks while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) + if (checkAir(coord.x(), y, coord.z())) { - addAirBlock(coord.x, y, coord.z); + addAirBlock(coord.x(), y, coord.z()); } else { @@ -309,8 +312,8 @@ public int recurseStructureDown (int y) while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + if (checkServant(coord.x(), y, coord.z())) + blockCoords.add(new CoordTuple(coord.x(), y, coord.z())); else { @@ -322,7 +325,7 @@ public int recurseStructureDown (int y) if (valid) return recurseStructureDown(y - 1); } - else if (checkServant(coord.x, y, coord.z)) + else if (checkServant(coord.x(), y, coord.z())) { //Bottom floor. All blocks, please vacate the elevator boolean valid = true; @@ -330,8 +333,8 @@ else if (checkServant(coord.x, y, coord.z)) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + if (checkServant(coord.x(), y, coord.z())) + blockCoords.add(new CoordTuple(coord.x(), y, coord.z())); else { @@ -353,7 +356,7 @@ public int recurseStructureUp (int y) if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) + if (checkServant(coord.x(), y, coord.z())) { boolean valid = true; @@ -361,8 +364,8 @@ public int recurseStructureUp (int y) while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkServant(coord.x, y, coord.z)) - blockCoords.add(new CoordTuple(coord.x, y, coord.z)); + if (checkServant(coord.x(), y, coord.z())) + blockCoords.add(new CoordTuple(coord.x(), y, coord.z())); else { @@ -378,9 +381,9 @@ public int recurseStructureUp (int y) while (i.hasNext()) { coord = (CoordTuple) i.next(); - if (checkAir(coord.x, y, coord.z)) + if (checkAir(coord.x(), y, coord.z())) { - addAirBlock(coord.x, y, coord.z); + addAirBlock(coord.x(), y, coord.z()); } else { @@ -411,7 +414,7 @@ public void recheckStructure () int height = -1; for (CoordTuple coord : blockCoords) { - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + TileEntity servant = world.getBlockTileEntity(coord.x(), coord.y(), coord.z()); boolean canPass = false; if (servant instanceof IServantLogic) { @@ -422,7 +425,7 @@ public void recheckStructure () if (!canPass) { System.out.println("Coord: " + coord); - height = coord.y; + height = coord.y(); break; } } @@ -439,7 +442,7 @@ public void recheckStructure () if (structureTop == 0) //Workaround for missing data { for (CoordTuple coord : blockCoords) - structureTop = coord.y; + structureTop = coord.y(); } structureTop = recurseStructureUp(structureTop + 1); finalizeStructure(); @@ -451,7 +454,7 @@ protected void invalidateStructure () completeStructure = false; for (CoordTuple coord : blockCoords) { - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + 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); } @@ -462,10 +465,10 @@ protected void invalidateBlocksAbove (int height) { for (CoordTuple coord : blockCoords) { - if (coord.y < height) + if (coord.y() < height) continue; - TileEntity servant = world.getBlockTileEntity(coord.x, coord.y, coord.z); + 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); } @@ -478,7 +481,7 @@ public void cleanup () while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - TileEntity te = world.getBlockTileEntity(coord.x, coord.y, coord.z); + TileEntity te = world.getBlockTileEntity(coord.x(), coord.y(), coord.z()); if (te != null && te instanceof IServantLogic) { ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); @@ -544,21 +547,21 @@ public void writeToNBT (NBTTagCompound tags) NBTTagList layerAir = new NBTTagList(); for (CoordTuple coord : layerAirCoords) { - layerAir.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + 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 })); + 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 })); + air.appendTag(new NBTTagIntArray("coord", new int[] { coord.x(), coord.y(), coord.z() })); } tags.setTag("Air", air); tags.setInteger("structureTop", structureTop); diff --git a/src/main/java/tconstruct/library/util/CoordTuple.java b/src/main/java/tconstruct/library/util/CoordTuple.java deleted file mode 100644 index f95f2985396..00000000000 --- a/src/main/java/tconstruct/library/util/CoordTuple.java +++ /dev/null @@ -1,104 +0,0 @@ -package tconstruct.library.util; - -public class CoordTuple implements Comparable -{ - public final int x; - public final int y; - public final int z; - - public CoordTuple(int posX, int posY, int posZ) - { - x = posX; - y = posY; - z = posZ; - } - - public CoordTuple(double posX, double posY, double posZ) - { - x = (int) Math.floor(posX); - y = (int) Math.floor(posY); - z = (int) Math.floor(posZ); - } - - public CoordTuple(CoordTuple tuple) - { - x = tuple.x; - y = tuple.y; - z = tuple.z; - } - - public boolean equalCoords (int posX, int posY, int posZ) - { - if (this.x == posX && this.y == posY && this.z == posZ) - return true; - else - return false; - } - - @Override - public boolean equals (Object obj) - { - if (obj == null) - return false; - - if (getClass() == obj.getClass()) - { - CoordTuple coord = (CoordTuple) obj; - if (this.x == coord.x && this.y == coord.y && this.z == coord.z) - return true; - } - return false; - } - - @Override - public int hashCode () - { - final int prime = 31; - int result = 1; - result = prime * result + x; - result = prime * result + y; - result = prime * result + z; - return result; - } - - public String toString () - { - return "X: " + x + ", Y: " + y + ", Z: " + z; - } - - @Override - public int compareTo (Object o) - { - if (o == null) - throw new NullPointerException("Object cannot be null"); - - CoordTuple coord = (CoordTuple) o; - - if (x < coord.x) - { - return -1; - } - if (x > coord.x) - { - return 1; - } - if (y < coord.y) - { - return -1; - } - if (y > coord.y) - { - return 1; - } - if (z < coord.z) - { - return -1; - } - if (z > coord.z) - { - return 1; - } - - return 0; - } -} diff --git a/src/main/java/tconstruct/library/util/CoordTuplePair.java b/src/main/java/tconstruct/library/util/CoordTuplePair.java deleted file mode 100644 index f31a228245a..00000000000 --- a/src/main/java/tconstruct/library/util/CoordTuplePair.java +++ /dev/null @@ -1,19 +0,0 @@ -package tconstruct.library.util; - -public class CoordTuplePair -{ - public CoordTuple a; - public CoordTuple b; - - public CoordTuplePair(CoordTuple a, CoordTuple b) - { - this.a = a; - this.b = b; - } - - public CoordTuplePair(int aX, int aY, int aZ, int bX, int bY, int bZ) - { - this.a = new CoordTuple(aX, aY, aZ); - this.b = new CoordTuple(bX, bY, bZ); - } -} \ No newline at end of file diff --git a/src/main/java/tconstruct/library/util/CoordTupleSort.java b/src/main/java/tconstruct/library/util/CoordTupleSort.java deleted file mode 100644 index 52846592732..00000000000 --- a/src/main/java/tconstruct/library/util/CoordTupleSort.java +++ /dev/null @@ -1,25 +0,0 @@ -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; - } -} diff --git a/src/main/java/tconstruct/library/util/IActiveLogic.java b/src/main/java/tconstruct/library/util/IActiveLogic.java deleted file mode 100644 index 065eb718763..00000000000 --- a/src/main/java/tconstruct/library/util/IActiveLogic.java +++ /dev/null @@ -1,8 +0,0 @@ -package tconstruct.library.util; - -public interface IActiveLogic -{ - public boolean getActive (); - - public void setActive (boolean flag); -} \ No newline at end of file diff --git a/src/main/java/tconstruct/library/util/IServantLogic.java b/src/main/java/tconstruct/library/util/IServantLogic.java index 79bb59ceb52..d7339d4f270 100644 --- a/src/main/java/tconstruct/library/util/IServantLogic.java +++ b/src/main/java/tconstruct/library/util/IServantLogic.java @@ -1,5 +1,6 @@ package tconstruct.library.util; +import mantle.world.CoordTuple; import net.minecraft.world.World; public interface IServantLogic