diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index c6756d6b4..191ed195e 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -84,6 +84,18 @@ public class Coord4D extends BlockPos dimensionId = dimension; } + public Coord4D(Vec3i pos) + { + this(pos, 0); + } + + public Coord4D(Vec3i pos, int dimension) + { + this(pos.getX(), pos.getY(), pos.getZ()); + + dimensionId = dimension; + } + public Coord4D(MovingObjectPosition mop) { diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index 0fc4c423b..8196bd26b 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -184,7 +184,7 @@ public class Pos3D extends Vec3 * @param yaw - yaw to rotate by * @return rotated Pos3D */ - public Pos3D rotateYaw(double yaw) + public Pos3D rotateYaw(float yaw) { double yawRadians = Math.toRadians(yaw); @@ -200,7 +200,7 @@ public class Pos3D extends Vec3 return new Pos3D(xPos, yCoord, zPos); } - public Pos3D rotatePitch(double pitch) + public Pos3D rotatePitch(float pitch) { double pitchRadians = Math.toRadians(pitch); @@ -216,12 +216,12 @@ public class Pos3D extends Vec3 return new Pos3D(xCoord, yPos, zPos); } - public Pos3D rotate(double yaw, double pitch) + public Pos3D rotate(float yaw, float pitch) { return rotate(yaw, pitch, 0); } - public Pos3D rotate(double yaw, double pitch, double roll) + public Pos3D rotate(float yaw, float pitch, float roll) { double yawRadians = Math.toRadians(yaw); double pitchRadians = Math.toRadians(pitch); diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 7dbee1815..1ede05f48 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -124,21 +124,21 @@ public class Gas * @param i - IIcon to associate with this Gas * @return this Gas object */ -/* public Gas setIcon(ResourceLocation i) { icon = i; +/* if(hasFluid()) { fluid.setIcons(getIcon()); } - +*/ + from_fluid = false; return this; } -*/ /** * Gets the ID associated with this gas.