diff --git a/build.gradle b/build.gradle
index 3486ab16b..7a340655b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,9 +87,9 @@ dependencies {
deobfCompile "MCMultiPart2:MCMultiPart-exp:${config.mcmp_version}"
deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}:api"
runtime "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}"
- compile "net.darkhax.tesla:Tesla:${config.tesla_version}"
- compile "inventory-tweaks:InventoryTweaks:${config.invtweak_version}:api"
- compile "li.cil.oc:OpenComputers:MC1.11.2-${config.opencomputers_version}:api"
+ compile "net.darkhax.tesla:Tesla-${config.minecraft_version}:${config.tesla_version}"
+ compile "inventory-tweaks:InventoryTweaks:${config.invtweak_version}:api" // Not updated yet
+ compile "li.cil.oc:OpenComputers:MC1.11.2-${config.opencomputers_version}:api" // Not updated yet
deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}"
}
diff --git a/build.properties b/build.properties
index 64b3a2d4a..f8055ea52 100644
--- a/build.properties
+++ b/build.properties
@@ -1,10 +1,10 @@
minecraft_version=1.12
-mappings_version=snapshot_20161220
-forge_version=14.21.0.2327
+mappings_version=snapshot_20170616
+forge_version=14.21.0.2331
mcmp_version=2.0.0_19
jei_version=4.6.0.61
mod_version=9.3.2
-tesla_version=1.11-1.3.0.52
+tesla_version=1.0.59
invtweak_version=1.62+beta.89
opencomputers_version=1.7.0.24
-hwyla_version=1.8.13-B26_1.11
+hwyla_version=1.8.18-B32_1.12
diff --git a/src/api/java/buildcraft/api/blueprints/SchematicEntity.java b/src/api/java/buildcraft/api/blueprints/SchematicEntity.java
index 5d856c71d..de8f78c4e 100755
--- a/src/api/java/buildcraft/api/blueprints/SchematicEntity.java
+++ b/src/api/java/buildcraft/api/blueprints/SchematicEntity.java
@@ -51,7 +51,7 @@ public class SchematicEntity extends Schematic {
NBTTagList nbttaglist = entityNBT.getTagList("Pos", 6);
Vec3d pos = new Vec3d(nbttaglist.getDoubleAt(0), nbttaglist.getDoubleAt(1), nbttaglist.getDoubleAt(2));
pos = pos.add(transform);
- entityNBT.setTag("Pos", this.newDoubleNBTList(pos.xCoord, pos.yCoord, pos.zCoord));
+ entityNBT.setTag("Pos", this.newDoubleNBTList(pos.x, pos.y, pos.z));
}
@Override
@@ -60,7 +60,7 @@ public class SchematicEntity extends Schematic {
Vec3d pos = new Vec3d(nbttaglist.getDoubleAt(0), nbttaglist.getDoubleAt(1), nbttaglist.getDoubleAt(2));
pos = pos.add(transform);
- entityNBT.setTag("Pos", this.newDoubleNBTList(pos.xCoord, pos.yCoord, pos.zCoord));
+ entityNBT.setTag("Pos", this.newDoubleNBTList(pos.x, pos.y, pos.z));
}
@Override
@@ -80,7 +80,7 @@ public class SchematicEntity extends Schematic {
NBTTagList nbttaglist = entityNBT.getTagList("Pos", 6);
Vec3d pos = new Vec3d(nbttaglist.getDoubleAt(0), nbttaglist.getDoubleAt(1), nbttaglist.getDoubleAt(2));
pos = context.rotatePositionLeft(pos);
- entityNBT.setTag("Pos", this.newDoubleNBTList(pos.xCoord, pos.yCoord, pos.zCoord));
+ entityNBT.setTag("Pos", this.newDoubleNBTList(pos.x, pos.y, pos.z));
nbttaglist = entityNBT.getTagList("Rotation", 5);
float yaw = nbttaglist.getFloatAt(0);
diff --git a/src/api/java/buildcraft/api/transport/EnumWirePart.java b/src/api/java/buildcraft/api/transport/EnumWirePart.java
index 6b9e983d2..6b4e971e5 100755
--- a/src/api/java/buildcraft/api/transport/EnumWirePart.java
+++ b/src/api/java/buildcraft/api/transport/EnumWirePart.java
@@ -39,7 +39,7 @@ public enum EnumWirePart {
Vec3d center = new Vec3d(0.5, 0.5, 0.5);
Vec3d edge = new Vec3d(x ? 0.75 : 0.25, y ? 0.75 : 0.25, z ? 0.75 : 0.25);
- this.boundingBoxPossible = new AxisAlignedBB(center.xCoord, center.yCoord, center.zCoord, edge.xCoord, edge.yCoord, edge.zCoord);
+ this.boundingBoxPossible = new AxisAlignedBB(center.x, center.y, center.z, edge.x, edge.y, edge.z);
}
public AxisDirection getDirection(EnumFacing.Axis axis) {
diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java
index 2f4034056..144edfc46 100644
--- a/src/main/java/mekanism/api/Chunk3D.java
+++ b/src/main/java/mekanism/api/Chunk3D.java
@@ -15,8 +15,8 @@ public class Chunk3D
{
public int dimensionId;
- public int xCoord;
- public int zCoord;
+ public int x;
+ public int z;
/**
* Creates a Chunk3D object from the given x and z coordinates, as well as a dimension.
@@ -26,8 +26,8 @@ public class Chunk3D
*/
public Chunk3D(int x, int z, int dimension)
{
- xCoord = x;
- zCoord = z;
+ this.x = x;
+ this.z = z;
dimensionId = dimension;
}
@@ -38,8 +38,8 @@ public class Chunk3D
*/
public Chunk3D(Entity entity)
{
- xCoord = ((int)entity.posX) >> 4;
- zCoord = ((int)entity.posZ) >> 4;
+ x = ((int)entity.posX) >> 4;
+ z = ((int)entity.posZ) >> 4;
dimensionId = entity.dimension;
}
@@ -50,8 +50,8 @@ public class Chunk3D
*/
public Chunk3D(Coord4D coord)
{
- xCoord = coord.xCoord >> 4;
- zCoord = coord.zCoord >> 4;
+ x = coord.x >> 4;
+ z = coord.z >> 4;
dimensionId = coord.dimensionId;
}
@@ -63,7 +63,7 @@ public class Chunk3D
*/
public boolean exists(World world)
{
- return world.getChunkProvider().getLoadedChunk(xCoord, zCoord) != null;
+ return world.getChunkProvider().getLoadedChunk(x, z) != null;
}
/**
@@ -73,7 +73,7 @@ public class Chunk3D
*/
public Chunk getChunk(World world)
{
- return world.getChunkFromChunkCoords(xCoord, zCoord);
+ return world.getChunkFromChunkCoords(x, z);
}
/**
@@ -82,27 +82,27 @@ public class Chunk3D
*/
public ChunkPos getPos()
{
- return new ChunkPos(xCoord, zCoord);
+ return new ChunkPos(x, z);
}
@Override
public Chunk3D clone()
{
- return new Chunk3D(xCoord, zCoord, dimensionId);
+ return new Chunk3D(x, z, dimensionId);
}
@Override
public String toString()
{
- return "[Chunk3D: " + xCoord + ", " + zCoord + ", dim=" + dimensionId + "]";
+ return "[Chunk3D: " + x + ", " + z + ", dim=" + dimensionId + "]";
}
@Override
public boolean equals(Object obj)
{
return obj instanceof Chunk3D &&
- ((Chunk3D)obj).xCoord == xCoord &&
- ((Chunk3D)obj).zCoord == zCoord &&
+ ((Chunk3D)obj).x == x &&
+ ((Chunk3D)obj).z == z &&
((Chunk3D)obj).dimensionId == dimensionId;
}
@@ -110,8 +110,8 @@ public class Chunk3D
public int hashCode()
{
int code = 1;
- code = 31 * code + xCoord;
- code = 31 * code + zCoord;
+ code = 31 * code + x;
+ code = 31 * code + z;
code = 31 * code + dimensionId;
return code;
}
diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java
index 918f96e2b..fd44ee2de 100644
--- a/src/main/java/mekanism/api/Coord4D.java
+++ b/src/main/java/mekanism/api/Coord4D.java
@@ -29,9 +29,9 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
*/
public class Coord4D
{
- public int xCoord;
- public int yCoord;
- public int zCoord;
+ public int x;
+ public int y;
+ public int z;
public int dimensionId;
@@ -41,9 +41,9 @@ public class Coord4D
*/
public Coord4D(Entity entity)
{
- xCoord = (int)entity.posX;
- yCoord = (int)entity.posY;
- zCoord = (int)entity.posZ;
+ x = (int)entity.posX;
+ y = (int)entity.posY;
+ z = (int)entity.posZ;
dimensionId = entity.world.provider.getDimension();
}
@@ -57,9 +57,9 @@ public class Coord4D
*/
public Coord4D(double x, double y, double z, int dimension)
{
- xCoord = MathHelper.floor(x);
- yCoord = MathHelper.floor(y);
- zCoord = MathHelper.floor(z);
+ x = MathHelper.floor(x);
+ y = MathHelper.floor(y);
+ z = MathHelper.floor(z);
dimensionId = dimension;
}
@@ -92,7 +92,7 @@ public class Coord4D
public BlockPos getPos()
{
- return new BlockPos(xCoord, yCoord, zCoord);
+ return new BlockPos(x, y, z);
}
/**
@@ -132,9 +132,9 @@ public class Coord4D
*/
public NBTTagCompound write(NBTTagCompound nbtTags)
{
- nbtTags.setInteger("x", xCoord);
- nbtTags.setInteger("y", yCoord);
- nbtTags.setInteger("z", zCoord);
+ nbtTags.setInteger("x", x);
+ nbtTags.setInteger("y", y);
+ nbtTags.setInteger("z", z);
nbtTags.setInteger("dimensionId", dimensionId);
return nbtTags;
@@ -146,9 +146,9 @@ public class Coord4D
*/
public void write(ArrayList data)
{
- data.add(xCoord);
- data.add(yCoord);
- data.add(zCoord);
+ data.add(x);
+ data.add(y);
+ data.add(z);
data.add(dimensionId);
}
@@ -158,9 +158,9 @@ public class Coord4D
*/
public void write(ByteBuf dataStream)
{
- dataStream.writeInt(xCoord);
- dataStream.writeInt(yCoord);
- dataStream.writeInt(zCoord);
+ dataStream.writeInt(x);
+ dataStream.writeInt(y);
+ dataStream.writeInt(z);
dataStream.writeInt(dimensionId);
}
@@ -173,7 +173,7 @@ public class Coord4D
*/
public Coord4D translate(int x, int y, int z)
{
- return new Coord4D(xCoord+x, yCoord+y, zCoord+z, dimensionId);
+ return new Coord4D(this.x +x, this.y +y, this.z +z, dimensionId);
}
/**
@@ -183,7 +183,7 @@ public class Coord4D
*/
public Coord4D translate(Coord4D coord)
{
- return translate(coord.xCoord, coord.yCoord, coord.zCoord);
+ return translate(coord.x, coord.y, coord.z);
}
/**
@@ -209,7 +209,7 @@ public class Coord4D
return this;
}
- return new Coord4D(xCoord+(side.getFrontOffsetX()*amount), yCoord+(side.getFrontOffsetY()*amount), zCoord+(side.getFrontOffsetZ()*amount), dimensionId);
+ return new Coord4D(x +(side.getFrontOffsetX()*amount), y +(side.getFrontOffsetY()*amount), z +(side.getFrontOffsetZ()*amount), dimensionId);
}
public ItemStack getStack(IBlockAccess world)
@@ -225,7 +225,7 @@ public class Coord4D
}
/**
- * Returns a new Coord4D from a defined TileEntity's xCoord, yCoord and zCoord values.
+ * Returns a new Coord4D from a defined TileEntity's x, y and z values.
* @param tileEntity - TileEntity at the location that will represent this Coord4D
* @return the Coord4D object from the TileEntity
*/
@@ -261,7 +261,7 @@ public class Coord4D
*/
public Coord4D difference(Coord4D other)
{
- return new Coord4D(xCoord-other.xCoord, yCoord-other.yCoord, zCoord-other.zCoord, dimensionId);
+ return new Coord4D(x -other.x, y -other.y, z -other.z, dimensionId);
}
/**
@@ -276,7 +276,7 @@ public class Coord4D
for(EnumFacing side : EnumFacing.VALUES)
{
- if(side.getFrontOffsetX() == diff.xCoord && side.getFrontOffsetY() == diff.yCoord && side.getFrontOffsetZ() == diff.zCoord)
+ if(side.getFrontOffsetX() == diff.x && side.getFrontOffsetY() == diff.y && side.getFrontOffsetZ() == diff.z)
{
return side;
}
@@ -292,9 +292,9 @@ public class Coord4D
*/
public int distanceTo(Coord4D obj)
{
- int subX = xCoord - obj.xCoord;
- int subY = yCoord - obj.yCoord;
- int subZ = zCoord - obj.zCoord;
+ int subX = x - obj.x;
+ int subY = y - obj.y;
+ int subZ = z - obj.z;
return (int)MathHelper.sqrt(subX * subX + subY * subY + subZ * subZ);
}
@@ -316,7 +316,7 @@ public class Coord4D
*/
public TargetPoint getTargetPoint(double range)
{
- return new TargetPoint(dimensionId, xCoord, yCoord, zCoord, range);
+ return new TargetPoint(dimensionId, x, y, z, range);
}
/**
@@ -336,7 +336,7 @@ public class Coord4D
*/
public boolean exists(World world)
{
- return world.getChunkProvider() == null || world.getChunkProvider().getLoadedChunk(xCoord >> 4, zCoord >> 4) != null;
+ return world.getChunkProvider() == null || world.getChunkProvider().getLoadedChunk(x >> 4, z >> 4) != null;
}
/**
@@ -384,28 +384,28 @@ public class Coord4D
*/
public AxisAlignedBB getBoundingBox()
{
- return new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1);
+ return new AxisAlignedBB(x, y, z, x +1, y +1, z +1);
}
@Override
public Coord4D clone()
{
- return new Coord4D(xCoord, yCoord, zCoord, dimensionId);
+ return new Coord4D(x, y, z, dimensionId);
}
@Override
public String toString()
{
- return "[Coord4D: " + xCoord + ", " + yCoord + ", " + zCoord + ", dim=" + dimensionId + "]";
+ return "[Coord4D: " + x + ", " + y + ", " + z + ", dim=" + dimensionId + "]";
}
@Override
public boolean equals(Object obj)
{
return obj instanceof Coord4D &&
- ((Coord4D)obj).xCoord == xCoord &&
- ((Coord4D)obj).yCoord == yCoord &&
- ((Coord4D)obj).zCoord == zCoord &&
+ ((Coord4D)obj).x == x &&
+ ((Coord4D)obj).y == y &&
+ ((Coord4D)obj).z == z &&
((Coord4D)obj).dimensionId == dimensionId;
}
@@ -413,9 +413,9 @@ public class Coord4D
public int hashCode()
{
int code = 1;
- code = 31 * code + xCoord;
- code = 31 * code + yCoord;
- code = 31 * code + zCoord;
+ code = 31 * code + x;
+ code = 31 * code + y;
+ code = 31 * code + z;
code = 31 * code + dimensionId;
return code;
}
diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java
index 9849a3323..7b026dad2 100644
--- a/src/main/java/mekanism/api/Pos3D.java
+++ b/src/main/java/mekanism/api/Pos3D.java
@@ -25,12 +25,12 @@ public class Pos3D extends Vec3d
public Pos3D(Vec3d vec)
{
- super(vec.xCoord, vec.yCoord, vec.zCoord);
+ super(vec.x, vec.y, vec.z);
}
public Pos3D(Coord4D coord)
{
- super(coord.xCoord, coord.yCoord, coord.zCoord);
+ super(coord.x, coord.y, coord.z);
}
public Pos3D(Vec3i vec)
@@ -58,7 +58,7 @@ public class Pos3D extends Vec3d
}
/**
- * Creates a Pos3D with a TileEntity's xCoord, yCoord and zCoord values.
+ * Creates a Pos3D with a TileEntity's x, y and z values.
* @param tileEntity - TileEntity to create the Pos3D from
*/
public Pos3D(TileEntity tileEntity)
@@ -83,9 +83,9 @@ public class Pos3D extends Vec3d
*/
public NBTTagCompound write(NBTTagCompound nbtTags)
{
- nbtTags.setDouble("x", xCoord);
- nbtTags.setDouble("y", yCoord);
- nbtTags.setDouble("z", zCoord);
+ nbtTags.setDouble("x", x);
+ nbtTags.setDouble("y", y);
+ nbtTags.setDouble("z", z);
return nbtTags;
}
@@ -97,7 +97,7 @@ public class Pos3D extends Vec3d
*/
public Pos3D diff(Vec3d vec)
{
- return new Pos3D(xCoord-vec.xCoord, yCoord-vec.yCoord, zCoord-vec.zCoord);
+ return new Pos3D(x-vec.x, y-vec.y, z-vec.z);
}
/**
@@ -117,7 +117,7 @@ public class Pos3D extends Vec3d
*/
public Coord4D getCoord(int dimensionId)
{
- return new Coord4D((int)xCoord, (int)yCoord, (int)zCoord, dimensionId);
+ return new Coord4D((int)x, (int)y, (int)z, dimensionId);
}
/**
@@ -137,7 +137,7 @@ public class Pos3D extends Vec3d
*/
public Pos3D translate(double x, double y, double z)
{
- return new Pos3D(xCoord + x, yCoord + y, zCoord + z);
+ return new Pos3D(x + x, y + y, z + z);
}
/**
@@ -147,7 +147,7 @@ public class Pos3D extends Vec3d
*/
public Pos3D translate(Vec3d pos)
{
- return translate(pos.xCoord, pos.yCoord, pos.zCoord);
+ return translate(pos.x, pos.y, pos.z);
}
/**
@@ -163,7 +163,7 @@ public class Pos3D extends Vec3d
*/
public Pos3D translateExcludingSide(EnumFacing direction, double amount)
{
- double xPos = xCoord, yPos = yCoord, zPos = zCoord;
+ double xPos = x, yPos = y, zPos = z;
if(direction.getAxis() != Axis.X) xPos += amount;
if(direction.getAxis() != Axis.Y) yPos += amount;
if(direction.getAxis() != Axis.Z) zPos += amount;
@@ -178,9 +178,9 @@ public class Pos3D extends Vec3d
*/
public double distance(Vec3d pos)
{
- double subX = xCoord - pos.xCoord;
- double subY = yCoord - pos.yCoord;
- double subZ = zCoord - pos.zCoord;
+ double subX = x - pos.x;
+ double subY = y - pos.y;
+ double subZ = z - pos.z;
return MathHelper.sqrt(subX * subX + subY * subY + subZ * subZ);
}
@@ -193,16 +193,16 @@ public class Pos3D extends Vec3d
{
double yawRadians = Math.toRadians(yaw);
- double xPos = xCoord;
- double zPos = zCoord;
+ double xPos = x;
+ double zPos = z;
if(yaw != 0)
{
- xPos = xCoord * Math.cos(yawRadians) - zCoord * Math.sin(yawRadians);
- zPos = zCoord * Math.cos(yawRadians) + xCoord * Math.sin(yawRadians);
+ xPos = x * Math.cos(yawRadians) - z * Math.sin(yawRadians);
+ zPos = z * Math.cos(yawRadians) + x * Math.sin(yawRadians);
}
- return new Pos3D(xPos, yCoord, zPos);
+ return new Pos3D(xPos, y, zPos);
}
@Override
@@ -210,16 +210,16 @@ public class Pos3D extends Vec3d
{
double pitchRadians = Math.toRadians(pitch);
- double yPos = yCoord;
- double zPos = zCoord;
+ double yPos = y;
+ double zPos = z;
if(pitch != 0)
{
- yPos = yCoord * Math.cos(pitchRadians) - zCoord * Math.sin(pitchRadians);
- zPos = zCoord * Math.cos(pitchRadians) + yCoord * Math.sin(pitchRadians);
+ yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians);
+ zPos = z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians);
}
- return new Pos3D(xCoord, yPos, zPos);
+ return new Pos3D(x, yPos, zPos);
}
public Pos3D rotate(float yaw, float pitch)
@@ -233,20 +233,20 @@ public class Pos3D extends Vec3d
double pitchRadians = Math.toRadians(pitch);
double rollRadians = Math.toRadians(roll);
- double xPos = xCoord;
- double yPos = yCoord;
- double zPos = zCoord;
+ double xPos = x;
+ double yPos = y;
+ double zPos = z;
- xPos = xCoord * Math.cos(yawRadians) * Math.cos(pitchRadians) + zCoord * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + yCoord * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians));
- zPos = xCoord * Math.sin(yawRadians) * Math.cos(pitchRadians) + zCoord * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + yCoord * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians));
- yPos = -xCoord * Math.sin(pitchRadians) + zCoord * Math.cos(pitchRadians) * Math.sin(rollRadians) + yCoord * Math.cos(pitchRadians) * Math.cos(rollRadians);
+ xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians));
+ zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians));
+ yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians);
return new Pos3D(xPos, yPos, zPos);
}
public Pos3D multiply(Vec3d pos)
{
- return scale(pos.xCoord, pos.yCoord, pos.zCoord);
+ return scale(pos.x, pos.y, pos.z);
}
/**
@@ -258,7 +258,7 @@ public class Pos3D extends Vec3d
*/
public Pos3D scale(double x, double y, double z)
{
- return new Pos3D(xCoord * x, yCoord * y, zCoord * z);
+ return new Pos3D(x * x, y * y, z * z);
}
@Override
@@ -277,9 +277,9 @@ public class Pos3D extends Vec3d
double[] matrix = new double[16];
Pos3D axis = clone().normalize();
- double x = axis.xCoord;
- double y = axis.yCoord;
- double z = axis.zCoord;
+ double x = axis.x;
+ double y = axis.y;
+ double z = axis.z;
angle *= 0.0174532925D;
@@ -303,9 +303,9 @@ public class Pos3D extends Vec3d
public static Pos3D translateMatrix(double[] matrix, Pos3D translation)
{
- double x = translation.xCoord * matrix[0] + translation.yCoord * matrix[1] + translation.zCoord * matrix[2] + matrix[3];
- double y = translation.xCoord * matrix[4] + translation.yCoord * matrix[5] + translation.zCoord * matrix[6] + matrix[7];
- double z = translation.xCoord * matrix[8] + translation.yCoord * matrix[9] + translation.zCoord * matrix[10] + matrix[11];
+ double x = translation.x * matrix[0] + translation.y * matrix[1] + translation.z * matrix[2] + matrix[3];
+ double y = translation.x * matrix[4] + translation.y * matrix[5] + translation.z * matrix[6] + matrix[7];
+ double z = translation.x * matrix[8] + translation.y * matrix[9] + translation.z * matrix[10] + matrix[11];
return new Pos3D(x, y, z);
}
@@ -333,17 +333,17 @@ public class Pos3D extends Vec3d
public Pos3D xCrossProduct()
{
- return new Pos3D(0.0D, zCoord, -yCoord);
+ return new Pos3D(0.0D, z, -y);
}
public Pos3D zCrossProduct()
{
- return new Pos3D(-yCoord, xCoord, 0.0D);
+ return new Pos3D(-y, x, 0.0D);
}
public Pos3D getPerpendicular()
{
- if(zCoord == 0)
+ if(z == 0)
{
return zCrossProduct();
}
@@ -353,49 +353,49 @@ public class Pos3D extends Vec3d
public Pos3D floor()
{
- return new Pos3D(Math.floor(xCoord), Math.floor(yCoord), Math.floor(zCoord));
+ return new Pos3D(Math.floor(x), Math.floor(y), Math.floor(z));
}
public static AxisAlignedBB getAABB(Pos3D pos1, Pos3D pos2)
{
return new AxisAlignedBB(
- pos1.xCoord,
- pos1.yCoord,
- pos1.zCoord,
- pos2.xCoord,
- pos2.yCoord,
- pos2.zCoord
+ pos1.x,
+ pos1.y,
+ pos1.z,
+ pos2.x,
+ pos2.y,
+ pos2.z
);
}
@Override
public Pos3D clone()
{
- return new Pos3D(xCoord, yCoord, zCoord);
+ return new Pos3D(x, y, z);
}
@Override
public String toString()
{
- return "[Pos3D: " + xCoord + ", " + yCoord + ", " + zCoord + "]";
+ return "[Pos3D: " + x + ", " + y + ", " + z + "]";
}
@Override
public boolean equals(Object obj)
{
return obj instanceof Vec3d &&
- ((Vec3d)obj).xCoord == xCoord &&
- ((Vec3d)obj).xCoord == yCoord &&
- ((Vec3d)obj).xCoord == zCoord;
+ ((Vec3d)obj).x == x &&
+ ((Vec3d)obj).x == y &&
+ ((Vec3d)obj).x == z;
}
@Override
public int hashCode()
{
int code = 1;
- code = 31 * code + new Double(xCoord).hashCode();
- code = 31 * code + new Double(yCoord).hashCode();
- code = 31 * code + new Double(zCoord).hashCode();
+ code = 31 * code + new Double(x).hashCode();
+ code = 31 * code + new Double(y).hashCode();
+ code = 31 * code + new Double(z).hashCode();
return code;
}
}
diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java
index f66d21a5e..f4b237e2e 100644
--- a/src/main/java/mekanism/api/Range4D.java
+++ b/src/main/java/mekanism/api/Range4D.java
@@ -31,9 +31,9 @@ public class Range4D
public Range4D(Chunk3D chunk)
{
- xMin = chunk.xCoord*16;
+ xMin = chunk.x *16;
yMin = 0;
- zMin = chunk.zCoord*16;
+ zMin = chunk.z *16;
xMax = xMin+16;
yMax = 255;
zMax = zMin+16;
@@ -43,13 +43,13 @@ public class Range4D
public Range4D(Coord4D coord)
{
- xMin = coord.xCoord;
- yMin = coord.yCoord;
- zMin = coord.zCoord;
+ xMin = coord.x;
+ yMin = coord.y;
+ zMin = coord.z;
- xMax = coord.xCoord+1;
- yMax = coord.yCoord+1;
- zMax = coord.zCoord+1;
+ xMax = coord.x +1;
+ yMax = coord.y +1;
+ zMax = coord.z +1;
dimensionId = coord.dimensionId;
}
diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
index 707cc23bb..232dc42f3 100644
--- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
+++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
@@ -250,23 +250,23 @@ public abstract class DynamicNetwork> implemen
IGridTransmitter initTransmitter = transmitters.iterator().next();
Coord4D initCoord = initTransmitter.coord();
- int minX = initCoord.xCoord;
- int minY = initCoord.yCoord;
- int minZ = initCoord.zCoord;
- int maxX = initCoord.xCoord;
- int maxY = initCoord.yCoord;
- int maxZ = initCoord.zCoord;
+ int minX = initCoord.x;
+ int minY = initCoord.y;
+ int minZ = initCoord.z;
+ int maxX = initCoord.x;
+ int maxY = initCoord.y;
+ int maxZ = initCoord.z;
for(IGridTransmitter transmitter : transmitters)
{
Coord4D coord = transmitter.coord();
- if(coord.xCoord < minX) minX = coord.xCoord;
- if(coord.yCoord < minY) minY = coord.yCoord;
- if(coord.zCoord < minZ) minZ = coord.zCoord;
- if(coord.xCoord > maxX) maxX = coord.xCoord;
- if(coord.yCoord > maxY) maxY = coord.yCoord;
- if(coord.xCoord > maxZ) maxZ = coord.zCoord;
+ if(coord.x < minX) minX = coord.x;
+ if(coord.y < minY) minY = coord.y;
+ if(coord.z < minZ) minZ = coord.z;
+ if(coord.x > maxX) maxX = coord.x;
+ if(coord.y > maxY) maxY = coord.y;
+ if(coord.x > maxZ) maxZ = coord.z;
}
return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.getDimension());
diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
index e86d353dc..d93f5b4bf 100644
--- a/src/main/java/mekanism/client/ClientProxy.java
+++ b/src/main/java/mekanism/client/ClientProxy.java
@@ -1203,7 +1203,7 @@ public class ClientProxy extends CommonProxy
{
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{
- return context.getServerHandler().playerEntity;
+ return context.getServerHandler().player;
}
else {
return Minecraft.getMinecraft().player;
@@ -1232,6 +1232,6 @@ public class ClientProxy extends CommonProxy
@Override
public FontRenderer getFontRenderer()
{
- return Minecraft.getMinecraft().fontRendererObj;
+ return Minecraft.getMinecraft().fontRenderer;
}
}
diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java
index 5466e3c3a..5511a7537 100644
--- a/src/main/java/mekanism/client/SparkleAnimation.java
+++ b/src/main/java/mekanism/client/SparkleAnimation.java
@@ -54,12 +54,12 @@ public class SparkleAnimation
{
for(int i = 0; i < 6; i++)
{
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + -.01, coord.zCoord + random.nextDouble(), 0, 0, 0);
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + 1.01, coord.zCoord + random.nextDouble(), 0, 0, 0);
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + -.01, 0, 0, 0);
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + 1.01, 0, 0, 0);
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + -.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0);
- world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + 1.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + -.01, coord.z + random.nextDouble(), 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + 1.01, coord.z + random.nextDouble(), 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + -.01, 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + 1.01, 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + -.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + 1.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0);
}
}
}
diff --git a/src/main/java/mekanism/client/entity/ParticleLaser.java b/src/main/java/mekanism/client/entity/ParticleLaser.java
index 7d6fa1eb8..2bc6dca27 100644
--- a/src/main/java/mekanism/client/entity/ParticleLaser.java
+++ b/src/main/java/mekanism/client/entity/ParticleLaser.java
@@ -23,7 +23,7 @@ public class ParticleLaser extends Particle
public ParticleLaser(World world, Pos3D start, Pos3D end, EnumFacing dir, double energy)
{
- super(world, (start.xCoord + end.xCoord)/2D, (start.yCoord + end.yCoord)/2D, (start.zCoord+end.zCoord)/2D);
+ super(world, (start.x + end.x)/2D, (start.y + end.y)/2D, (start.z+end.z)/2D);
particleMaxAge = 5;
particleRed = 1;
particleGreen = 0;
diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
index ac3ccef8f..fdf213e07 100644
--- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
@@ -80,12 +80,12 @@ public class GuiAdvancedElectricMachine extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
if(xAxis >= 61 && xAxis <= 67 && yAxis >= 37 && yAxis <= 49)
{
- drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
index 625243779..e4fdb89ff 100644
--- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
+++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
@@ -34,8 +34,8 @@ public class GuiAmbientAccumulator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java
index 215b41256..03cb08630 100644
--- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java
+++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java
@@ -71,16 +71,16 @@ public class GuiBoilerStats extends GuiMekanism
String stats = LangUtils.localize("gui.boilerStats");
- fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040);
+ fontRenderer.drawString(stats, (xSize/2)-(fontRenderer.getStringWidth(stats)/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.clientWaterCapacity + " mB", 8, 26, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.clientSteamCapacity + " mB", 8, 35, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.clientWaterCapacity + " mB", 8, 26, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.clientSteamCapacity + " mB", 8, 35, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.heatTransfer"), 8, 49, 0x797979);
- fontRendererObj.drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.heatTransfer"), 8, 49, 0x797979);
+ fontRenderer.drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040);
int boilCapacity = (int)((tileEntity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy());
- fontRendererObj.drawString(LangUtils.localize("gui.boilCapacity") + ": " + boilCapacity + " mB/t", 8, 72, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.boilCapacity") + ": " + boilCapacity + " mB/t", 8, 72, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java
index 282f69e26..91d2e414b 100644
--- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java
@@ -74,8 +74,8 @@ public class GuiChanceMachine extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
index 435ccb02c..e1b68ea44 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
@@ -102,25 +102,25 @@ public class GuiChemicalCrystallizer extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 37, 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 37, 4, 0x404040);
if(tileEntity.inputTank.getGas() != null)
{
- fontRendererObj.drawString(tileEntity.inputTank.getGas().getGas().getLocalizedName(), 29, 15, 0x00CD00);
+ fontRenderer.drawString(tileEntity.inputTank.getGas().getGas().getLocalizedName(), 29, 15, 0x00CD00);
if(tileEntity.inputTank.getGas().getGas() instanceof OreGas)
{
- fontRendererObj.drawString("(" + ((OreGas)tileEntity.inputTank.getGas().getGas()).getOreName() + ")", 29, 24, 0x00CD00);
+ fontRenderer.drawString("(" + ((OreGas)tileEntity.inputTank.getGas().getGas()).getOreName() + ")", 29, 24, 0x00CD00);
}
else {
CrystallizerRecipe recipe = tileEntity.getRecipe();
if(recipe == null)
{
- fontRendererObj.drawString("(" + LangUtils.localize("gui.noRecipe") + ")", 29, 24, 0x00CD00);
+ fontRenderer.drawString("(" + LangUtils.localize("gui.noRecipe") + ")", 29, 24, 0x00CD00);
}
else {
- fontRendererObj.drawString("(" + recipe.recipeOutput.output.getDisplayName() + ")", 29, 24, 0x00CD00);
+ fontRenderer.drawString("(" + recipe.recipeOutput.output.getDisplayName() + ")", 29, 24, 0x00CD00);
}
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
index e432a9907..851fc007b 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
@@ -86,11 +86,11 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("gui.chemicalDissolutionChamber.short"), 35, 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.chemicalDissolutionChamber.short"), 35, 4, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
index d235ac86d..1b3231255 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
@@ -101,12 +101,12 @@ public class GuiChemicalInfuser extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
index eb2b69d9c..d2e18da1d 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
@@ -78,12 +78,12 @@ public class GuiChemicalOxidizer extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
index 950fae1f5..849804cae 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
@@ -98,11 +98,11 @@ public class GuiChemicalWasher extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 45, 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 4, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java
index 622f64393..127997d3d 100644
--- a/src/main/java/mekanism/client/gui/GuiCredits.java
+++ b/src/main/java/mekanism/client/gui/GuiCredits.java
@@ -54,7 +54,7 @@ public class GuiCredits extends GuiScreen
public void writeText(String text, int yAxis)
{
- drawString(fontRendererObj, text, width / 2 - 140, (height / 4 - 60) + 20 + yAxis, 0xa0a0a0);
+ drawString(fontRenderer, text, width / 2 - 140, (height / 4 - 60) + 20 + yAxis, 0xa0a0a0);
}
@Override
@@ -67,7 +67,7 @@ public class GuiCredits extends GuiScreen
public void drawScreen(int mouseX, int mouseY, float partialTick)
{
drawDefaultBackground();
- drawCenteredString(fontRendererObj, EnumColor.DARK_BLUE + "Mekanism" + EnumColor.GREY + " by aidancbrady", width / 2, (height / 4 - 60) + 20, 0xffffff);
+ drawCenteredString(fontRenderer, EnumColor.DARK_BLUE + "Mekanism" + EnumColor.GREY + " by aidancbrady", width / 2, (height / 4 - 60) + 20, 0xffffff);
if(Mekanism.latestVersionNumber != null && !Mekanism.latestVersionNumber.equals("null"))
{
diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java
index 9125e2960..e5168c2cb 100644
--- a/src/main/java/mekanism/client/gui/GuiDictionary.java
+++ b/src/main/java/mekanism/client/gui/GuiDictionary.java
@@ -40,8 +40,8 @@ public class GuiDictionary extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("item.Dictionary.name"), 64, 5, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("item.Dictionary.name"), 64, 5, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
if(!itemType.isEmpty())
{
diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
index 0b8f092b5..8853685bf 100644
--- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
+++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
@@ -170,18 +170,18 @@ public class GuiDigitalMiner extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 69, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 69, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(tileEntity.running ? LangUtils.localize("gui.digitalMiner.running") : LangUtils.localize("gui.idle"), 9, 10, 0x00CD00);
- fontRendererObj.drawString(tileEntity.searcher.state.desc, 9, 19, 0x00CD00);
+ fontRenderer.drawString(tileEntity.running ? LangUtils.localize("gui.digitalMiner.running") : LangUtils.localize("gui.idle"), 9, 10, 0x00CD00);
+ fontRenderer.drawString(tileEntity.searcher.state.desc, 9, 19, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.eject") + ": " + LangUtils.localize("gui." + (tileEntity.doEject ? "on" : "off")), 9, 30, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.pull") + ": " + LangUtils.localize("gui." + (tileEntity.doPull ? "on" : "off")), 9, 39, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.silk") + ": " + LangUtils.localize("gui." + (tileEntity.silkTouch ? "on" : "off")), 9, 48, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.eject") + ": " + LangUtils.localize("gui." + (tileEntity.doEject ? "on" : "off")), 9, 30, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.digitalMiner.pull") + ": " + LangUtils.localize("gui." + (tileEntity.doPull ? "on" : "off")), 9, 39, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.digitalMiner.silk") + ": " + LangUtils.localize("gui." + (tileEntity.silkTouch ? "on" : "off")), 9, 48, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00);
- fontRendererObj.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00);
+ fontRenderer.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00);
if(!tileEntity.missingStack.isEmpty())
{
@@ -205,38 +205,38 @@ public class GuiDigitalMiner extends GuiMekanism
if(xAxis >= 164 && xAxis <= 168 && yAxis >= 25 && yAxis <= 77)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
}
if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.autoPull"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.autoPull"), xAxis, yAxis);
}
if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43)
{
if(!tileEntity.missingStack.isEmpty())
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.missingBlock"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.missingBlock"), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.well"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.well"), xAxis, yAxis);
}
}
if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.reset"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.reset"), xAxis, yAxis);
}
if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.silkTouch"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.silkTouch"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java
index 5ae12399d..14a977397 100644
--- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java
+++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java
@@ -410,15 +410,15 @@ public class GuiDigitalMinerConfig extends GuiMekanism
String prevMin = minField != null ? minField.getText() : "";
String prevMax = maxField != null ? maxField.getText() : "";
- radiusField = new GuiTextField(1, fontRendererObj, guiWidth + 12, guiHeight + 67, 26, 11);
+ radiusField = new GuiTextField(1, fontRenderer, guiWidth + 12, guiHeight + 67, 26, 11);
radiusField.setMaxStringLength(2);
radiusField.setText(prevRad);
- minField = new GuiTextField(2, fontRendererObj, guiWidth + 12, guiHeight + 92, 26, 11);
+ minField = new GuiTextField(2, fontRenderer, guiWidth + 12, guiHeight + 92, 26, 11);
minField.setMaxStringLength(3);
minField.setText(prevMin);
- maxField = new GuiTextField(3, fontRendererObj, guiWidth + 12, guiHeight + 117, 26, 11);
+ maxField = new GuiTextField(3, fontRenderer, guiWidth + 12, guiHeight + 117, 26, 11);
maxField.setMaxStringLength(3);
maxField.setText(prevMax);
}
@@ -440,18 +440,18 @@ public class GuiDigitalMinerConfig extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
- fontRendererObj.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
+ fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
- fontRendererObj.drawString("I: " + (tileEntity.inverse ? LangUtils.localize("gui.on") : LangUtils.localize("gui.off")), 11, 131, 0x00CD00);
+ fontRenderer.drawString("I: " + (tileEntity.inverse ? LangUtils.localize("gui.on") : LangUtils.localize("gui.off")), 11, 131, 0x00CD00);
- fontRendererObj.drawString("Radi: " + tileEntity.radius, 11, 58, 0x00CD00);
+ fontRenderer.drawString("Radi: " + tileEntity.radius, 11, 58, 0x00CD00);
- fontRendererObj.drawString("Min: " + tileEntity.minY, 11, 83, 0x00CD00);
+ fontRenderer.drawString("Min: " + tileEntity.minY, 11, 83, 0x00CD00);
- fontRendererObj.drawString("Max: " + tileEntity.maxY, 11, 108, 0x00CD00);
+ fontRenderer.drawString("Max: " + tileEntity.maxY, 11, 108, 0x00CD00);
for(int i = 0; i < 4; i++)
{
@@ -473,7 +473,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
GlStateManager.popMatrix();
}
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
}
else if(filter instanceof MOreDictFilter)
{
@@ -495,7 +495,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
} catch(Exception e) {}
}
- fontRendererObj.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
}
else if(filter instanceof MMaterialFilter)
{
@@ -510,7 +510,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism
GlStateManager.popMatrix();
}
- fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
}
else if(filter instanceof MModIDFilter)
{
@@ -532,14 +532,14 @@ public class GuiDigitalMinerConfig extends GuiMekanism
} catch(Exception e) {}
}
- fontRendererObj.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040);
}
}
}
if(xAxis >= 11 && xAxis <= 25 && yAxis >= 141 && yAxis <= 155)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.inverse"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.inverse"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java
index 7f2442c81..8b0d675f8 100644
--- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java
+++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java
@@ -34,19 +34,19 @@ public class GuiDynamicTank extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00);
renderScaledText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ":" : LangUtils.localize("gui.noFluid"), 53, 44, 0x00CD00, 74);
if(tileEntity.structure.fluidStored != null)
{
- fontRendererObj.drawString(tileEntity.structure.fluidStored.amount + "mB", 53, 53, 0x00CD00);
+ fontRenderer.drawString(tileEntity.structure.fluidStored.amount + "mB", 53, 53, 0x00CD00);
}
if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java
index b351d4c53..6da4b4b4a 100644
--- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java
@@ -74,8 +74,8 @@ public class GuiElectricMachine extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java
index 64e3ef792..39643fbcd 100644
--- a/src/main/java/mekanism/client/gui/GuiElectricPump.java
+++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java
@@ -67,9 +67,9 @@ public class GuiElectricPump extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid");
renderScaledText(text, 51, 35, 0x00CD00, 74);
diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
index a7245f2c7..d524ee56a 100755
--- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
+++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
@@ -130,13 +130,13 @@ public class GuiElectrolyticSeparator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
String name = chooseByMode(tileEntity.dumpLeft, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess"));
renderScaledText(name, 21, 73, 0x404040, 66);
name = chooseByMode(tileEntity.dumpRight, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess"));
- renderScaledText(name, 156-(int)(fontRendererObj.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66);
+ renderScaledText(name, 156-(int)(fontRenderer.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java
index 27ee6dd34..ee9cb9af3 100644
--- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java
+++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java
@@ -64,8 +64,8 @@ public class GuiEnergyCube extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java
index f215b84ed..46ae24c04 100644
--- a/src/main/java/mekanism/client/gui/GuiFactory.java
+++ b/src/main/java/mekanism/client/gui/GuiFactory.java
@@ -71,23 +71,23 @@ public class GuiFactory extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040);
if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83)
{
if(tileEntity.recipeType.usesFuel())
{
- drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis);
}
else if(tileEntity.recipeType == RecipeType.INFUSING)
{
- drawCreativeTabHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java
index 161342a15..e50226cc2 100644
--- a/src/main/java/mekanism/client/gui/GuiFluidTank.java
+++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java
@@ -45,8 +45,8 @@ public class GuiFluidTank extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
index 86137ec1c..fc630bf07 100644
--- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
+++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
@@ -67,11 +67,11 @@ public class GuiFluidicPlenisher extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00);
- fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"), 51, 44, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00);
+ fontRenderer.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"), 51, 44, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
index c1193f8aa..f3c16f145 100644
--- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
+++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
@@ -75,37 +75,37 @@ public class GuiFormulaicAssemblicator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.fillEmpty"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.fillEmpty"), xAxis, yAxis);
}
if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis);
}
if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.craftSingle"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.craftSingle"), xAxis, yAxis);
}
if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.craftAvailable"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.craftAvailable"), xAxis, yAxis);
}
if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.autoModeToggle") + ": " + LangUtils.transOnOff(tileEntity.autoMode), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.autoModeToggle") + ": " + LangUtils.transOnOff(tileEntity.autoMode), xAxis, yAxis);
}
if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.stockControl") + ": " + LangUtils.transOnOff(tileEntity.stockControl), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.stockControl") + ": " + LangUtils.transOnOff(tileEntity.stockControl), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
index 3d2f49bc7..6e84da134 100644
--- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
+++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
@@ -48,8 +48,8 @@ public class GuiFuelwoodHeater extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76);
renderScaledText(LangUtils.localize("gui.fuel") + ": " + tileEntity.burnTime, 50, 41, 0x00CD00, 76);
diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java
index 4c4331417..afc3db654 100644
--- a/src/main/java/mekanism/client/gui/GuiGasTank.java
+++ b/src/main/java/mekanism/client/gui/GuiGasTank.java
@@ -52,13 +52,13 @@ public class GuiGasTank extends GuiMekanism
String stored = "" + (tileEntity.gasTank.getStored() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.gasTank.getStored());
String capacityInfo = stored + " / " + (tileEntity.tier.storage == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.tier.storage);
- fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
- fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
+ fontRenderer.drawString(capacityInfo, 45, 40, 0x404040);
renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : LangUtils.localize("gui.none")), 45, 49, 0x404040, 112);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
String name = chooseByMode(tileEntity.dumping, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess"));
- fontRendererObj.drawString(name, 156 - fontRendererObj.getStringWidth(name), 73, 0x404040);
+ fontRenderer.drawString(name, 156 - fontRenderer.getStringWidth(name), 73, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
index 747fe2813..204ed7275 100644
--- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
+++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
@@ -48,16 +48,16 @@ public class GuiInductionMatrix extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.input") + ":", 53, 26, 0x00CD00);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", 53, 35, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.output") + ":", 53, 44, 0x00CD00);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t", 53, 53, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.input") + ":", 53, 26, 0x00CD00);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", 53, 35, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.output") + ":", 53, 44, 0x00CD00);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t", 53, 53, 0x00CD00);
if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java
index 495bdec52..58bb329dd 100644
--- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java
+++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java
@@ -78,12 +78,12 @@ public class GuiLaserAmplifier extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 55, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 55, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(tileEntity.time > 0 ? LangUtils.localize("gui.delay") + ": " + tileEntity.time + "t" : LangUtils.localize("gui.noDelay"), 26, 30, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.min") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.minThreshold), 26, 45, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.max") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.maxThreshold), 26, 60, 0x404040);
+ fontRenderer.drawString(tileEntity.time > 0 ? LangUtils.localize("gui.delay") + ": " + tileEntity.time + "t" : LangUtils.localize("gui.noDelay"), 26, 30, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.min") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.minThreshold), 26, 45, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.max") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.maxThreshold), 26, 60, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@@ -228,18 +228,18 @@ public class GuiLaserAmplifier extends GuiMekanism
String prevTime = timerField != null ? timerField.getText() : "";
- timerField = new GuiTextField(0, fontRendererObj, guiWidth + 96, guiHeight + 28, 36, 11);
+ timerField = new GuiTextField(0, fontRenderer, guiWidth + 96, guiHeight + 28, 36, 11);
timerField.setMaxStringLength(4);
timerField.setText(prevTime);
String prevMin = minField != null ? minField.getText() : "";
- minField = new GuiTextField(1, fontRendererObj, guiWidth + 96, guiHeight + 43, 72, 11);
+ minField = new GuiTextField(1, fontRenderer, guiWidth + 96, guiHeight + 43, 72, 11);
minField.setMaxStringLength(10);
minField.setText(prevMin);
String prevMax = maxField != null ? maxField.getText() : "";
- maxField = new GuiTextField(2, fontRendererObj, guiWidth + 96, guiHeight + 58, 72, 11);
+ maxField = new GuiTextField(2, fontRenderer, guiWidth + 96, guiHeight + 58, 72, 11);
maxField.setMaxStringLength(10);
maxField.setText(prevMax);
}
diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java
index 2a5501ce9..18f3d25c7 100644
--- a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java
+++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java
@@ -25,8 +25,8 @@ public class GuiLaserTractorBeam extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java
index d5700ecd4..6f913551c 100644
--- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java
+++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java
@@ -446,18 +446,18 @@ public class GuiLogisticalSorter extends GuiMekanism
final int yAxis = mouseY - guiTop;
// Write to info display
- fontRendererObj.drawString(tileEntity.getName(), 43, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
- fontRendererObj.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00);
+ fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00);
- fontRendererObj.drawString("RR:", 12, 74, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui." + (tileEntity.roundRobin ? "on" : "off")), 27, 86, 0x00CD00);
+ fontRenderer.drawString("RR:", 12, 74, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui." + (tileEntity.roundRobin ? "on" : "off")), 27, 86, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui." + (tileEntity.autoEject ? "on" : "off")), 27, 112, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui." + (tileEntity.autoEject ? "on" : "off")), 27, 112, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00);
// Draw filters
for(int i = 0; i < 4; i++)
@@ -480,8 +480,8 @@ public class GuiLogisticalSorter extends GuiMekanism
GlStateManager.popMatrix();
}
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
- fontRendererObj.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
}
else if(filter instanceof TOreDictFilter)
{
@@ -503,8 +503,8 @@ public class GuiLogisticalSorter extends GuiMekanism
} catch(final Exception e) {}
}
- fontRendererObj.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
- fontRendererObj.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
}
else if(filter instanceof TMaterialFilter)
{
@@ -519,8 +519,8 @@ public class GuiLogisticalSorter extends GuiMekanism
GlStateManager.popMatrix();
}
- fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
- fontRendererObj.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
}
else if(filter instanceof TModIDFilter)
{
@@ -542,8 +542,8 @@ public class GuiLogisticalSorter extends GuiMekanism
} catch(final Exception e) {}
}
- fontRendererObj.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040);
- fontRendererObj.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040);
+ fontRenderer.drawString(filter.color != null ? filter.color.getColoredName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040);
}
// Draw hovertext for sorting buttons
@@ -553,7 +553,7 @@ public class GuiLogisticalSorter extends GuiMekanism
{
if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.moveUp"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.moveUp"), xAxis, yAxis);
}
}
@@ -561,7 +561,7 @@ public class GuiLogisticalSorter extends GuiMekanism
{
if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.moveDown"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.moveDown"), xAxis, yAxis);
}
}
}
@@ -586,21 +586,21 @@ public class GuiLogisticalSorter extends GuiMekanism
{
if(tileEntity.color != null)
{
- drawCreativeTabHoveringText(tileEntity.color.getColoredName(), xAxis, yAxis);
+ drawHoveringText(tileEntity.color.getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.logisticalSorter.roundRobin"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.logisticalSorter.roundRobin"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java
index 3eb3840da..f55f13bee 100644
--- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java
+++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java
@@ -76,7 +76,7 @@ public class GuiMFilterSelect extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
index e37e25d8e..17f47ce17 100644
--- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
@@ -118,9 +118,9 @@ public class GuiMItemStackFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
if(!filter.itemType.isEmpty())
{
@@ -143,12 +143,12 @@ public class GuiMItemStackFilter extends GuiMekanism
if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
}
if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.fuzzyMode") + ": " + LangUtils.transYesNo(filter.fuzzy), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.fuzzyMode") + ": " + LangUtils.transYesNo(filter.fuzzy), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java
index b6996f1da..872f85eda 100644
--- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java
@@ -118,9 +118,9 @@ public class GuiMMaterialFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00);
if(!filter.materialItem.isEmpty())
{
@@ -143,7 +143,7 @@ public class GuiMMaterialFilter extends GuiMekanism
if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java
index c0f75588a..5185b41cc 100644
--- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java
@@ -96,7 +96,7 @@ public class GuiMModIDFilter extends GuiMekanism
(buttonList.get(1)).enabled = false;
}
- modIDText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12);
+ modIDText = new GuiTextField(2, fontRenderer, guiWidth + 35, guiHeight + 47, 95, 12);
modIDText.setMaxStringLength(TransporterFilter.MAX_LENGTH);
modIDText.setFocused(true);
}
@@ -163,8 +163,8 @@ public class GuiMModIDFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107);
if(!renderStack.isEmpty())
@@ -189,7 +189,7 @@ public class GuiMModIDFilter extends GuiMekanism
if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java
index a9ea1e9c9..00e2de02b 100644
--- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java
@@ -96,7 +96,7 @@ public class GuiMOreDictFilter extends GuiMekanism
((GuiButton)buttonList.get(1)).enabled = false;
}
- oreDictText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12);
+ oreDictText = new GuiTextField(2, fontRenderer, guiWidth + 35, guiHeight + 47, 95, 12);
oreDictText.setMaxStringLength(TransporterFilter.MAX_LENGTH);
oreDictText.setFocused(true);
}
@@ -163,8 +163,8 @@ public class GuiMOreDictFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107);
if(!renderStack.isEmpty())
@@ -189,7 +189,7 @@ public class GuiMOreDictFilter extends GuiMekanism
if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java
index e0559be97..147e6693c 100644
--- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java
+++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java
@@ -90,17 +90,17 @@ public class GuiMatrixStats extends GuiMekanism
String stats = LangUtils.localize("gui.matrixStats");
- fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.input") + ":", 53, 26, 0x797979);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.transferCap), 59, 35, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.output") + ":", 53, 46, 0x797979);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.transferCap), 59, 55, 0x404040);
+ fontRenderer.drawString(stats, (xSize/2)-(fontRenderer.getStringWidth(stats)/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.input") + ":", 53, 26, 0x797979);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.transferCap), 59, 35, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.output") + ":", 53, 46, 0x797979);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.transferCap), 59, 55, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.dimensions") + ":", 8, 82, 0x797979);
- fontRendererObj.drawString(tileEntity.structure.volWidth + " x " + tileEntity.structure.volHeight + " x " + tileEntity.structure.volLength, 14, 91, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.constituents") + ":", 8, 102, 0x797979);
- fontRendererObj.drawString(tileEntity.clientCells + " " + LangUtils.localize("gui.cells"), 14, 111, 0x404040);
- fontRendererObj.drawString(tileEntity.clientProviders + " " + LangUtils.localize("gui.providers"), 14, 120, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.dimensions") + ":", 8, 82, 0x797979);
+ fontRenderer.drawString(tileEntity.structure.volWidth + " x " + tileEntity.structure.volHeight + " x " + tileEntity.structure.volLength, 14, 91, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.constituents") + ":", 8, 102, 0x797979);
+ fontRenderer.drawString(tileEntity.clientCells + " " + LangUtils.localize("gui.cells"), 14, 111, 0x404040);
+ fontRenderer.drawString(tileEntity.clientProviders + " " + LangUtils.localize("gui.providers"), 14, 120, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java
index b6684a510..6de9f92a8 100644
--- a/src/main/java/mekanism/client/gui/GuiMekanism.java
+++ b/src/main/java/mekanism/client/gui/GuiMekanism.java
@@ -43,7 +43,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
public float getNeededScale(String text, int maxX)
{
- int length = fontRendererObj.getStringWidth(text);
+ int length = fontRenderer.getStringWidth(text);
if(length <= maxX)
{
@@ -57,11 +57,11 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
/** returns scale */
public void renderScaledText(String text, int x, int y, int color, int maxX)
{
- int length = fontRendererObj.getStringWidth(text);
+ int length = fontRenderer.getStringWidth(text);
if(length <= maxX)
{
- fontRendererObj.drawString(text, x, y, color);
+ fontRenderer.drawString(text, x, y, color);
}
else {
float scale = (float)maxX/length;
@@ -71,7 +71,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
GlStateManager.pushMatrix();
GlStateManager.scale(scale, scale, scale);
- fontRendererObj.drawString(text, (int)(x*reverse), (int)((y*reverse)+yAdd), color);
+ fontRenderer.drawString(text, (int)(x*reverse), (int)((y*reverse)+yAdd), color);
GlStateManager.popMatrix();
}
@@ -125,7 +125,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
if(data != null)
{
- drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getColoredName() + ")", xAxis, yAxis);
+ drawHoveringText(data.color + data.localize() + " (" + data.color.getColoredName() + ")", xAxis, yAxis);
}
}
}
@@ -211,7 +211,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
@Override
public void displayTooltip(String s, int x, int y)
{
- drawCreativeTabHoveringText(s, x, y);
+ drawHoveringText(s, x, y);
}
@Override
@@ -223,7 +223,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
@Override
public FontRenderer getFont()
{
- return fontRendererObj;
+ return fontRenderer;
}
@Override
@@ -294,6 +294,6 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper
protected FontRenderer getFontRenderer()
{
- return fontRendererObj;
+ return fontRenderer;
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
index 0ff8b79b5..4bfa14f46 100644
--- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
+++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
@@ -82,12 +82,12 @@ public class GuiMetallurgicInfuser extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
if(xAxis >= 7 && xAxis <= 11 && yAxis >= 17 && yAxis <= 69)
{
- drawCreativeTabHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java
index 82c5ed314..b719aaba3 100644
--- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java
+++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java
@@ -115,8 +115,8 @@ public class GuiOredictionificator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
for(int i = 0; i < 3; i++)
{
@@ -141,7 +141,7 @@ public class GuiOredictionificator extends GuiMekanism
GlStateManager.popMatrix();
}
- fontRendererObj.drawString(LangUtils.localize("gui.filter"), 32, yStart + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.filter"), 32, yStart + 2, 0x404040);
renderScaledText(filter.filter, 32, yStart + 2 + 9, 0x404040, 117);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java
index c75e85c80..c0d909d55 100644
--- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java
@@ -126,7 +126,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism
buttonList.get(1).enabled = false;
}
- filterText = new GuiTextField(2, fontRendererObj, guiWidth + 33, guiHeight + 48, 96, 12);
+ filterText = new GuiTextField(2, fontRenderer, guiWidth + 33, guiHeight + 48, 96, 12);
filterText.setMaxStringLength(TileEntityOredictionificator.MAX_LENGTH);
filterText.setFocused(true);
@@ -140,9 +140,9 @@ public class GuiOredictionificatorFilter extends GuiMekanism
int yAxis = (mouseY - (height - ySize) / 2);
String text = (isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.filter");
- fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 6, 0x404040);
+ fontRenderer.drawString(text, (xSize/2)-(fontRenderer.getStringWidth(text)/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.index") + ": " + filter.index, 79, 23, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.index") + ": " + filter.index, 79, 23, 0x404040);
if(filter.filter != null)
{
@@ -162,17 +162,17 @@ public class GuiOredictionificatorFilter extends GuiMekanism
if(xAxis >= 31 && xAxis <= 43 && yAxis >= 21 && yAxis <= 33)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.lastItem"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.lastItem"), xAxis, yAxis);
}
if(xAxis >= 63 && xAxis <= 75 && yAxis >= 21 && yAxis <= 33)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.nextItem"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.nextItem"), xAxis, yAxis);
}
if(xAxis >= 33 && xAxis <= 129 && yAxis >= 48 && yAxis <= 60)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.oreDictCompat"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.oreDictCompat"), xAxis, yAxis);
}
if(xAxis >= 45 && xAxis <= 61 && yAxis >= 19 && yAxis <= 35)
@@ -182,7 +182,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism
String name = ItemRegistryUtils.getMod(renderStack);
String extra = name.equals("null") ? "" : " (" + name + ")";
- drawCreativeTabHoveringText(renderStack.getDisplayName() + extra, xAxis, yAxis);
+ drawHoveringText(renderStack.getDisplayName() + extra, xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java
index 42fa9351f..91229b321 100644
--- a/src/main/java/mekanism/client/gui/GuiPRC.java
+++ b/src/main/java/mekanism/client/gui/GuiPRC.java
@@ -102,8 +102,8 @@ public class GuiPRC extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java
index 9e13f9505..1ef0833ad 100644
--- a/src/main/java/mekanism/client/gui/GuiPersonalChest.java
+++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java
@@ -45,8 +45,8 @@ public class GuiPersonalChest extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.PersonalChest.name"), 8, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("tile.MachineBlock.PersonalChest.name"), 8, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
index fc524719c..fafabff57 100644
--- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
+++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
@@ -86,7 +86,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism
setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set"));
deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete"));
- frequencyField = new GuiTextField(4, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11);
+ frequencyField = new GuiTextField(4, fontRenderer, guiWidth + 50, guiHeight + 104, 86, 11);
frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH);
frequencyField.setEnableBackgroundDrawing(false);
@@ -289,14 +289,14 @@ public class GuiQuantumEntangloporter extends GuiMekanism
int xAxis = (mouseX-(width-xSize)/2);
int yAxis = (mouseY-(height-ySize)/2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getClientOwner() != null ? tileEntity.getSecurity().getClientOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getClientOwner() != null ? tileEntity.getSecurity().getClientOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040);
- fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? tileEntity.getFrequency(null).name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979);
- fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? getSecurity(tileEntity.getFrequency(null)) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979);
+ fontRenderer.drawString(" " + (tileEntity.getFrequency(null) != null ? tileEntity.getFrequency(null).name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRenderer.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979);
+ fontRenderer.drawString(" " + (tileEntity.getFrequency(null) != null ? getSecurity(tileEntity.getFrequency(null)) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRenderer.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979);
String str = LangUtils.localize("gui.set") + ":";
renderScaledText(str, 27, 104, 0x404040, 20);
diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
index fefe34c32..49cf13407 100644
--- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
+++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
@@ -80,7 +80,7 @@ public class GuiResistiveHeater extends GuiMekanism
String prevEnergyUsage = energyUsageField != null ? energyUsageField.getText() : "";
- energyUsageField = new GuiTextField(0, fontRendererObj, guiWidth + 49, guiHeight + 52, 66, 11);
+ energyUsageField = new GuiTextField(0, fontRenderer, guiWidth + 49, guiHeight + 52, 66, 11);
energyUsageField.setMaxStringLength(7);
energyUsageField.setEnableBackgroundDrawing(false);
energyUsageField.setText(prevEnergyUsage);
@@ -89,8 +89,8 @@ public class GuiResistiveHeater extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040);
renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76);
renderScaledText(LangUtils.localize("gui.usage") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.energyUsage) + "/t", 50, 41, 0x00CD00, 76);
diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java
index a3cffeb13..2fdc0d65a 100644
--- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java
+++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java
@@ -33,8 +33,8 @@ public class GuiRobitCrafting extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(LangUtils.localize("gui.robit.crafting"), 8, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.crafting"), 8, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java
index 7088f4cc6..6aaf741db 100644
--- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java
+++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java
@@ -33,8 +33,8 @@ public class GuiRobitInventory extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(LangUtils.localize("gui.robit.inventory"), 8, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.inventory"), 8, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java
index 8f7086a6e..ce0fe2641 100644
--- a/src/main/java/mekanism/client/gui/GuiRobitMain.java
+++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java
@@ -76,7 +76,7 @@ public class GuiRobitMain extends GuiMekanism
buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, LangUtils.localize("gui.confirm")));
confirmName.visible = displayNameChange;
- nameChangeField = new GuiTextField(1, fontRendererObj, guiWidth + 48, guiHeight + 21, 80, 12);
+ nameChangeField = new GuiTextField(1, fontRenderer, guiWidth + 48, guiHeight + 21, 80, 12);
nameChangeField.setMaxStringLength(12);
nameChangeField.setFocused(true);
}
@@ -105,16 +105,16 @@ public class GuiRobitMain extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(LangUtils.localize("gui.robit"), 76, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.robit"), 76, 6, 0x404040);
if(!displayNameChange)
{
CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName();
- fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getName() + "!", 29, 18, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getName() + "!", 29, 18, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00);
}
int xAxis = (mouseX - (width - xSize) / 2);
@@ -122,23 +122,23 @@ public class GuiRobitMain extends GuiMekanism
if(xAxis >= 28 && xAxis <= 148 && yAxis >= 75 && yAxis <= 79)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(robit.getEnergy()), xAxis, yAxis);
}
else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.robit.toggleFollow"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.robit.toggleFollow"), xAxis, yAxis);
}
else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.robit.rename"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.robit.rename"), xAxis, yAxis);
}
else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.robit.teleport"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.robit.teleport"), xAxis, yAxis);
}
else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.robit.togglePickup"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.robit.togglePickup"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java
index e351e33b1..dfdd57974 100644
--- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java
+++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java
@@ -57,7 +57,7 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener
int i = (width - xSize) / 2;
int j = (height - ySize) / 2;
- itemNameField = new GuiTextField(0, fontRendererObj, i + 62, j + 24, 103, 12);
+ itemNameField = new GuiTextField(0, fontRenderer, i + 62, j + 24, 103, 12);
itemNameField.setTextColor(-1);
itemNameField.setDisabledTextColour(-1);
itemNameField.setEnableBackgroundDrawing(false);
@@ -78,7 +78,7 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
GL11.glDisable(GL11.GL_LIGHTING);
- fontRendererObj.drawString(LangUtils.localize("container.repair"), 60, 6, 4210752);
+ fontRenderer.drawString(LangUtils.localize("container.repair"), 60, 6, 4210752);
if(repairContainer.maximumCost > 0)
{
@@ -103,21 +103,21 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener
if(flag)
{
int l = -16777216 | (k & 16579836) >> 2 | k & -16777216;
- int i1 = (xSize - 25) - 8 - fontRendererObj.getStringWidth(s);
+ int i1 = (xSize - 25) - 8 - fontRenderer.getStringWidth(s);
byte b0 = 67;
- if(fontRendererObj.getUnicodeFlag())
+ if(fontRenderer.getUnicodeFlag())
{
drawRect(i1 - 3, b0 - 2, (xSize - 25) - 7, b0 + 10, -16777216);
drawRect(i1 - 2, b0 - 1, (xSize - 25) - 8, b0 + 9, -12895429);
}
else {
- fontRendererObj.drawString(s, i1, b0 + 1, l);
- fontRendererObj.drawString(s, i1 + 1, b0, l);
- fontRendererObj.drawString(s, i1 + 1, b0 + 1, l);
+ fontRenderer.drawString(s, i1, b0 + 1, l);
+ fontRenderer.drawString(s, i1 + 1, b0, l);
+ fontRenderer.drawString(s, i1 + 1, b0 + 1, l);
}
- fontRendererObj.drawString(s, i1, b0, k);
+ fontRenderer.drawString(s, i1, b0, k);
}
}
@@ -254,7 +254,7 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener
}
@Override
- public void updateCraftingInventory(Container container, NonNullList list)
+ public void sendAllContents(Container container, NonNullList list)
{
sendSlotContents(container, 0, container.getSlot(0).getStack());
}
@@ -276,7 +276,7 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener
}
@Override
- public void sendProgressBarUpdate(Container par1Container, int par2, int par3) {}
+ public void sendWindowProperty(Container par1Container, int par2, int par3) {}
@Override
public void sendAllWindowProperties(Container p_175173_1_, IInventory p_175173_2_) {}
diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java
index c27d63342..47789112e 100644
--- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java
+++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java
@@ -30,8 +30,8 @@ public class GuiRobitSmelting extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(LangUtils.localize("gui.robit.smelting"), 8, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.robit.smelting"), 8, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
index 38ad90d36..06e0c2bfe 100644
--- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
+++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
@@ -119,17 +119,17 @@ public class GuiRotaryCondensentrator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
- fontRendererObj.drawString(tileEntity.mode == 0 ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
+ fontRenderer.drawString(tileEntity.mode == 0 ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040);
if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80)
{
- drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
+ drawHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis);
}
if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.rotaryCondensentrator.toggleOperation"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.rotaryCondensentrator.toggleOperation"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java
index f0e193a74..30afbec7a 100644
--- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java
+++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java
@@ -71,7 +71,7 @@ public class GuiSecurityDesk extends GuiMekanism
removeButton = new GuiButton(0, guiWidth + 13, guiHeight + 81, 122, 20, LangUtils.localize("gui.remove"));
- trustedField = new GuiTextField(1, fontRendererObj, guiWidth + 35, guiHeight + 69, 86, 11);
+ trustedField = new GuiTextField(1, fontRenderer, guiWidth + 35, guiHeight + 69, 86, 11);
trustedField.setMaxStringLength(MAX_LENGTH);
trustedField.setEnableBackgroundDrawing(false);
@@ -256,12 +256,12 @@ public class GuiSecurityDesk extends GuiMekanism
int yAxis = (mouseY-(height-ySize)/2);
String ownerText = EnumColor.RED + tileEntity.clientOwner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.clientOwner) : LangUtils.localize("gui.noOwner");
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
- fontRendererObj.drawString(ownerText, (xSize - 7) - fontRendererObj.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
+ fontRenderer.drawString(ownerText, (xSize - 7) - fontRenderer.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
String trusted = LangUtils.localize("gui.trustedPlayers");
- fontRendererObj.drawString(trusted, 74-(fontRendererObj.getStringWidth(trusted)/2), 57, 0x787878);
+ fontRenderer.drawString(trusted, 74-(fontRenderer.getStringWidth(trusted)/2), 57, 0x787878);
String security = EnumColor.RED + LangUtils.localize("gui.securityOffline");
@@ -270,7 +270,7 @@ public class GuiSecurityDesk extends GuiMekanism
security = LangUtils.localize("gui.security") + ": " + tileEntity.frequency.securityMode.getDisplay();
}
- fontRendererObj.drawString(security, 13, 103, 0x404040);
+ fontRenderer.drawString(security, 13, 103, 0x404040);
renderScaledText(LangUtils.localize("gui.add") + ":", 13, 70, 0x404040, 20);
diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java
index 0a36e0327..2fd657896 100644
--- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java
+++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java
@@ -44,7 +44,7 @@ public class GuiSeismicReader extends GuiScreen
public GuiSeismicReader(World world, Coord4D coord, ItemStack stack)
{
- pos = new Coord4D(coord.xCoord, Math.min(255, coord.yCoord), coord.zCoord, world.provider.getDimension());
+ pos = new Coord4D(coord.x, Math.min(255, coord.y), coord.z, world.provider.getDimension());
worldObj = world;
itemStack = stack;
@@ -101,7 +101,7 @@ public class GuiSeismicReader extends GuiScreen
GlStateManager.scale(0.7f, 0.7f, 0.7f);
}
- fontRendererObj.drawString(String.format("%s", currentLayer), 0, 0, 0xAFAFAF);
+ fontRenderer.drawString(String.format("%s", currentLayer), 0, 0, 0xAFAFAF);
GlStateManager.popMatrix();
// Render the item stacks
@@ -157,26 +157,26 @@ public class GuiSeismicReader extends GuiScreen
String capitalised = renderString.substring(0, 1).toUpperCase() + renderString.substring(1);
float renderScale = 1.0f;
- int lengthX = fontRendererObj.getStringWidth(capitalised);
+ int lengthX = fontRenderer.getStringWidth(capitalised);
renderScale = lengthX > 53 ? 53f / lengthX : 1.0f;
GlStateManager.pushMatrix();
GlStateManager.translate(guiWidth + 72, guiHeight + 16, 0);
GlStateManager.scale(renderScale, renderScale, renderScale);
- fontRendererObj.drawString(capitalised, 0, 0, 0x919191);
+ fontRenderer.drawString(capitalised, 0, 0, 0x919191);
GlStateManager.popMatrix();
if(tooltip.intersects(new Rectangle(mouseX, mouseY, 1, 1)))
{
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiTooltips.png"));
- int fontLengthX = fontRendererObj.getStringWidth(capitalised) + 5;
+ int fontLengthX = fontRenderer.getStringWidth(capitalised) + 5;
int renderX = mouseX + 10, renderY = mouseY - 5;
GlStateManager.pushMatrix();
GL11.glColor3f(1, 1, 1);
drawTexturedModalRect(renderX, renderY, 0, 0, fontLengthX, 16);
drawTexturedModalRect(renderX + fontLengthX, renderY, 0, 16, 2, 16);
- fontRendererObj.drawString(capitalised, renderX + 4, renderY + 4, 0x919191);
+ fontRenderer.drawString(capitalised, renderX + 4, renderY + 4, 0x919191);
GlStateManager.popMatrix();
}
}
@@ -199,7 +199,7 @@ public class GuiSeismicReader extends GuiScreen
GlStateManager.pushMatrix();
GlStateManager.translate(guiWidth + 72, guiHeight + 26, 0);
GlStateManager.scale(0.70f, 0.70f, 0.70f);
- fontRendererObj.drawString(LangUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191);
+ fontRenderer.drawString(LangUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191);
GlStateManager.popMatrix();
super.drawScreen(mouseX, mouseY, partialTick);
}
@@ -229,7 +229,7 @@ public class GuiSeismicReader extends GuiScreen
public void calculate()
{
- for(BlockPos p = new BlockPos(pos.xCoord, 0, pos.zCoord); p.getY() < pos.yCoord; p = p.up())
+ for(BlockPos p = new BlockPos(pos.x, 0, pos.z); p.getY() < pos.y; p = p.up())
{
IBlockState state = worldObj.getBlockState(p);
Block block = state.getBlock();
diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
index 2598cafc7..a886b1ba4 100644
--- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
+++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
@@ -54,11 +54,11 @@ public class GuiSeismicVibrator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(tileEntity.isActive ? LangUtils.localize("gui.vibrating") : LangUtils.localize("gui.idle"), 19, 26, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.chunk") + ": " + (tileEntity.getPos().getX() >> 4) + ", " + (tileEntity.getPos().getZ() >> 4), 19, 35, 0x00CD00);
+ fontRenderer.drawString(tileEntity.isActive ? LangUtils.localize("gui.vibrating") : LangUtils.localize("gui.idle"), 19, 26, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.chunk") + ": " + (tileEntity.getPos().getX() >> 4) + ", " + (tileEntity.getPos().getZ() >> 4), 19, 35, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java
index a365da363..e323334b9 100644
--- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java
+++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java
@@ -167,17 +167,17 @@ public class GuiSideConfiguration extends GuiMekanism
int yAxis = (mouseY - (height - ySize) / 2);
String title = currentType.localize() + " " + LangUtils.localize("gui.config");
- fontRendererObj.drawString(title, (xSize/2)-(fontRendererObj.getStringWidth(title)/2), 5, 0x404040);
+ fontRenderer.drawString(title, (xSize/2)-(fontRenderer.getStringWidth(title)/2), 5, 0x404040);
if(configurable.getConfig().canEject(currentType))
{
- fontRendererObj.drawString(LangUtils.localize("gui.eject") + ": " + (configurable.getConfig().isEjecting(currentType) ? "On" : "Off"), 53, 17, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.eject") + ": " + (configurable.getConfig().isEjecting(currentType) ? "On" : "Off"), 53, 17, 0x00CD00);
}
else {
- fontRendererObj.drawString(LangUtils.localize("gui.noEject"), 53, 17, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.noEject"), 53, 17, 0x00CD00);
}
- fontRendererObj.drawString(LangUtils.localize("gui.slots"), 77, 81, 0x787878);
+ fontRenderer.drawString(LangUtils.localize("gui.slots"), 77, 81, 0x787878);
for(int i = 0; i < slotPosMap.size(); i++)
{
@@ -190,14 +190,14 @@ public class GuiSideConfiguration extends GuiMekanism
{
if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14)
{
- drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getColoredName() + ")", xAxis, yAxis);
+ drawHoveringText(data.color + data.localize() + " (" + data.color.getColoredName() + ")", xAxis, yAxis);
}
}
}
if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
index 3dd390099..05e3cda87 100644
--- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
+++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
@@ -71,8 +71,8 @@ public class GuiSolarNeutronActivator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), 26, 4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 26, 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java
index 6413631c6..8fcb789c6 100644
--- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java
+++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java
@@ -76,7 +76,7 @@ public class GuiTFilterSelect extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java
index c4f680418..be0de933c 100644
--- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java
@@ -85,11 +85,11 @@ public class GuiTItemStackFilter extends GuiMekanism
((GuiButton)buttonList.get(1)).enabled = false;
}
- minField = new GuiTextField(2, fontRendererObj, guiWidth + 149, guiHeight + 19, 20, 11);
+ minField = new GuiTextField(2, fontRenderer, guiWidth + 149, guiHeight + 19, 20, 11);
minField.setMaxStringLength(2);
minField.setText("" + filter.min);
- maxField = new GuiTextField(3, fontRendererObj, guiWidth + 149, guiHeight + 31, 20, 11);
+ maxField = new GuiTextField(3, fontRenderer, guiWidth + 149, guiHeight + 31, 20, 11);
maxField.setMaxStringLength(2);
maxField.setText("" + filter.max);
}
@@ -171,14 +171,14 @@ public class GuiTItemStackFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
if(!filter.itemType.isEmpty())
{
@@ -206,22 +206,22 @@ public class GuiTItemStackFilter extends GuiMekanism
if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.sizeMode"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.sizeMode"), xAxis, yAxis);
}
if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
if(filter.color != null)
{
- drawCreativeTabHoveringText(filter.color.getColoredName(), xAxis, yAxis);
+ drawHoveringText(filter.color.getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java
index 1e533c82a..e1e15fc73 100644
--- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java
@@ -123,10 +123,10 @@ public class GuiTMaterialFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
if(!filter.materialItem.isEmpty())
{
@@ -154,17 +154,17 @@ public class GuiTMaterialFilter extends GuiMekanism
if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
if(filter.color != null)
{
- drawCreativeTabHoveringText(filter.color.getColoredName(), xAxis, yAxis);
+ drawHoveringText(filter.color.getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java
index 387ec6271..5bd1ac22e 100644
--- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java
@@ -97,7 +97,7 @@ public class GuiTModIDFilter extends GuiMekanism
buttonList.get(1).enabled = false;
}
- modIDText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12);
+ modIDText = new GuiTextField(2, fontRenderer, guiWidth + 35, guiHeight + 47, 95, 12);
modIDText.setMaxStringLength(TransporterFilter.MAX_LENGTH);
modIDText.setFocused(true);
}
@@ -164,10 +164,10 @@ public class GuiTModIDFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107);
- fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
if(!renderStack.isEmpty())
{
@@ -196,17 +196,17 @@ public class GuiTModIDFilter extends GuiMekanism
if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
if(filter.color != null)
{
- drawCreativeTabHoveringText(filter.color.getColoredName(), xAxis, yAxis);
+ drawHoveringText(filter.color.getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java
index 1cf9d2f7a..6067b7126 100644
--- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java
@@ -97,7 +97,7 @@ public class GuiTOreDictFilter extends GuiMekanism
buttonList.get(1).enabled = false;
}
- oreDictText = new GuiTextField(2, fontRendererObj, guiWidth + 35, guiHeight + 47, 95, 12);
+ oreDictText = new GuiTextField(2, fontRenderer, guiWidth + 35, guiHeight + 47, 95, 12);
oreDictText.setMaxStringLength(TransporterFilter.MAX_LENGTH);
oreDictText.setFocused(true);
}
@@ -164,10 +164,10 @@ public class GuiTOreDictFilter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
+ fontRenderer.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00);
renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107);
- fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040);
if(!renderStack.isEmpty())
{
@@ -196,17 +196,17 @@ public class GuiTOreDictFilter extends GuiMekanism
if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
if(filter.color != null)
{
- drawCreativeTabHoveringText(filter.color.getColoredName(), xAxis, yAxis);
+ drawHoveringText(filter.color.getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java
index 7c7a00cfa..3c0470304 100644
--- a/src/main/java/mekanism/client/gui/GuiTeleporter.java
+++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java
@@ -170,7 +170,7 @@ public class GuiTeleporter extends GuiMekanism
teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, LangUtils.localize("gui.teleport"));
}
- frequencyField = new GuiTextField(5, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11);
+ frequencyField = new GuiTextField(5, fontRenderer, guiWidth + 50, guiHeight + 104, 86, 11);
frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH);
frequencyField.setEnableBackgroundDrawing(false);
@@ -420,14 +420,14 @@ public class GuiTeleporter extends GuiMekanism
int xAxis = (mouseX-(width-xSize)/2);
int yAxis = (mouseY-(height-ySize)/2);
- fontRendererObj.drawString(getName(), (xSize/2)-(fontRendererObj.getStringWidth(getName())/2), 4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwnerUsername() != null ? getOwnerUsername() : LangUtils.localize("gui.none")), 8, !itemStack.isEmpty() ? ySize-12 : (ySize-96)+4, 0x404040);
+ fontRenderer.drawString(getName(), (xSize/2)-(fontRenderer.getStringWidth(getName())/2), 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.owner") + ": " + (getOwnerUsername() != null ? getOwnerUsername() : LangUtils.localize("gui.none")), 8, !itemStack.isEmpty() ? ySize-12 : (ySize-96)+4, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040);
- fontRendererObj.drawString(" " + (getFrequency() != null ? getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979);
- fontRendererObj.drawString(" " + (getFrequency() != null ? getSecurity(getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979);
+ fontRenderer.drawString(" " + (getFrequency() != null ? getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRenderer.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979);
+ fontRenderer.drawString(" " + (getFrequency() != null ? getSecurity(getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRenderer.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979);
String str = LangUtils.localize("gui.set") + ":";
renderScaledText(str, 27, 104, 0x404040, 20);
@@ -436,10 +436,10 @@ public class GuiTeleporter extends GuiMekanism
{
if(getFrequency() == null)
{
- drawCreativeTabHoveringText(EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noFreq"), xAxis, yAxis);
+ drawHoveringText(EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noFreq"), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(getStatusDisplay(), xAxis, yAxis);
+ drawHoveringText(getStatusDisplay(), xAxis, yAxis);
}
}
diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
index db107dcb8..f7cd0b98a 100644
--- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
+++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
@@ -64,27 +64,27 @@ public class GuiThermalEvaporationController extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 4, 0x404040);
- fontRendererObj.drawString(getStruct(), 50, 21, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.height") + ": " + tileEntity.height, 50, 30, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.temp") + ": " + getTemp(), 50, 39, 0x00CD00);
+ fontRenderer.drawString(getStruct(), 50, 21, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.height") + ": " + tileEntity.height, 50, 30, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.temp") + ": " + getTemp(), 50, 39, 0x00CD00);
renderScaledText(LangUtils.localize("gui.production") + ": " + Math.round(tileEntity.lastGain*100D)/100D + " mB/t", 50, 48, 0x00CD00, 76);
if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.inputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.inputTank.getFluid()) + ": " + tileEntity.inputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.inputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.inputTank.getFluid()) + ": " + tileEntity.inputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.outputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.outputTank.getFluid()) + ": " + tileEntity.outputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.outputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.outputTank.getFluid()) + ": " + tileEntity.outputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
if(xAxis >= 49 && xAxis <= 127 && yAxis >= 64 && yAxis <= 72)
{
- drawCreativeTabHoveringText(getTemp(), xAxis, yAxis);
+ drawHoveringText(getTemp(), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
index ee73f096a..09bbd4746 100644
--- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
+++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
@@ -83,8 +83,8 @@ public class GuiThermoelectricBoiler extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 5, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 5, 0x404040);
renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90);
renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90);
@@ -92,12 +92,12 @@ public class GuiThermoelectricBoiler extends GuiMekanism
if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.structure.waterStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.waterStored) + ": " + tileEntity.structure.waterStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.structure.waterStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.waterStored) + ": " + tileEntity.structure.waterStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.structure.steamStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.steamStored) + ": " + tileEntity.structure.steamStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.structure.steamStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.steamStored) + ": " + tileEntity.structure.steamStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java
index 681b8f777..d31005eb3 100644
--- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java
+++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java
@@ -127,12 +127,12 @@ public class GuiTransporterConfig extends GuiMekanism
int yAxis = (mouseY - (height - ySize) / 2);
String text = LangUtils.localize("gui.configuration.transporter");
- fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 5, 0x404040);
+ fontRenderer.drawString(text, (xSize/2)-(fontRenderer.getStringWidth(text)/2), 5, 0x404040);
text = LangUtils.localize("gui.strictInput") + " (" + LangUtils.transOnOff(configurable.getEjector().hasStrictInput()) + ")";
renderScaledText(text, 53, 17, 0x00CD00, 70);
- fontRendererObj.drawString(LangUtils.localize("gui.input"), 48, 81, 0x787878);
- fontRendererObj.drawString(LangUtils.localize("gui.output"), 114, 68, 0x787878);
+ fontRenderer.drawString(LangUtils.localize("gui.input"), 48, 81, 0x787878);
+ fontRenderer.drawString(LangUtils.localize("gui.output"), 114, 68, 0x787878);
if(configurable.getEjector().getOutputColor() != null)
{
@@ -159,7 +159,7 @@ public class GuiTransporterConfig extends GuiMekanism
{
if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14)
{
- drawCreativeTabHoveringText(color != null ? color.getColoredName() : LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(color != null ? color.getColoredName() : LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
}
@@ -168,16 +168,16 @@ public class GuiTransporterConfig extends GuiMekanism
{
if(configurable.getEjector().getOutputColor() != null)
{
- drawCreativeTabHoveringText(configurable.getEjector().getOutputColor().getColoredName(), xAxis, yAxis);
+ drawHoveringText(configurable.getEjector().getOutputColor().getColoredName(), xAxis, yAxis);
}
else {
- drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis);
}
}
if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.configuration.strictInput"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.configuration.strictInput"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java
index 0ac88b8e3..4dcac3ee5 100644
--- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java
+++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java
@@ -74,8 +74,8 @@ public class GuiUpgradeManagement extends GuiMekanism
GL11.glColor4f(1, 1, 1, 1);
drawTexturedModalRect(84, 8+getScroll(), 202, 0, 4, 4);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.upgrades.supported") + ":", 26, 59, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.upgrades.supported") + ":", 26, 59, 0x404040);
if(selectedType == null)
{
@@ -102,7 +102,7 @@ public class GuiUpgradeManagement extends GuiMekanism
if(supported.length > supportedIndex)
{
renderUpgrade(supported[supportedIndex], 80, 57, 0.8F, true);
- fontRendererObj.drawString(supported[supportedIndex].getName(), 96, 59, 0x404040);
+ fontRenderer.drawString(supported[supportedIndex].getName(), 96, 59, 0x404040);
}
}
@@ -123,7 +123,7 @@ public class GuiUpgradeManagement extends GuiMekanism
int yPos = 7 + (i*12);
int yRender = 0;
- fontRendererObj.drawString(upgrade.getName(), xPos + 12, yPos + 2, 0x404040);
+ fontRenderer.drawString(upgrade.getName(), xPos + 12, yPos + 2, 0x404040);
renderUpgrade(upgrade, xPos + 2, yPos + 2, 0.5F, true);
@@ -140,7 +140,7 @@ public class GuiUpgradeManagement extends GuiMekanism
{
GlStateManager.pushMatrix();
GlStateManager.scale(size, size, size);
- fontRendererObj.drawString(text, scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y, 0x00CD00);
+ fontRenderer.drawString(text, scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y, 0x00CD00);
GlStateManager.popMatrix();
}
diff --git a/src/main/java/mekanism/client/jei/GasStackHelper.java b/src/main/java/mekanism/client/jei/GasStackHelper.java
index 8ba323008..da6562ab9 100644
--- a/src/main/java/mekanism/client/jei/GasStackHelper.java
+++ b/src/main/java/mekanism/client/jei/GasStackHelper.java
@@ -6,13 +6,13 @@ import java.util.List;
import javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
+
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import mezz.jei.api.ingredients.IIngredientHelper;
import net.minecraft.item.ItemStack;
-import com.google.common.base.Objects;
-
public class GasStackHelper implements IIngredientHelper
{
@Override
@@ -75,7 +75,7 @@ public class GasStackHelper implements IIngredientHelper
@Override
public String getErrorInfo(GasStack ingredient)
{
- Objects.ToStringHelper toStringHelper = Objects.toStringHelper(GasStack.class);
+ MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(GasStack.class);
Gas gas = ingredient.getGas();
diff --git a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java
index 45658b88c..a0ee3b2bd 100644
--- a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java
+++ b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java
@@ -225,6 +225,6 @@ public class GasStackRenderer implements IIngredientRenderer
@Override
public FontRenderer getFontRenderer(Minecraft minecraft, GasStack gasStack) {
- return minecraft.fontRendererObj;
+ return minecraft.fontRenderer;
}
}
diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java
index 379ab0035..29c447f1e 100644
--- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java
+++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java
@@ -39,8 +39,8 @@ public class ChanceMachineRecipeWrapper extends BaseRecipeWrapper
if(output.hasSecondary())
{
- FontRenderer fontRendererObj = minecraft.fontRendererObj;
- fontRendererObj.drawString(Math.round(output.secondaryChance*100) + "%", 104, 41, 0x404040, false);
+ FontRenderer fontRenderer = minecraft.fontRenderer;
+ fontRenderer.drawString(Math.round(output.secondaryChance*100) + "%", 104, 41, 0x404040, false);
}
}
diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java
index 3d3293735..3385c92f6 100644
--- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java
+++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java
@@ -51,8 +51,8 @@ public class RotaryCondensentratorRecipeWrapper extends BaseRecipeWrapper
@Override
public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY)
{
- FontRenderer fontRendererObj = minecraft.fontRendererObj;
- fontRendererObj.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false);
+ FontRenderer fontRenderer = minecraft.fontRenderer;
+ fontRenderer.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false);
}
@Nullable
diff --git a/src/main/java/mekanism/client/render/FluidRenderer.java b/src/main/java/mekanism/client/render/FluidRenderer.java
index c77c69771..f41656288 100644
--- a/src/main/java/mekanism/client/render/FluidRenderer.java
+++ b/src/main/java/mekanism/client/render/FluidRenderer.java
@@ -25,7 +25,7 @@ public final class FluidRenderer
public static void translateToOrigin(Coord4D origin)
{
- GL11.glTranslated(getX(origin.xCoord), getY(origin.yCoord), getZ(origin.zCoord));
+ GL11.glTranslated(getX(origin.x), getY(origin.y), getZ(origin.z));
}
public static int getStages(RenderData data)
@@ -235,7 +235,7 @@ public final class FluidRenderer
private static int getValveFluidHeight(ValveRenderData data)
{
- return data.valveLocation.yCoord - data.location.yCoord;
+ return data.valveLocation.y - data.location.y;
}
private static double getX(int x)
diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java
index f72e44355..ab25225ab 100644
--- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java
+++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java
@@ -81,7 +81,7 @@ public final class MinerVisualRenderer
{
Model3D toReturn = new Model3D();
- toReturn.setBlockBounds(rel.xCoord + 0.4, rel.yCoord + 0.4, rel.zCoord + 0.4, rel.xCoord + 0.6, rel.yCoord + 0.6, rel.zCoord + 0.6);
+ toReturn.setBlockBounds(rel.x + 0.4, rel.y + 0.4, rel.z + 0.4, rel.x + 0.6, rel.y + 0.6, rel.z + 0.6);
toReturn.baseBlock = Blocks.WATER;
toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE));
diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java
index c0198ce53..cb29ede0e 100644
--- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java
+++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java
@@ -207,9 +207,9 @@ public class RenderResizableCuboid {
}
public static Vec3d withValue(Vec3d vector, Axis axis, double value) {
- if (axis == Axis.X) return new Vec3d(value, vector.yCoord, vector.zCoord);
- else if (axis == Axis.Y) return new Vec3d(vector.xCoord, value, vector.zCoord);
- else if (axis == Axis.Z) return new Vec3d(vector.xCoord, vector.yCoord, value);
+ if (axis == Axis.X) return new Vec3d(value, vector.y, vector.z);
+ else if (axis == Axis.Y) return new Vec3d(vector.x, value, vector.z);
+ else if (axis == Axis.Z) return new Vec3d(vector.x, vector.y, value);
else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")");
}
@@ -222,7 +222,7 @@ public class RenderResizableCuboid {
vertex = withValue(vertex, v, ri.xyz[V_ARRAY]);
vertex = withValue(vertex, face.getAxis(), other);
- wr.pos(vertex.xCoord, vertex.yCoord, vertex.zCoord);
+ wr.pos(vertex.x, vertex.y, vertex.z);
wr.tex(ri.uv[U_ARRAY], ri.uv[V_ARRAY]);
if (shadeTypes.isEnabled(EnumShadeType.FACE)) {
@@ -244,7 +244,7 @@ public class RenderResizableCuboid {
}
public static BlockPos convertFloor(Vec3d vec) {
- return new BlockPos(vec.xCoord, vec.yCoord, vec.zCoord);
+ return new BlockPos(vec.x, vec.y, vec.z);
}
public static Vec3d convert(Vec3i vec3i) {
@@ -338,7 +338,7 @@ public class RenderResizableCuboid {
}
public static void setWorldRendererRGB(BufferBuilder wr, Vec3d color) {
- wr.color((float) color.xCoord, (float) color.yCoord, (float) color.zCoord, 1f);
+ wr.color((float) color.x, (float) color.y, (float) color.z, 1f);
}
public static Vec3d vec3(double value) {
@@ -346,7 +346,7 @@ public class RenderResizableCuboid {
}
public static Vec3d multiply(Vec3d vec, double multiple) {
- return new Vec3d(vec.xCoord * multiple, vec.yCoord * multiple, vec.zCoord * multiple);
+ return new Vec3d(vec.x * multiple, vec.y * multiple, vec.z * multiple);
}
public static Vec3d convertMiddle(Vec3i vec3i) {
@@ -558,9 +558,9 @@ public class RenderResizableCuboid {
}
public static double getValue(Vec3d vector, Axis axis) {
- if (axis == Axis.X) return vector.xCoord;
- else if (axis == Axis.Y) return vector.yCoord;
- else if (axis == Axis.Z) return vector.zCoord;
+ if (axis == Axis.X) return vector.x;
+ else if (axis == Axis.Y) return vector.y;
+ else if (axis == Axis.Z) return vector.z;
else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")");
}
diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java
index 67ac8e614..dbe120fc7 100644
--- a/src/main/java/mekanism/client/render/RenderTickHandler.java
+++ b/src/main/java/mekanism/client/render/RenderTickHandler.java
@@ -51,7 +51,7 @@ public class RenderTickHandler
{
EntityPlayer player = mc.player;
World world = mc.player.world;
- FontRenderer font = mc.fontRendererObj;
+ FontRenderer font = mc.fontRenderer;
RayTraceResult pos = player.rayTrace(40.0D, 1.0F);
if(font == null)
@@ -160,16 +160,16 @@ public class RenderTickHandler
mRight = mRight.translate(rRight);
Pos3D v = playerPos.translate(vLeft).translate(new Pos3D(p.motionX, p.motionY, p.motionZ));
- spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord);
- spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord);
+ spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.x, v.y, v.z, mLeft.x, mLeft.y, mLeft.z);
+ spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.x, v.y, v.z, mLeft.x, mLeft.y, mLeft.z);
v = playerPos.translate(vRight).translate(new Pos3D(p.motionX, p.motionY, p.motionZ));
- spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord);
- spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord);
+ spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.x, v.y, v.z, mRight.x, mRight.y, mRight.z);
+ spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.x, v.y, v.z, mRight.x, mRight.y, mRight.z);
v = playerPos.translate(vCenter).translate(new Pos3D(p.motionX, p.motionY, p.motionZ));
- spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord);
- spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord);
+ spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.x, v.y, v.z, mCenter.x, mCenter.y, mCenter.z);
+ spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.x, v.y, v.z, mCenter.x, mCenter.y, mCenter.z);
}
}
@@ -195,7 +195,7 @@ public class RenderTickHandler
Pos3D motion = vec.scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ));
Pos3D v = playerPos.translate(vec);
- spawnAndSetParticle(EnumParticleTypes.WATER_BUBBLE, world, v.xCoord, v.yCoord, v.zCoord, motion.xCoord, motion.yCoord + 0.2, motion.zCoord);
+ spawnAndSetParticle(EnumParticleTypes.WATER_BUBBLE, world, v.x, v.y, v.z, motion.x, motion.y + 0.2, motion.z);
}
}
}
@@ -247,7 +247,7 @@ public class RenderTickHandler
Pos3D mergedVec = playerPos.translate(flameVec);
- spawnAndSetParticle(EnumParticleTypes.FLAME, world, mergedVec.xCoord, mergedVec.yCoord, mergedVec.zCoord, flameMotion.xCoord, flameMotion.yCoord, flameMotion.zCoord);
+ spawnAndSetParticle(EnumParticleTypes.FLAME, world, mergedVec.x, mergedVec.y, mergedVec.z, flameMotion.x, flameMotion.y, flameMotion.z);
}
}
}
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java
index 0abaecb4c..91287e6ea 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java
@@ -21,7 +21,7 @@ public class RenderBin extends TileEntitySpecialRenderer
private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
@Override
- public void func_192841_a(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_)
+ public void renderTileEntityAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha)
{
Coord4D obj = Coord4D.get(tileEntity).offset(tileEntity.facing);
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java
index 074ee23e3..85a2febd4 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java
@@ -15,7 +15,7 @@ public class RenderChargepad extends TileEntitySpecialRenderer
{
@Override
- public void func_192841_a(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_)
+ public void renderTileEntityAt(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha)
{
if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0)
{
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java
index 243c76a17..d55dc2acf 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java
@@ -45,7 +45,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer 0 ? tileEntity.valveFluid : null, x, y, z);
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java
index 3ccf82c28..b4e286ede 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java
@@ -10,8 +10,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class RenderGasTank extends TileEntitySpecialRenderer
{
@Override
- public void func_192841_a(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_)
+ public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha)
{
- MekanismRenderer.machineRenderer.func_192841_a(tileEntity, x, y, z, partialTick, destroyStage, p_192841_10_);
+ MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage, alpha);
}
}
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java
index 509d9f95a..0a5ffd0d0 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java
@@ -15,7 +15,7 @@ public class RenderLogisticalSorter extends TileEntitySpecialRenderer cachedOverlays = new HashMap();
@Override
- public void func_192841_a(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_)
+ public void renderTileEntityAt(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha)
{
if(tileEntity.shouldRender)
{
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
index 2bb95a9be..cf4390b52 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
@@ -26,7 +26,7 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere
private static Map> cachedCenterFluids = new HashMap>();
@Override
- public void func_192841_a(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_)
+ public void renderTileEntityAt(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha)
{
if(tileEntity.structured && tileEntity.inputTank.getFluid() != null)
{
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java
index f900eaa63..6e7bbb1b2 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java
@@ -8,16 +8,10 @@ import mekanism.client.render.FluidRenderer.ValveRenderData;
import mekanism.client.render.FluidRenderer;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
-import mekanism.client.render.MekanismRenderer.FluidType;
-import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.content.tank.SynchronizedTankData.ValveData;
import mekanism.common.content.tank.TankUpdateProtocol;
import mekanism.common.tile.TileEntityBoilerCasing;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.relauncher.Side;
@@ -36,7 +30,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer> 2 + 1L;
long zSeed = fmlRandom.nextLong() >> 2 + 1L;
- fmlRandom.setSeed((xSeed*nextChunk.chunkXPos + zSeed*nextChunk.chunkZPos) ^ world.getSeed());
+ fmlRandom.setSeed((xSeed*nextChunk.x + zSeed*nextChunk.z) ^ world.getSeed());
- Mekanism.genHandler.generate(fmlRandom, nextChunk.chunkXPos, nextChunk.chunkZPos, world, ((ChunkProviderServer)world.getChunkProvider()).chunkGenerator, world.getChunkProvider());
+ Mekanism.genHandler.generate(fmlRandom, nextChunk.x, nextChunk.z, world, ((ChunkProviderServer)world.getChunkProvider()).chunkGenerator, world.getChunkProvider());
Mekanism.logger.info("[Mekanism] Regenerating ores at chunk " + nextChunk);
}
diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java
index da681ee8b..3bc024048 100644
--- a/src/main/java/mekanism/common/LaserManager.java
+++ b/src/main/java/mekanism/common/LaserManager.java
@@ -86,7 +86,7 @@ public class LaserManager
IBlockState state = blockCoord.getBlockState(world);
Block blockHit = state.getBlock();
- EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord).get();
+ EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.x, blockCoord.y, blockCoord.z).get();
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockCoord.getPos(), state, dummy);
MinecraftForge.EVENT_BUS.post(event);
diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java
index 11453ba18..9e4707bc9 100644
--- a/src/main/java/mekanism/common/PacketHandler.java
+++ b/src/main/java/mekanism/common/PacketHandler.java
@@ -338,7 +338,7 @@ public class PacketHandler
{
for(EntityPlayerMP player : (List)server.getPlayerList().getPlayers())
{
- if(player.dimension == dimId && cuboid.isVecInside(new Vec3d(player.posX, player.posY, player.posZ)))
+ if(player.dimension == dimId && cuboid.contains(new Vec3d(player.posX, player.posY, player.posZ)))
{
sendTo(message, player);
}
diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java
index 64297680f..e85012c71 100644
--- a/src/main/java/mekanism/common/block/BlockGasTank.java
+++ b/src/main/java/mekanism/common/block/BlockGasTank.java
@@ -382,9 +382,11 @@ public class BlockGasTank extends BlockContainer
return false;
}
+ /*
@Override
public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
{
return false;
}
+ */
}
diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java
index 0480378b6..fa41d83ba 100644
--- a/src/main/java/mekanism/common/block/BlockGlowPanel.java
+++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java
@@ -44,7 +44,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
for(EnumFacing side : EnumFacing.VALUES)
{
- bounds[side.ordinal()] = MultipartUtils.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord);
+ bounds[side.ordinal()] = MultipartUtils.rotate(cuboid.offset(fromOrigin.x, fromOrigin.y, fromOrigin.z), side).offset(-fromOrigin.x, -fromOrigin.z, -fromOrigin.z);
}
}
diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java
index f6c49366f..cada8e5b6 100644
--- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java
+++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java
@@ -83,7 +83,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol
final Coord4D initDisperser = dispersers.iterator().next();
//Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser
- Coord4D pos = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord, structure.renderLocation.zCoord, pointer.getWorld().provider.getDimension());
+ Coord4D pos = new Coord4D(structure.renderLocation.x, initDisperser.y, structure.renderLocation.z, pointer.getWorld().provider.getDimension());
for(int x = 1; x < structure.volLength-1; x++)
{
for(int z = 1; z < structure.volWidth-1; z++)
@@ -126,11 +126,11 @@ public class BoilerUpdateProtocol extends UpdateProtocol
int totalAir = 0;
//Find the first available block in the structure for water storage (including casings)
- for(int x = structure.renderLocation.xCoord; x < structure.renderLocation.xCoord+structure.volLength; x++)
+ for(int x = structure.renderLocation.x; x < structure.renderLocation.x +structure.volLength; x++)
{
- for(int y = structure.renderLocation.yCoord; y < initDisperser.yCoord; y++)
+ for(int y = structure.renderLocation.y; y < initDisperser.y; y++)
{
- for(int z = structure.renderLocation.zCoord; z < structure.renderLocation.zCoord+structure.volWidth; z++)
+ for(int z = structure.renderLocation.z; z < structure.renderLocation.z +structure.volWidth; z++)
{
if(pointer.getWorld().isAirBlock(new BlockPos(x, y, z)) || isViableNode(x, y, z))
{
@@ -156,9 +156,9 @@ public class BoilerUpdateProtocol extends UpdateProtocol
@Override
public final boolean isValid(Coord4D coord)
{
- return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord &&
- coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+volLength &&
- coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+volWidth &&
+ return coord.y >= renderLocation.y -1 && coord.y < initDisperser.y &&
+ coord.x >= renderLocation.x && coord.x < renderLocation.x +volLength &&
+ coord.z >= renderLocation.z && coord.z < renderLocation.z +volWidth &&
(coord.isAirBlock(pointer.getWorld()) || isViableNode(coord.getPos()));
}
}).calculate(initAir);
@@ -169,10 +169,10 @@ public class BoilerUpdateProtocol extends UpdateProtocol
return false;
}
- int steamHeight = (structure.renderLocation.yCoord+structure.volHeight-2)-initDisperser.yCoord;
+ int steamHeight = (structure.renderLocation.y +structure.volHeight-2)-initDisperser.y;
structure.steamVolume = structure.volWidth*structure.volLength*steamHeight;
- structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord, pointer.getWorld().provider.getDimension());
+ structure.upperRenderLocation = new Coord4D(structure.renderLocation.x, initDisperser.y +1, structure.renderLocation.z, pointer.getWorld().provider.getDimension());
return true;
}
diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java
index b3c08160d..38f519fec 100644
--- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java
+++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java
@@ -53,9 +53,9 @@ public class ThreadMinerSearch extends Thread
for(int i = 0; i < size; i++)
{
- int x = coord.xCoord+i%diameter;
- int z = coord.zCoord+(i/diameter)%diameter;
- int y = coord.yCoord+(i/diameter/diameter);
+ int x = coord.x +i%diameter;
+ int z = coord.z +(i/diameter)%diameter;
+ int y = coord.y +(i/diameter/diameter);
if(tileEntity.isInvalid())
{
diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java
index b49b3e394..d7b366afe 100644
--- a/src/main/java/mekanism/common/entity/EntityBalloon.java
+++ b/src/main/java/mekanism/common/entity/EntityBalloon.java
@@ -96,7 +96,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
this(world);
latched = obj;
- setPosition(latched.xCoord + 0.5F, latched.yCoord + 1.9F, latched.zCoord + 0.5F);
+ setPosition(latched.x + 0.5F, latched.y + 1.9F, latched.z + 0.5F);
prevPosX = posX;
prevPosY = posY;
@@ -105,9 +105,9 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
color = c;
dataManager.set(IS_LATCHED, (byte)1);
- dataManager.set(LATCHED_X, latched != null ? latched.xCoord : 0); /* Latched X */
- dataManager.set(LATCHED_Y, latched != null ? latched.yCoord : 0); /* Latched Y */
- dataManager.set(LATCHED_Z, latched != null ? latched.zCoord : 0); /* Latched Z */
+ dataManager.set(LATCHED_X, latched != null ? latched.x : 0); /* Latched X */
+ dataManager.set(LATCHED_Y, latched != null ? latched.y : 0); /* Latched Y */
+ dataManager.set(LATCHED_Z, latched != null ? latched.z : 0); /* Latched Z */
}
@Override
@@ -152,9 +152,9 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
if(ticksExisted == 1)
{
dataManager.set(IS_LATCHED, new Byte(latched != null ? (byte)1 : (latchedEntity != null ? (byte)2 : (byte)0)));
- dataManager.set(LATCHED_X, new Integer(latched != null ? latched.xCoord : 0));
- dataManager.set(LATCHED_Y, new Integer(latched != null ? latched.yCoord : 0));
- dataManager.set(LATCHED_Z, new Integer(latched != null ? latched.zCoord : 0));
+ dataManager.set(LATCHED_X, new Integer(latched != null ? latched.x : 0));
+ dataManager.set(LATCHED_Y, new Integer(latched != null ? latched.y : 0));
+ dataManager.set(LATCHED_Z, new Integer(latched != null ? latched.z : 0));
dataManager.set(LATCHED_ID, new Integer(latchedEntity != null ? latchedEntity.getEntityId() : -1));
}
}
@@ -280,7 +280,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{
Pos3D pos = new Pos3D(posX + (rand.nextFloat()*.6 - 0.3), posY + (rand.nextFloat()*.6 - 0.3), posZ + (rand.nextFloat()*.6 - 0.3));
- Particle fx = new ParticleRedstone.Factory().createParticle(0, world, pos.xCoord, pos.yCoord, pos.zCoord, 0, 0, 0);
+ Particle fx = new ParticleRedstone.Factory().createParticle(0, world, pos.x, pos.y, pos.z, 0, 0, 0);
fx.setRBGColorF(color.getColor(0), color.getColor(1), color.getColor(2));
Minecraft.getMinecraft().effectRenderer.addEffect(fx);
diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java
index 84ff0f176..ddffca92a 100644
--- a/src/main/java/mekanism/common/entity/EntityFlame.java
+++ b/src/main/java/mekanism/common/entity/EntityFlame.java
@@ -55,15 +55,15 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
flameVec = flameVec.multiply(new Pos3D(player.getLookVec())).rotateYaw(6);
Pos3D mergedVec = playerPos.translate(flameVec);
- setPosition(mergedVec.xCoord, mergedVec.yCoord, mergedVec.zCoord);
+ setPosition(mergedVec.x, mergedVec.y, mergedVec.z);
Pos3D motion = new Pos3D(0.4, 0.4, 0.4).multiply(new Pos3D(player.getLookVec()));
setHeading(motion);
- motionX = motion.xCoord;
- motionY = motion.yCoord;
- motionZ = motion.zCoord;
+ motionX = motion.x;
+ motionY = motion.y;
+ motionZ = motion.z;
owner = player;
mode = ((ItemFlamethrower)player.inventory.getCurrentItem().getItem()).getMode(player.inventory.getCurrentItem());
@@ -71,10 +71,10 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
public void setHeading(Pos3D motion)
{
- float d = MathHelper.sqrt((motion.xCoord * motion.xCoord) + (motion.zCoord * motion.zCoord));
+ float d = MathHelper.sqrt((motion.x * motion.x) + (motion.z * motion.z));
- prevRotationYaw = rotationYaw = (float)(Math.atan2(motion.xCoord, motion.zCoord) * 180.0D / Math.PI);
- prevRotationPitch = rotationPitch = (float)(Math.atan2(motion.yCoord, d) * 180.0D / Math.PI);
+ prevRotationYaw = rotationYaw = (float)(Math.atan2(motion.x, motion.z) * 180.0D / Math.PI);
+ prevRotationPitch = rotationPitch = (float)(Math.atan2(motion.y, d) * 180.0D / Math.PI);
}
@Override
@@ -119,11 +119,11 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
if(mop != null)
{
- motionVec = new Vec3d(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord);
+ motionVec = new Vec3d(mop.hitVec.x, mop.hitVec.y, mop.hitVec.z);
}
Entity entity = null;
- List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
+ List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().expand(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
double entityDist = 0.0D;
int i;
@@ -213,11 +213,11 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
private boolean smeltItem(EntityItem item)
{
- ItemStack result = FurnaceRecipes.instance().getSmeltingResult(item.getEntityItem());
+ ItemStack result = FurnaceRecipes.instance().getSmeltingResult(item.getItem());
if(!result.isEmpty())
{
- item.setEntityItemStack(StackUtils.size(result, item.getEntityItem().getCount()));
+ item.setItem(StackUtils.size(result, item.getItem().getCount()));
item.ticksExisted = 0;
spawnParticlesAt(new Pos3D(item));
@@ -261,7 +261,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
else {
world.setBlockToAir(block.getPos());
- EntityItem item = new EntityItem(world, block.xCoord + 0.5, block.yCoord + 0.5, block.zCoord + 0.5, result.copy());
+ EntityItem item = new EntityItem(world, block.x + 0.5, block.y + 0.5, block.z + 0.5, result.copy());
item.motionX = 0;
item.motionY = 0;
item.motionZ = 0;
@@ -300,7 +300,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
{
for(int i = 0; i < 10; i++)
{
- world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.xCoord + (rand.nextFloat()-0.5), pos.yCoord + (rand.nextFloat()-0.5), pos.zCoord + (rand.nextFloat()-0.5), 0, 0, 0);
+ world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.x + (rand.nextFloat()-0.5), pos.y + (rand.nextFloat()-0.5), pos.z + (rand.nextFloat()-0.5), 0, 0, 0);
}
}
diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java
index 97cd97567..65c9452d6 100644
--- a/src/main/java/mekanism/common/entity/EntityRobit.java
+++ b/src/main/java/mekanism/common/entity/EntityRobit.java
@@ -177,7 +177,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
if(ticksExisted % 20 == 0)
{
- World serverWorld = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(homeLocation.dimensionId);
+ World serverWorld = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(homeLocation.dimensionId);
if(homeLocation.exists(serverWorld))
{
@@ -293,7 +293,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
{
for(EntityItem item : items)
{
- if(item.cannotPickup() || item.getEntityItem().getItem() instanceof ItemRobit)
+ if(item.cannotPickup() || item.getItem().getItem() instanceof ItemRobit)
{
continue;
}
@@ -304,25 +304,25 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
if(itemStack.isEmpty())
{
- inventory.set(i, item.getEntityItem());
- onItemPickup(item, item.getEntityItem().getCount());
+ inventory.set(i, item.getItem());
+ onItemPickup(item, item.getItem().getCount());
item.setDead();
playSound(SoundEvents.ENTITY_ITEM_PICKUP, 1.0F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
break;
}
- else if(itemStack.isItemEqual(item.getEntityItem()) && itemStack.getCount() < itemStack.getMaxStackSize())
+ else if(itemStack.isItemEqual(item.getItem()) && itemStack.getCount() < itemStack.getMaxStackSize())
{
int needed = itemStack.getMaxStackSize() - itemStack.getCount();
- int toAdd = Math.min(needed, item.getEntityItem().getCount());
+ int toAdd = Math.min(needed, item.getItem().getCount());
itemStack.grow(toAdd);
- item.getEntityItem().shrink(toAdd);
+ item.getItem().shrink(toAdd);
onItemPickup(item, toAdd);
- if(item.getEntityItem().getCount() == 0)
+ if(item.getItem().getCount() == 0)
{
item.setDead();
}
@@ -345,7 +345,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
changeDimension(homeLocation.dimensionId);
}
- setPositionAndUpdate(homeLocation.xCoord+0.5, homeLocation.yCoord+0.3, homeLocation.zCoord+0.5);
+ setPositionAndUpdate(homeLocation.x +0.5, homeLocation.y +0.3, homeLocation.z +0.5);
motionX = 0;
motionY = 0;
@@ -431,10 +431,10 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
{
EntityItem entityItem = new EntityItem(world, posX, posY+0.3, posZ, new ItemStack(MekanismItems.Robit));
- ItemRobit item = (ItemRobit)entityItem.getEntityItem().getItem();
- item.setEnergy(entityItem.getEntityItem(), getEnergy());
- item.setInventory(((ISustainedInventory)this).getInventory(), entityItem.getEntityItem());
- item.setName(entityItem.getEntityItem(), getName());
+ ItemRobit item = (ItemRobit)entityItem.getItem().getItem();
+ item.setEnergy(entityItem.getItem(), getEnergy());
+ item.setInventory(((ISustainedInventory)this).getInventory(), entityItem.getItem());
+ item.setName(entityItem.getItem(), getName());
float k = 0.05F;
entityItem.motionX = 0;
diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java
index 3ad3e1848..a739243d4 100644
--- a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java
+++ b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java
@@ -86,7 +86,7 @@ public class RobitAIFollow extends EntityAIBase
}
@Override
- public boolean continueExecuting()
+ public boolean shouldContinueExecuting()
{
return !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.world.provider.getDimension() == theRobit.world.provider.getDimension();
}
diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java
index 240bc70ac..4686211cc 100644
--- a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java
+++ b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java
@@ -98,7 +98,7 @@ public class RobitAIPickup extends EntityAIBase
}
@Override
- public boolean continueExecuting()
+ public boolean shouldContinueExecuting()
{
return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getDropPickup() && theRobit.getEnergy() > 0 && closest.world.provider.getDimension() == theRobit.world.provider.getDimension();
}
diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java
index ab47dbd82..22b480210 100644
--- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java
+++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java
@@ -54,9 +54,9 @@ public class ContainerRobitSmelting extends Container
public void addListener(IContainerListener icrafting)
{
super.addListener(icrafting);
- icrafting.sendProgressBarUpdate(this, 0, robit.furnaceCookTime);
- icrafting.sendProgressBarUpdate(this, 1, robit.furnaceBurnTime);
- icrafting.sendProgressBarUpdate(this, 2, robit.currentItemBurnTime);
+ icrafting.sendWindowProperty(this, 0, robit.furnaceCookTime);
+ icrafting.sendWindowProperty(this, 1, robit.furnaceBurnTime);
+ icrafting.sendWindowProperty(this, 2, robit.currentItemBurnTime);
}
@Override
@@ -70,17 +70,17 @@ public class ContainerRobitSmelting extends Container
if(lastCookTime != robit.furnaceCookTime)
{
- icrafting.sendProgressBarUpdate(this, 0, robit.furnaceCookTime);
+ icrafting.sendWindowProperty(this, 0, robit.furnaceCookTime);
}
if(lastBurnTime != robit.furnaceBurnTime)
{
- icrafting.sendProgressBarUpdate(this, 1, robit.furnaceBurnTime);
+ icrafting.sendWindowProperty(this, 1, robit.furnaceBurnTime);
}
if(lastItemBurnTime != robit.currentItemBurnTime)
{
- icrafting.sendProgressBarUpdate(this, 2, robit.currentItemBurnTime);
+ icrafting.sendWindowProperty(this, 2, robit.currentItemBurnTime);
}
}
diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java
index 279c6e0bb..9b94ed8e3 100644
--- a/src/main/java/mekanism/common/item/ItemBalloon.java
+++ b/src/main/java/mekanism/common/item/ItemBalloon.java
@@ -14,7 +14,6 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
@@ -65,7 +64,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int i = 0; i < EnumColor.DYES.length; i++)
{
EnumColor color = EnumColor.DYES[i];
@@ -88,7 +87,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
{
Pos3D pos = new Pos3D(hand == EnumHand.MAIN_HAND ? -0.4 : 0.4, 0, 0.3).rotateYaw(entityplayer.renderYawOffset).translate(new Pos3D(entityplayer));
- world.spawnEntity(new EntityBalloon(world, pos.xCoord-0.5, pos.yCoord-0.25, pos.zCoord-0.5, getColor(itemstack)));
+ world.spawnEntity(new EntityBalloon(world, pos.x-0.5, pos.y-0.25, pos.z-0.5, getColor(itemstack)));
}
if(!entityplayer.capabilities.isCreativeMode)
@@ -261,7 +260,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem
if(!source.getWorld().isRemote)
{
- source.getWorld().spawnEntity(new EntityBalloon(source.getWorld(), pos.xCoord, pos.yCoord, pos.zCoord, getColor(stack)));
+ source.getWorld().spawnEntity(new EntityBalloon(source.getWorld(), pos.x, pos.y, pos.z, getColor(stack)));
}
}
diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java
index 6e0e85c1f..444d9d07f 100644
--- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java
+++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java
@@ -199,7 +199,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(GasTankTier tier : GasTankTier.values())
{
ItemStack empty = new ItemStack(this);
diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
index b7209e31d..daef3e1bc 100644
--- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
+++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
@@ -73,7 +73,7 @@ public class ItemBlockGlowPanel extends ItemBlock
@Override
public void getSubItems(CreativeTabs tab, NonNullList listToAddTo)
{
- if(!func_194125_a(tab)) return;
+ if(!isInCreativeTab(tab)) return;
for(EnumColor color : EnumColor.DYES)
{
listToAddTo.add(new ItemStack(this, 1, color.getMetaValue()));
diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java
index a5598e210..5b2406740 100644
--- a/src/main/java/mekanism/common/item/ItemClump.java
+++ b/src/main/java/mekanism/common/item/ItemClump.java
@@ -30,7 +30,7 @@ public class ItemClump extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < Resource.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java
index 8a83d4d52..007418b6f 100644
--- a/src/main/java/mekanism/common/item/ItemConfigurator.java
+++ b/src/main/java/mekanism/common/item/ItemConfigurator.java
@@ -166,7 +166,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool
if(slotStack.hasTagCompound())
{
- item.getEntityItem().setTagCompound((NBTTagCompound)slotStack.getTagCompound().copy());
+ item.getItem().setTagCompound((NBTTagCompound)slotStack.getTagCompound().copy());
}
float k = 0.05F;
diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java
index c29af6666..1d548628d 100644
--- a/src/main/java/mekanism/common/item/ItemControlCircuit.java
+++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java
@@ -30,7 +30,7 @@ public class ItemControlCircuit extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(BaseTier tier : BaseTier.values())
{
if(tier.isObtainable())
diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java
index 02f32c078..c1230fbf3 100644
--- a/src/main/java/mekanism/common/item/ItemCrystal.java
+++ b/src/main/java/mekanism/common/item/ItemCrystal.java
@@ -30,7 +30,7 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < Resource.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java
index 73d8ac7b7..4eadba410 100644
--- a/src/main/java/mekanism/common/item/ItemDirtyDust.java
+++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java
@@ -32,7 +32,7 @@ public class ItemDirtyDust extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < Resource.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java
index 4e39348e9..62777e78e 100644
--- a/src/main/java/mekanism/common/item/ItemDust.java
+++ b/src/main/java/mekanism/common/item/ItemDust.java
@@ -30,7 +30,7 @@ public class ItemDust extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < Resource.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java
index 40deb486a..897facb21 100644
--- a/src/main/java/mekanism/common/item/ItemEnergized.java
+++ b/src/main/java/mekanism/common/item/ItemEnergized.java
@@ -79,7 +79,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack discharged = new ItemStack(this);
list.add(discharged);
ItemStack charged = new ItemStack(this);
diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java
index 4bb5cdb8b..439f52c17 100644
--- a/src/main/java/mekanism/common/item/ItemFlamethrower.java
+++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java
@@ -157,7 +157,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack empty = new ItemStack(this);
setGas(empty, null);
list.add(empty);
diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java
index 0af687bc6..99e7b6e2b 100644
--- a/src/main/java/mekanism/common/item/ItemFreeRunners.java
+++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java
@@ -95,7 +95,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack discharged = new ItemStack(this);
list.add(discharged);
ItemStack charged = new ItemStack(this);
diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java
index df35361bf..346c23b74 100644
--- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java
+++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java
@@ -51,7 +51,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
list.add(getEmptyItem());
}
diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java
index 9c063aabf..a5257f52b 100644
--- a/src/main/java/mekanism/common/item/ItemHDPE.java
+++ b/src/main/java/mekanism/common/item/ItemHDPE.java
@@ -31,7 +31,7 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < PlasticItem.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java
index 58589c960..74d3031e6 100644
--- a/src/main/java/mekanism/common/item/ItemIngot.java
+++ b/src/main/java/mekanism/common/item/ItemIngot.java
@@ -33,7 +33,7 @@ public class ItemIngot extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter <= 6; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java
index 17949c192..a7c3d74c3 100644
--- a/src/main/java/mekanism/common/item/ItemJetpack.java
+++ b/src/main/java/mekanism/common/item/ItemJetpack.java
@@ -214,7 +214,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack empty = new ItemStack(this);
setGas(empty, null);
list.add(empty);
diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java
index ae21ce196..e8237b913 100644
--- a/src/main/java/mekanism/common/item/ItemOtherDust.java
+++ b/src/main/java/mekanism/common/item/ItemOtherDust.java
@@ -37,7 +37,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < subtypes.length; counter++)
{
if(counter != 2)
diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java
index c575b7fe7..c1eeafc2a 100644
--- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java
+++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java
@@ -86,7 +86,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem
neededEnergy += 10000;
}
- int distance = (int)entity.getDistance(coords.xCoord, coords.yCoord, coords.zCoord);
+ int distance = (int)entity.getDistance(coords.x, coords.y, coords.z);
neededEnergy+=(distance*10);
diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java
index a7dead443..b9409b70b 100644
--- a/src/main/java/mekanism/common/item/ItemScubaTank.java
+++ b/src/main/java/mekanism/common/item/ItemScubaTank.java
@@ -225,7 +225,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack empty = new ItemStack(this);
setGas(empty, null);
list.add(empty);
diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java
index f9c63350e..34265d117 100644
--- a/src/main/java/mekanism/common/item/ItemShard.java
+++ b/src/main/java/mekanism/common/item/ItemShard.java
@@ -29,7 +29,7 @@ public class ItemShard extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(int counter = 0; counter < Resource.values().length; counter++)
{
itemList.add(new ItemStack(this, 1, counter));
diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java
index 275603930..58c35ed41 100644
--- a/src/main/java/mekanism/common/item/ItemTierInstaller.java
+++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java
@@ -75,7 +75,7 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList itemList)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
for(BaseTier tier : BaseTier.values())
{
if(tier.isObtainable())
diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java
index a6624b25d..a40a550c4 100644
--- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java
+++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java
@@ -39,7 +39,7 @@ public abstract class UpdateProtocol>
{
World world = pointer.getWorld();
- int origX = coord.xCoord, origY = coord.yCoord, origZ = coord.zCoord;
+ int origX = coord.x, origY = coord.y, origZ = coord.z;
boolean isCorner = true;
boolean isHollow = true;
@@ -242,27 +242,27 @@ public abstract class UpdateProtocol>
public EnumFacing getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax)
{
- if(obj.xCoord == xmin)
+ if(obj.x == xmin)
{
return EnumFacing.WEST;
}
- else if(obj.xCoord == xmax)
+ else if(obj.x == xmax)
{
return EnumFacing.EAST;
}
- else if(obj.yCoord == ymin)
+ else if(obj.y == ymin)
{
return EnumFacing.DOWN;
}
- else if(obj.yCoord == ymax)
+ else if(obj.y == ymax)
{
return EnumFacing.UP;
}
- else if(obj.zCoord == zmin)
+ else if(obj.z == zmin)
{
return EnumFacing.NORTH;
}
- else if(obj.zCoord == zmax)
+ else if(obj.z == zmax)
{
return EnumFacing.SOUTH;
}
@@ -355,7 +355,7 @@ public abstract class UpdateProtocol>
*/
private boolean isCorrectCorner(Coord4D obj, int xmin, int ymin, int zmin)
{
- if(obj.xCoord == xmin && obj.yCoord == ymin && obj.zCoord == zmin)
+ if(obj.x == xmin && obj.y == ymin && obj.z == zmin)
{
return true;
}
@@ -376,31 +376,31 @@ public abstract class UpdateProtocol>
*/
private boolean isFrame(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax)
{
- if(obj.xCoord == xmin && obj.yCoord == ymin)
+ if(obj.x == xmin && obj.y == ymin)
return true;
- if(obj.xCoord == xmax && obj.yCoord == ymin)
+ if(obj.x == xmax && obj.y == ymin)
return true;
- if(obj.xCoord == xmin && obj.yCoord == ymax)
+ if(obj.x == xmin && obj.y == ymax)
return true;
- if(obj.xCoord == xmax && obj.yCoord == ymax)
+ if(obj.x == xmax && obj.y == ymax)
return true;
- if(obj.xCoord == xmin && obj.zCoord == zmin)
+ if(obj.x == xmin && obj.z == zmin)
return true;
- if(obj.xCoord == xmax && obj.zCoord == zmin)
+ if(obj.x == xmax && obj.z == zmin)
return true;
- if(obj.xCoord == xmin && obj.zCoord == zmax)
+ if(obj.x == xmin && obj.z == zmax)
return true;
- if(obj.xCoord == xmax && obj.zCoord == zmax)
+ if(obj.x == xmax && obj.z == zmax)
return true;
- if(obj.yCoord == ymin && obj.zCoord == zmin)
+ if(obj.y == ymin && obj.z == zmin)
return true;
- if(obj.yCoord == ymax && obj.zCoord == zmin)
+ if(obj.y == ymax && obj.z == zmin)
return true;
- if(obj.yCoord == ymin && obj.zCoord == zmax)
+ if(obj.y == ymin && obj.z == zmax)
return true;
- if(obj.yCoord == ymax && obj.zCoord == zmax)
+ if(obj.y == ymax && obj.z == zmax)
return true;
return false;
diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java
index 356f83f44..0a7b7872e 100644
--- a/src/main/java/mekanism/common/network/PacketDataRequest.java
+++ b/src/main/java/mekanism/common/network/PacketDataRequest.java
@@ -34,7 +34,7 @@ public class PacketDataRequest implements IMessageHandler= structure.upperRenderLocation.yCoord-1)
+ if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y -1)
{
if(structure.steamStored != null && structure.steamStored.amount > 0)
{
@@ -71,7 +71,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
{
if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure))
{
- if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1)
+ if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y -1)
{
return new FluidTankInfo[] {steamTank.getInfo()};
}
@@ -86,7 +86,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
@Override
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
{
- if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1)
+ if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.y -1)
{
return waterTank.fill(resource, doFill);
}
@@ -97,7 +97,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
@Override
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain)
{
- if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1)
+ if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y -1)
{
if(structure.steamStored != null)
{
@@ -114,7 +114,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
@Override
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain)
{
- if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1)
+ if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y -1)
{
return steamTank.drain(maxDrain, doDrain);
}
@@ -127,7 +127,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
{
if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure))
{
- return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1;
+ return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.y -1;
}
return false;
@@ -138,7 +138,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
{
if((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure))
{
- return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1;
+ return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.y -1;
}
return false;
diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
index 0bddbf850..8c5a6e5cf 100644
--- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
+++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
@@ -36,7 +36,6 @@ import mekanism.common.content.miner.ThreadMinerSearch.State;
import mekanism.common.content.transporter.InvStack;
import mekanism.common.content.transporter.TransitRequest;
import mekanism.common.content.transporter.TransitRequest.TransitResponse;
-import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.inventory.container.ContainerFilter;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
@@ -379,7 +378,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
IBlockState state = obj.getBlockState(world);
Block block = state.getBlock();
- EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, obj.xCoord, obj.yCoord, obj.zCoord).get();
+ EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, obj.x, obj.y, obj.z).get();
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, obj.getPos(), state, dummy);
MinecraftForge.EVENT_BUS.post(event);
@@ -1058,9 +1057,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
int diameter = getDiameter();
Coord4D start = getStartingCoord();
- int x = start.xCoord+index%diameter;
- int y = start.yCoord+(index/diameter/diameter);
- int z = start.zCoord+(index/diameter)%diameter;
+ int x = start.x +index%diameter;
+ int y = start.y +(index/diameter/diameter);
+ int z = start.z +(index/diameter)%diameter;
return new Coord4D(x, y, z, world.provider.getDimension());
}
diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
index 01d316e28..bf650a07d 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
@@ -38,7 +38,6 @@ import mekanism.common.util.ListUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
@@ -116,7 +115,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im
SolarNeutronRecipe recipe = getRecipe();
- boolean sky = ((!world.isRaining() && !world.isThundering()) || isDesert()) && !world.provider.hasNoSky() && world.canSeeSky(getPos().up());
+ boolean sky = ((!world.isRaining() && !world.isThundering()) || isDesert()) && !world.provider.isNether() && world.canSeeSky(getPos().up()); // TODO Check isNether call, maybe it should be hasSkyLight
if(world.isDaytime() && sky && canOperate(recipe) && MekanismUtils.canFunction(this))
{
diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
index 4ea352bb7..4f03ffce1 100644
--- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
@@ -353,7 +353,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
for(Entity entity : entitiesInPortal)
{
- World teleWorld = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(closestCoords.dimensionId);
+ World teleWorld = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(closestCoords.dimensionId);
TileEntityTeleporter teleporter = (TileEntityTeleporter)closestCoords.getTileEntity(teleWorld);
if(teleporter != null)
@@ -387,9 +387,9 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
if(player.dimension != coord.dimensionId)
{
int id = player.dimension;
- WorldServer oldWorld = player.mcServer.worldServerForDimension(player.dimension);
+ WorldServer oldWorld = player.mcServer.getWorld(player.dimension);
player.dimension = coord.dimensionId;
- WorldServer newWorld = player.mcServer.worldServerForDimension(player.dimension);
+ WorldServer newWorld = player.mcServer.getWorld(player.dimension);
player.connection.sendPacket(new SPacketRespawn(player.dimension, player.world.getDifficulty(), newWorld.getWorldInfo().getTerrainType(), player.interactionManager.getGameType()));
oldWorld.removeEntityDangerously(player);
player.isDead = false;
@@ -397,13 +397,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
if(player.isEntityAlive())
{
newWorld.spawnEntity(player);
- player.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch);
+ player.setLocationAndAngles(coord.x +0.5, coord.y +1, coord.z +0.5, player.rotationYaw, player.rotationPitch);
newWorld.updateEntityWithOptionalForce(player, false);
player.setWorld(newWorld);
}
player.mcServer.getPlayerList().preparePlayer(player, oldWorld);
- player.connection.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch);
+ player.connection.setPlayerLocation(coord.x +0.5, coord.y +1, coord.z +0.5, player.rotationYaw, player.rotationPitch);
player.interactionManager.setWorld(newWorld);
player.mcServer.getPlayerList().updateTimeAndWeatherForPlayer(player, newWorld);
player.mcServer.getPlayerList().syncPlayerInventory(player);
@@ -418,13 +418,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, id, coord.dimensionId);
}
else {
- player.connection.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch);
+ player.connection.setPlayerLocation(coord.x +0.5, coord.y +1, coord.z +0.5, player.rotationYaw, player.rotationPitch);
}
}
public void teleportEntityTo(Entity entity, Coord4D coord, TileEntityTeleporter teleporter)
{
- WorldServer world = server.worldServerForDimension(coord.dimensionId);
+ WorldServer world = server.getWorld(coord.dimensionId);
if(entity.world.provider.getDimension() != coord.dimensionId)
{
@@ -432,7 +432,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
entity.isDead = false;
world.spawnEntity(entity);
- entity.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(coord.x +0.5, coord.y +1, coord.z +0.5, entity.rotationYaw, entity.rotationPitch);
world.updateEntityWithOptionalForce(entity, false);
entity.setWorld(world);
world.resetUpdateEntityTick();
@@ -455,7 +455,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
entity.isDead = true;
}
else {
- entity.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(coord.x +0.5, coord.y +1, coord.z +0.5, entity.rotationYaw, entity.rotationPitch);
Mekanism.packetHandler.sendToReceivers(new EntityMoveMessage(entity), new Range4D(new Coord4D(entity)));
}
}
@@ -524,7 +524,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
energyCost+=10000;
}
- int distance = (int)entity.getDistance(coords.xCoord, coords.yCoord, coords.zCoord);
+ int distance = (int)entity.getDistance(coords.x, coords.y, coords.z);
energyCost+=(distance*10);
return energyCost;
diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
index 756d86b36..d22a49ff3 100644
--- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
+++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
@@ -356,7 +356,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
middlePointer = middlePointer.offset(EnumFacing.DOWN);
}
- renderY = middlePointer.yCoord+1;
+ renderY = middlePointer.y +1;
if(height < 3 || height > MAX_HEIGHT)
{
@@ -548,7 +548,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
startPoint = isLeftOnFace ? startPoint.offset(right) : startPoint;
startPoint = startPoint.offset(right.getOpposite()).offset(MekanismUtils.getBack(facing));
- startPoint.yCoord = renderY;
+ startPoint.y = renderY;
return startPoint;
}
diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java
index a1c755798..9839be78c 100644
--- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java
+++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java
@@ -138,9 +138,9 @@ public class TileComponentChunkLoader implements ITileComponent
if(ticket != null)
{
- ticket.getModData().setInteger("xCoord", tileEntity.getPos().getX());
- ticket.getModData().setInteger("yCoord", tileEntity.getPos().getY());
- ticket.getModData().setInteger("zCoord", tileEntity.getPos().getZ());
+ ticket.getModData().setInteger("x", tileEntity.getPos().getX());
+ ticket.getModData().setInteger("y", tileEntity.getPos().getY());
+ ticket.getModData().setInteger("z", tileEntity.getPos().getZ());
forceChunks(ticket);
}
@@ -179,8 +179,8 @@ public class TileComponentChunkLoader implements ITileComponent
for(ChunkPos pos : chunkSet)
{
NBTTagCompound compound = new NBTTagCompound();
- compound.setInteger("chunkX", pos.chunkXPos);
- compound.setInteger("chunkZ", pos.chunkZPos);
+ compound.setInteger("chunkX", pos.x);
+ compound.setInteger("chunkZ", pos.z);
list.appendTag(compound);
}
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java
index 261fd2c3d..8932c5072 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java
@@ -297,12 +297,12 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
if(connectionMapContainsSide(connections, side))
{
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[ord] : BlockTransmitter.largeSides[ord];
- if(box.intersectsWith(entityBox)) list.add(box);
+ if(box.intersects(entityBox)) list.add(box);
}
}
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[6] : BlockTransmitter.largeSides[6];
- if(box.intersectsWith(entityBox)) list.add(box);
+ if(box.intersects(entityBox)) list.add(box);
return list;
}
diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java
index 985d5c49b..182b31012 100644
--- a/src/main/java/mekanism/common/util/MekanismUtils.java
+++ b/src/main/java/mekanism/common/util/MekanismUtils.java
@@ -1043,7 +1043,7 @@ public final class MekanismUtils
Vec3d headVec = getHeadVec(player);
Vec3d lookVec = player.getLook(1);
- Vec3d endVec = headVec.addVector(lookVec.xCoord*reach, lookVec.yCoord*reach, lookVec.zCoord*reach);
+ Vec3d endVec = headVec.addVector(lookVec.x*reach, lookVec.y*reach, lookVec.z*reach);
return world.rayTraceBlocks(headVec, endVec, true);
}
@@ -1209,7 +1209,7 @@ public final class MekanismUtils
*/
public static String getCoordDisplay(Coord4D obj)
{
- return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]";
+ return "[" + obj.x + ", " + obj.y + ", " + obj.z + "]";
}
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/mekanism/common/util/MultipartUtils.java b/src/main/java/mekanism/common/util/MultipartUtils.java
index a53989875..847ef005f 100644
--- a/src/main/java/mekanism/common/util/MultipartUtils.java
+++ b/src/main/java/mekanism/common/util/MultipartUtils.java
@@ -20,7 +20,7 @@ public final class MultipartUtils
Vec3d v1 = rotate(new Vec3d(aabb.minX, aabb.minY, aabb.minZ), side);
Vec3d v2 = rotate(new Vec3d(aabb.maxX, aabb.maxY, aabb.maxZ), side);
- return new AxisAlignedBB(v1.xCoord, v1.yCoord, v1.zCoord, v2.xCoord, v2.yCoord, v2.zCoord);
+ return new AxisAlignedBB(v1.x, v1.y, v1.z, v2.x, v2.y, v2.z);
}
public static Vec3d rotate(Vec3d vec, EnumFacing side)
@@ -28,17 +28,17 @@ public final class MultipartUtils
switch(side)
{
case DOWN:
- return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord);
+ return new Vec3d(vec.x, vec.y, vec.z);
case UP:
- return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord);
+ return new Vec3d(vec.x, -vec.y, -vec.z);
case NORTH:
- return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord);
+ return new Vec3d(vec.x, -vec.z, vec.y);
case SOUTH:
- return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord);
+ return new Vec3d(vec.x, vec.z, -vec.y);
case WEST:
- return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord);
+ return new Vec3d(vec.y, -vec.x, vec.z);
case EAST:
- return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord);
+ return new Vec3d(-vec.y, vec.x, vec.z);
}
return null;
diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java
index 40737ad63..14dccd64e 100644
--- a/src/main/java/mekanism/common/util/TransporterUtils.java
+++ b/src/main/java/mekanism/common/util/TransporterUtils.java
@@ -105,7 +105,7 @@ public final class TransporterUtils
TransporterManager.remove(stack);
- EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().xCoord + pos[0], tileEntity.coord().yCoord + pos[1], tileEntity.coord().zCoord + pos[2], stack.itemStack);
+ EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().x + pos[0], tileEntity.coord().y + pos[1], tileEntity.coord().z + pos[2], stack.itemStack);
entityItem.motionX = 0;
entityItem.motionY = 0;
@@ -119,7 +119,7 @@ public final class TransporterUtils
Coord4D offset = new Coord4D(0, 0, 0, tileEntity.world().provider.getDimension()).offset(stack.getSide(tileEntity));
float progress = (((float)stack.progress + partial) / 100F) - 0.5F;
- return new float[] {0.5F + offset.xCoord*progress, 0.25F + offset.yCoord*progress, 0.5F + offset.zCoord*progress};
+ return new float[] {0.5F + offset.x *progress, 0.25F + offset.y *progress, 0.5F + offset.z *progress};
}
public static void incrementColor(ILogisticalTransporter tileEntity)
diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
index 6943c3e06..cc59f6fb9 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
@@ -53,11 +53,11 @@ public class GuiBioGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
index 6993c6824..79aff3f27 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
@@ -62,10 +62,10 @@ public class GuiGasGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
String s = LangUtils.localize("gui.burnRate") + ": " + tileEntity.clientUsed;
- fontRendererObj.drawString(s, xSize - 8 - fontRendererObj.getStringWidth(s), (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(s, xSize - 8 - fontRenderer.getStringWidth(s), (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
index c763535bb..5bdb65af4 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
@@ -77,8 +77,8 @@ public class GuiHeatGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
index 7b485ac41..065f84723 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
@@ -89,8 +89,8 @@ public class GuiIndustrialTurbine extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 5, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 5, 0x404040);
double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil);
@@ -103,11 +103,11 @@ public class GuiIndustrialTurbine extends GuiMekanism
renderScaledText(LangUtils.localize("gui.maxFlow") + ": " + rate + " mB/t", 53, 53, 0x00CD00, 106);
String name = chooseByMode(tileEntity.structure.dumpMode, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess"));
- renderScaledText(name, 156-(int)(fontRendererObj.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66);
+ renderScaledText(name, 156-(int)(fontRenderer.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66);
if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72)
{
- drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
+ drawHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
index 511179fdd..8f54906e7 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
@@ -55,14 +55,14 @@ public class GuiReactorController extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 46, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 46, 6, 0x404040);
if(tileEntity.getActive())
{
- fontRendererObj.drawString(LangUtils.localize("gui.formed"), 8, 16, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.formed"), 8, 16, 0x404040);
}
else {
- fontRendererObj.drawString(LangUtils.localize("gui.incomplete"), 8, 16, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.incomplete"), 8, 16, 0x404040);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
index 53e8b53a6..47134165e 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
@@ -106,10 +106,10 @@ public class GuiReactorFuel extends GuiMekanism
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
- fontRendererObj.drawString(tileEntity.getName(), 46, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 46, 6, 0x404040);
String str = LangUtils.localize("gui.reactor.injectionRate") + ": " + (tileEntity.getReactor() == null ? "None" : tileEntity.getReactor().getInjectionRate());
- fontRendererObj.drawString(str, (xSize / 2) - (fontRendererObj.getStringWidth(str) / 2), 35, 0x404040);
- fontRendererObj.drawString("Edit Rate" + ":", 50, 117, 0x404040);
+ fontRenderer.drawString(str, (xSize / 2) - (fontRenderer.getStringWidth(str) / 2), 35, 0x404040);
+ fontRenderer.drawString("Edit Rate" + ":", 50, 117, 0x404040);
}
@Override
@@ -214,7 +214,7 @@ public class GuiReactorFuel extends GuiMekanism
String prevRad = injectionRateField != null ? injectionRateField.getText() : "";
- injectionRateField = new GuiTextField(0, fontRendererObj, guiWidth + 98, guiHeight + 115, 26, 11);
+ injectionRateField = new GuiTextField(0, fontRenderer, guiWidth + 98, guiHeight + 115, 26, 11);
injectionRateField.setMaxStringLength(2);
injectionRateField.setText(prevRad);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
index 4fe494ec4..3b0666a48 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
@@ -171,7 +171,7 @@ public class GuiReactorHeat extends GuiMekanism
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
- fontRendererObj.drawString(tileEntity.getName(), 46, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 46, 6, 0x404040);
}
@Override
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java
index 00dd082ab..2de351969 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java
@@ -43,12 +43,12 @@ public class GuiReactorLogicAdapter extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), (xSize/2)-(fontRenderer.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
renderScaledText(LangUtils.localize("gui.coolingMeasurements") + ": " + EnumColor.RED + LangUtils.transOnOff(tileEntity.activeCooled), 36, 20, 0x404040, 117);
renderScaledText(LangUtils.localize("gui.redstoneOutputMode") + ": " + EnumColor.RED + tileEntity.logicType.getLocalizedName(), 23, 123, 0x404040, 130);
String text = LangUtils.localize("gui.status") + ": " + EnumColor.RED + LangUtils.localize("gui." + (tileEntity.checkMode() ? "outputting" : "idle"));
- fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 136, 0x404040);
+ fontRenderer.drawString(text, (xSize/2)-(fontRenderer.getStringWidth(text)/2), 136, 0x404040);
for(ReactorLogic type : ReactorLogic.values())
{
@@ -58,7 +58,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();
- fontRendererObj.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040);
+ fontRenderer.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040);
}
for(ReactorLogic type : ReactorLogic.values())
@@ -71,7 +71,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism
if(xAxis >= 23 && xAxis <= 34 && yAxis >= 19 && yAxis <= 30)
{
- drawCreativeTabHoveringText(LangUtils.localize("gui.toggleCooling"), xAxis, yAxis);
+ drawHoveringText(LangUtils.localize("gui.toggleCooling"), xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
index a538404d3..c96a0578f 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
@@ -56,24 +56,24 @@ public class GuiReactorStats extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 46, 6, 0x404040);
+ fontRenderer.drawString(tileEntity.getName(), 46, 6, 0x404040);
if(tileEntity.isFormed())
{
- fontRendererObj.drawString(EnumColor.DARK_GREEN + LangUtils.localize("gui.passive"), 6, 26, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(false), TemperatureUnit.AMBIENT)), 16, 46, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(false), TemperatureUnit.AMBIENT)), 16, 56, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(false), TemperatureUnit.AMBIENT)), 16, 66, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, false))+"/t", 16, 76, 0x404040);
+ fontRenderer.drawString(EnumColor.DARK_GREEN + LangUtils.localize("gui.passive"), 6, 26, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(false), TemperatureUnit.AMBIENT)), 16, 46, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(false), TemperatureUnit.AMBIENT)), 16, 56, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(false), TemperatureUnit.AMBIENT)), 16, 66, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, false))+"/t", 16, 76, 0x404040);
- fontRendererObj.drawString(EnumColor.DARK_BLUE + LangUtils.localize("gui.active"), 6, 92, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 102, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(true), TemperatureUnit.AMBIENT)), 16, 112, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(true), TemperatureUnit.AMBIENT)), 16, 122, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(true), TemperatureUnit.AMBIENT)), 16, 132, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(true, false))+"/t", 16, 142, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.steamProduction") + ": " + nf.format(tileEntity.getReactor().getSteamPerTick(false)) + "mB/t", 16, 152, 0x404040);
+ fontRenderer.drawString(EnumColor.DARK_BLUE + LangUtils.localize("gui.active"), 6, 92, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 102, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(true), TemperatureUnit.AMBIENT)), 16, 112, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(true), TemperatureUnit.AMBIENT)), 16, 122, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(true), TemperatureUnit.AMBIENT)), 16, 132, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(true, false))+"/t", 16, 142, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.steamProduction") + ": " + nf.format(tileEntity.getReactor().getSteamPerTick(false)) + "mB/t", 16, 152, 0x404040);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
index 3692534e6..f92e71910 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
@@ -54,11 +54,11 @@ public class GuiSolarGenerator extends GuiMekanism
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
- fontRendererObj.drawString(tileEntity.getName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
index 961249ae9..7b847ad69 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
@@ -56,32 +56,32 @@ public class GuiTurbineStats extends GuiMekanism
String stats = LangUtils.localize("gui.turbineStats");
String limiting = EnumColor.DARK_RED + " (" + LangUtils.localize("gui.limiting") + ")";
- fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040);
+ fontRenderer.drawString(stats, (xSize/2)-(fontRenderer.getStringWidth(stats)/2), 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.tankVolume") + ": " + tileEntity.structure.lowerVolume, 8, 26, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.tankVolume") + ": " + tileEntity.structure.lowerVolume, 8, 26, 0x404040);
boolean dispersersLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow <
tileEntity.structure.vents*generators.turbineVentGasFlow;
boolean ventsLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow >
tileEntity.structure.vents*generators.turbineVentGasFlow;
- fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979);
- fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979);
+ fontRenderer.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040);
boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades;
boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades;
- fontRendererObj.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979);
- fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979);
+ fontRenderer.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040);
double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil);
double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow);
rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow);
- fontRendererObj.drawString(LangUtils.localize("gui.maxProduction") + ": " + MekanismUtils.getEnergyDisplay(rate*energyMultiplier), 8, 104, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("gui.maxWaterOutput") + ": " + tileEntity.structure.condensers*generators.condenserRate + " mB/t", 8, 113, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxProduction") + ": " + MekanismUtils.getEnergyDisplay(rate*energyMultiplier), 8, 104, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("gui.maxWaterOutput") + ": " + tileEntity.structure.condensers*generators.condenserRate + " mB/t", 8, 113, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
index d4a10d34e..fa1f68ba9 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
@@ -56,18 +56,18 @@ public class GuiWindGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
- fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
- fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
- fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.currentMultiplier)), 51, 35, 0x00CD00);
- fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
+ fontRenderer.drawString(tileEntity.getName(), 45, 6, 0x404040);
+ fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.currentMultiplier)), 51, 35, 0x00CD00);
+ fontRenderer.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
int size = 44;
if(!tileEntity.getActive())
{
size += 9;
- fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00);
+ fontRenderer.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java
index fe0a0e9b5..13017036a 100644
--- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java
+++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java
@@ -15,7 +15,7 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer 0)
{
diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java
index 689047b61..11635c8f5 100644
--- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java
+++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java
@@ -15,7 +15,7 @@ public class RenderGasGenerator extends TileEntitySpecialRenderer= Math.ceil((structure.volHeight-2)/4))
{
- int centerX = structure.minLocation.xCoord+(structure.volLength-1)/2;
- int centerZ = structure.minLocation.zCoord+(structure.volWidth-1)/2;
+ int centerX = structure.minLocation.x +(structure.volLength-1)/2;
+ int centerZ = structure.minLocation.z +(structure.volWidth-1)/2;
Coord4D complex = null;
@@ -84,7 +84,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.minLocation.yCoord; y--)
+ for(int y = complex.y -1; y > structure.minLocation.y; y--)
{
TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(centerX, y, centerZ));
@@ -209,7 +209,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol= complex.yCoord)
+ if(coord.y >= complex.y)
{
structure.vents++;
}
diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java
index f1b9405fa..ade41ad0e 100644
--- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java
+++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java
@@ -133,7 +133,7 @@ public class ContainerReactorController extends Container
@Override
@SideOnly(Side.CLIENT)
- public boolean canBeHovered()
+ public boolean isEnabled()
{
return tileEntity != null && MekanismUtils.isActive(tileEntity.getWorld(), tileEntity.getPos());
}
diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java
index 6b86422ef..4711ed4f6 100644
--- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java
+++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java
@@ -156,7 +156,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem
@Override
public void getSubItems(CreativeTabs tabs, NonNullList list)
{
- if(!func_194125_a(tabs)) return;
+ if(!isInCreativeTab(tabs)) return;
ItemStack empty = new ItemStack(this);
setGas(empty, null);
list.add(empty);
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
index 2a60e490a..3eeb6aa83 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
@@ -65,7 +65,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
{
ChargeUtils.charge(0, this);
- if(world.isDaytime() && ((!world.isRaining() && !world.isThundering()) || isDesert()) && !world.provider.hasNoSky() && world.canSeeSky(getPos().add(0, 4, 0)))
+ if(world.isDaytime() && ((!world.isRaining() && !world.isThundering()) || isDesert()) && !world.provider.isNether() && world.canSeeSky(getPos().add(0, 4, 0))) // TODO Check isNether call, maybe it should be hasSkyLight
{
seesSun = true;
}