From b4e64657e4d2e699c4e6da49e91b7bcdbc2acc70 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 10 Jun 2014 15:15:27 +0800 Subject: [PATCH] Fixed issues when day/night cycle disabled. --- .../enderio/conduit/liquid/AbstractTankConduit.java | 2 +- .../crazypants/enderio/item/MagnetController.java | 2 +- .../enderio/machine/AbstractMachineEntity.java | 4 ++-- .../enderio/machine/farm/TileFarmStation.java | 2 +- .../stirling/TileEntityStirlingGenerator.java | 2 +- .../enderio/machine/power/TileCapacitorBank.java | 12 ++++++------ .../crazypants/enderio/machine/still/TileVat.java | 2 +- .../crazypants/enderio/machine/tank/TileTank.java | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java index 5782275e..7a57654b 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java @@ -85,7 +85,7 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit { } else if(player.getCurrentEquippedItem().getItem() == Items.bucket) { if(!getBundle().getEntity().getWorldObj().isRemote) { - long curTick = getBundle().getEntity().getWorldObj().getWorldTime(); + long curTick = getBundle().getEntity().getWorldObj().getTotalWorldTime(); if(curTick - lastEmptyTick < 20) { numEmptyEvents++; } else { diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 3e2a900e..a8bc9b45 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -21,7 +21,7 @@ public class MagnetController implements IEntitySelector { ActiveMagnet mag = getActiveMagnet(event.player); if(mag != null) { doHoover(event.player); - if(event.side == Side.SERVER && event.player.worldObj.getWorldTime() % 20 == 0) { + if(event.side == Side.SERVER && event.player.worldObj.getTotalWorldTime() % 20 == 0) { ItemMagnet.drainPerSecondPower(mag.item); event.player.inventory.setInventorySlotContents(mag.slot, mag.item); event.player.inventory.markDirty(); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 0e086556..b5480cf2 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -371,7 +371,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(slotDefinition.getNumOutputSlots() <= 0) { return false; } - if(worldObj.getWorldTime() % 20 != 0) { + if(worldObj.getTotalWorldTime() % 20 != 0) { return false; } @@ -402,7 +402,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(slotDefinition.getNumInputSlots() <= 0) { return false; } - if(worldObj.getWorldTime() % 20 != 0) { + if(worldObj.getTotalWorldTime() % 20 != 0) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index ecde714b..09de2619 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -207,7 +207,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt if(!redstoneCheckPassed || !hasPower()) { return false; } - if(worldObj.getWorldTime() % 2 != 0) { + if(worldObj.getTotalWorldTime() % 2 != 0) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index 270bfe4d..39665160 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -148,7 +148,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement storedEnergy += (ENERGY_PER_TICK * getEnergyMultiplier()); } burnTime--; - sendBurnTimePacket = worldObj.getWorldTime() % 20 == 1 || burnTime == 0; + sendBurnTimePacket = worldObj.getTotalWorldTime() % 20 == 1 || burnTime == 0; } transmitEnergy(); diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 643e5d2f..d3b0aa74 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -212,8 +212,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } if(!isContoller()) { - if(notifyNeighbours) { - worldObj.notifyBlockOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + if(notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); notifyNeighbours = false; } return; @@ -221,8 +221,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe chargeItems(); - - boolean hasSignal = isRecievingRedstoneSignal(); + + boolean hasSignal = isRecievingRedstoneSignal(); if(inputControlMode == RedstoneControlMode.IGNORE) { inputEnabled = true; } else if(inputControlMode == RedstoneControlMode.NEVER) { @@ -256,8 +256,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe PacketHandler.sendToAllAround(new PacketPowerStorage(this), this, 64); } - if(notifyNeighbours) { - worldObj.notifyBlockOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + if(notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); notifyNeighbours = false; } diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index 9628cfb6..f4c5be96 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -173,7 +173,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override protected boolean processTasks(boolean redstoneChecksPassed) { boolean res = super.processTasks(redstoneChecksPassed); - if(tanksDirty && worldObj.getWorldTime() % 10 == 0) { + if(tanksDirty && worldObj.getTotalWorldTime() % 10 == 0) { PacketHandler.sendToAllAround(new PacketTanks(this), this); tanksDirty = false; } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 7718dd3f..965bd215 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -212,7 +212,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { tankDirty = false; return true; } - if(tankDirty && worldObj.getWorldTime() % 10 == 0) { + if(tankDirty && worldObj.getTotalWorldTime() % 10 == 0) { PacketHandler.sendToAllAround(new PacketTank(this), this); tankDirty = false; } @@ -223,7 +223,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { if(!redstoneCheckPassed) { return false; } - if(worldObj.getWorldTime() % 20 != 0) { + if(worldObj.getTotalWorldTime() % 20 != 0) { return false; } return drainFullContainer() || fillEmptyContainer();