diff --git a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java index a39a0192..de1de6a6 100644 --- a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java +++ b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java @@ -35,11 +35,13 @@ import com.google.common.io.ByteArrayDataInput; * @author Calclavia * */ +@Synced public class TileFirebox extends TileElectricalInventory implements IPacketReceiver, IFluidHandler { /** * 1KG of coal ~= 24MJ - * Approximately one coal = 4MJ, one coal lasts 80 seconds. Therefore, we are producing 50000 watts. + * Approximately one coal = 4MJ, one coal lasts 80 seconds. Therefore, we are producing 50000 + * watts. * The power of the firebox in terms of thermal energy. The thermal energy can be transfered * into fluids to increase their internal energy. */ diff --git a/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java b/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java index 93f31509..760e6199 100644 --- a/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java +++ b/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java @@ -145,7 +145,7 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac } } - final int renderFrequency = ResonantInduction.proxy.isGraphicsFancy() ? 1 + worldObj.rand.nextInt(2) : 10 + worldObj.rand.nextInt(2); + final int renderFrequency = 1; final boolean renderBeam = ticks % renderFrequency == 0 && hasLink() && linked.suck != suck; if (hasLink()) @@ -153,14 +153,13 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac if (!suck) { if (renderBeam) - { Electrical.proxy.renderElectricShock(worldObj, new Vector3(this).translate(0.5), new Vector3(this).translate(new Vector3(getDirection())).translate(0.5), EnumColor.DYES[dyeID].toColor(), false); - } // Push entity along path. if (pathfinder != null) { - List results = this.pathfinder.results; + List results = pathfinder.results; + for (int i = 0; i < results.size(); i++) { Vector3 result = results.get(i).clone(); @@ -210,18 +209,13 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac pathfinder = null; - Vector3 searchVec = new Vector3(this).modifyPositionFromSide(getDirection()); + Vector3 searchVec = new Vector3(this).translate(getDirection()); AxisAlignedBB searchBounds = AxisAlignedBB.getAABBPool().getAABB(searchVec.x, searchVec.y, searchVec.z, searchVec.x + 1, searchVec.y + 1, searchVec.z + 1); if (searchBounds != null) { for (EntityItem entityItem : (List) worldObj.getEntitiesWithinAABB(EntityItem.class, searchBounds)) { - if (renderBeam) - { - Electrical.proxy.renderElectricShock(worldObj, new Vector3(this).translate(0.5), new Vector3(entityItem), EnumColor.DYES[dyeID].toColor(), false); - } - moveEntity(entityItem, getDirection(), new Vector3(this)); } } @@ -231,6 +225,8 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac { for (EntityItem entityItem : (List) worldObj.getEntitiesWithinAABB(EntityItem.class, operationBounds)) { + if (ticks % renderFrequency == 0) + Electrical.proxy.renderElectricShock(worldObj, new Vector3(this).translate(0.5), new Vector3(entityItem), EnumColor.DYES[dyeID].toColor(), false); moveEntity(entityItem, getDirection(), new Vector3(this)); } } @@ -570,8 +566,8 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac { pathfinder = null; - Vector3 start = new Vector3(this).modifyPositionFromSide(getDirection()); - Vector3 target = new Vector3(linked).modifyPositionFromSide(linked.getDirection()); + Vector3 start = new Vector3(this).translate(getDirection()); + Vector3 target = new Vector3(linked).translate(linked.getDirection()); if (start.distance(target) < Settings.MAX_CONTRACTOR_DISTANCE) {