remove redundant classes that are in mantle, use mantle's implementations

This commit is contained in:
Progwml6 committed 2013-12-01 19:46:08 -05:00
1 parent a181dc9dcf
commit b57eb8bed1
21 files changed
+87 -239

No files matched your search

@@ -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 @@ 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);
}
@@ -265,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]))
@@ -284,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
{
@@ -309,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
{
@@ -322,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;
@@ -330,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
{
@@ -353,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;
@@ -361,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
{
@@ -378,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
{
@@ -411,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)
{
@@ -422,7 +425,7 @@ public class TankLayerScan extends LogicComponent
if (!canPass)
{
System.out.println("Coord: " + coord);
height = coord.y;
height = coord.y();
break;
}
}
@@ -439,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();
@@ -451,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);
}
@@ -462,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);
}
@@ -478,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);
@@ -544,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);
@@ -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;
}
}
@@ -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);
}
}
@@ -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;
}
}
@@ -1,8 +0,0 @@
package tconstruct.library.util;
public interface IActiveLogic
{
public boolean getActive ();
public void setActive (boolean flag);
}
@@ -1,5 +1,6 @@
package tconstruct.library.util;
import mantle.world.CoordTuple;
import net.minecraft.world.World;
public interface IServantLogic