Loads of work on CTM, work on fixing multi blocks

This commit is contained in:
aidancbrady committed 2016-05-09 00:10:54 -04:00
1 parent 07a7391dfc
commit 3b75d9ff1e
111 files changed
+526 -312

No files matched your search

+6 -14
View File
@@ -30,7 +30,6 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
*/
public class Coord4D extends BlockPos
{
public int dimensionId;
/**
@@ -127,7 +126,9 @@ public class Coord4D extends BlockPos
return null;
}
return world.getTileEntity(this);
TileEntity tile = world.getTileEntity(this);
return (tile != null && tile.hasWorldObj()) ? tile : null;
}
/**
@@ -172,9 +173,7 @@ public class Coord4D extends BlockPos
*/
public void write(ArrayList<Object> data)
{
data.add(getX());
data.add(getY());
data.add(getZ());
data.add(toLong());
data.add(dimensionId);
}
@@ -281,7 +280,8 @@ public class Coord4D extends BlockPos
*/
public Coord4D difference(Vec3i vec)
{
return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); }
return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ());
}
/**
* A method used to find the EnumFacing represented by the distance of the defined Coord4D. Most likely won't have many
@@ -396,12 +396,6 @@ public class Coord4D extends BlockPos
return new AxisAlignedBB(this, add(1,1,1));
}
@Override
public Coord4D clone()
{
return new Coord4D(getX(), getY(), getZ(), dimensionId);
}
@Override
public String toString()
{
@@ -419,7 +413,6 @@ public class Coord4D extends BlockPos
) && !(obj instanceof Coord4D && ((Coord4D)obj).dimensionId != dimensionId);
}
/*
@Override
public int hashCode()
{
@@ -430,5 +423,4 @@ public class Coord4D extends BlockPos
code = 31 * code + dimensionId;
return code;
}
*/
}