diff --git a/build.properties b/build.properties index 4be630d5..ff8a6d27 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.6.4 forge_version=9.11.1.964 -mantle_version=5ed4cc +mantle_version=11d586 FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.5_d1 diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java index fc0420d1..2a409648 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java @@ -138,14 +138,14 @@ public class SmelteryComponent extends LogicComponent 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 @@ public class SmelteryComponent extends LogicComponent 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 class SmelteryComponent extends LogicComponent 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 12b19d9f..00632dd5 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -71,10 +71,10 @@ public class SmelteryScan extends TankLayerScan { 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 @@ public class SmelteryScan extends TankLayerScan 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 @@ public class SmelteryScan extends TankLayerScan { 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 class SmelteryScan extends TankLayerScan 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 class SmelteryScan extends TankLayerScan 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 5ce43855..70f8e3ba 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -36,7 +36,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl // 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 class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class AdaptiveDrainLogic 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()); + 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 92e4e007..8eff029e 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -285,7 +285,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc 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 class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { //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 class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { 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 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { 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 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc 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/MultiServantLogic.java b/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java index 3ab2c647..af4e1fc0 100644 --- a/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java +++ b/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java @@ -27,7 +27,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic 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 class MultiServantLogic extends TileEntity implements IServantLogic @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 class MultiServantLogic extends TileEntity implements IServantLogic { 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 class MultiServantLogic extends TileEntity implements IServantLogic 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 3ae8fb87..7cf41856 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -29,7 +29,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { 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 class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl 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 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()); + 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 95c90ace..c3ac41ea 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -306,7 +306,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci 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 class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci 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 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci 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 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci 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 class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci 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/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index 4ffc9851..9aae4b3e 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -46,7 +46,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler 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 ab0ba845..c79b7694 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -152,7 +152,7 @@ public class TankLayerScan extends LogicComponent 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); } @@ -268,7 +268,7 @@ public class TankLayerScan extends LogicComponent { 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])) @@ -287,18 +287,18 @@ public class TankLayerScan extends LogicComponent 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 { @@ -312,8 +312,8 @@ public class TankLayerScan extends LogicComponent 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 { @@ -325,7 +325,7 @@ public class TankLayerScan extends LogicComponent 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; @@ -333,8 +333,8 @@ public class TankLayerScan extends LogicComponent { 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 { @@ -356,7 +356,7 @@ public class TankLayerScan extends LogicComponent 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; @@ -364,8 +364,8 @@ public class TankLayerScan extends LogicComponent 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 { @@ -381,9 +381,9 @@ public class TankLayerScan extends LogicComponent 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 { @@ -414,7 +414,7 @@ public class TankLayerScan extends LogicComponent 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) { @@ -425,7 +425,7 @@ public class TankLayerScan extends LogicComponent if (!canPass) { System.out.println("Coord: " + coord); - height = coord.y(); + height = coord.y; break; } } @@ -442,7 +442,7 @@ public class TankLayerScan extends LogicComponent if (structureTop == 0) //Workaround for missing data { for (CoordTuple coord : blockCoords) - structureTop = coord.y(); + structureTop = coord.y; } structureTop = recurseStructureUp(structureTop + 1); finalizeStructure(); @@ -454,7 +454,7 @@ public class TankLayerScan extends LogicComponent 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); } @@ -465,10 +465,10 @@ public class TankLayerScan extends LogicComponent { 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); } @@ -481,7 +481,7 @@ public class TankLayerScan extends LogicComponent 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); @@ -547,21 +547,21 @@ public class TankLayerScan extends LogicComponent 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/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index 8d328430..5c54e0a8 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -5,11 +5,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; -import tconstruct.TConstruct; import java.util.ArrayList; import java.util.List; +import tconstruct.TConstruct; + public class EnvironmentChecks {