From a2ad18b4dedcfa29f53b957b4c8ee72b1ea77359 Mon Sep 17 00:00:00 2001 From: Astoria Date: Thu, 12 Jan 2023 14:17:23 -0600 Subject: [PATCH] Replace more getWorldTime with getTotalWorldTime --- src/main/java/com/eloraam/redpower/control/GuiDisplay.java | 2 +- .../java/com/eloraam/redpower/core/BluePowerConductor.java | 2 +- src/main/java/com/eloraam/redpower/core/EnvironLib.java | 2 +- src/main/java/com/eloraam/redpower/core/FluidBuffer.java | 2 +- src/main/java/com/eloraam/redpower/core/TileExtended.java | 4 ++-- src/main/java/com/eloraam/redpower/machine/TilePipe.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/eloraam/redpower/control/GuiDisplay.java b/src/main/java/com/eloraam/redpower/control/GuiDisplay.java index 251adfa..efff3db 100644 --- a/src/main/java/com/eloraam/redpower/control/GuiDisplay.java +++ b/src/main/java/com/eloraam/redpower/control/GuiDisplay.java @@ -97,7 +97,7 @@ public class GuiDisplay extends GuiContainer { } if (this.disp.cursMode == 2) { - long tm = super.mc.theWorld.getWorldTime(); + long tm = super.mc.theWorld.getTotalWorldTime(); if ((tm >> 2 & 1L) > 0L) { b ^= 128; } diff --git a/src/main/java/com/eloraam/redpower/core/BluePowerConductor.java b/src/main/java/com/eloraam/redpower/core/BluePowerConductor.java index baf5c3d..1467bd6 100644 --- a/src/main/java/com/eloraam/redpower/core/BluePowerConductor.java +++ b/src/main/java/com/eloraam/redpower/core/BluePowerConductor.java @@ -86,7 +86,7 @@ public abstract class BluePowerConductor { } public double getVoltage() { - long lt = this.getParent().getWorldObj().getWorldTime(); + long lt = this.getParent().getWorldObj().getTotalWorldTime(); if ((lt & 65535L) == (long) this.lastTick) { return this.Vcap; } else { diff --git a/src/main/java/com/eloraam/redpower/core/EnvironLib.java b/src/main/java/com/eloraam/redpower/core/EnvironLib.java index d0962ec..563bfe4 100644 --- a/src/main/java/com/eloraam/redpower/core/EnvironLib.java +++ b/src/main/java/com/eloraam/redpower/core/EnvironLib.java @@ -10,7 +10,7 @@ public class EnvironLib { return 0.5; } else { double nv = FractalLib.noise1D( - 2576710L, (double) world.getWorldTime() * 1.0E-4, 0.6F, 5 + 2576710L, (double) world.getTotalWorldTime() * 1.0E-4, 0.6F, 5 ); nv = Math.max(0.0, 1.6 * (nv - 0.5) + 0.5); if (world.getWorldInfo().getTerrainType() != WorldType.FLAT) { diff --git a/src/main/java/com/eloraam/redpower/core/FluidBuffer.java b/src/main/java/com/eloraam/redpower/core/FluidBuffer.java index 3d80f87..5f6cb35 100644 --- a/src/main/java/com/eloraam/redpower/core/FluidBuffer.java +++ b/src/main/java/com/eloraam/redpower/core/FluidBuffer.java @@ -20,7 +20,7 @@ public abstract class FluidBuffer { } public int getLevel() { - long lt = this.getParent().getWorldObj().getWorldTime(); + long lt = this.getParent().getWorldObj().getTotalWorldTime(); if ((lt & 65535L) == (long) this.lastTick) { return this.Level; } else { diff --git a/src/main/java/com/eloraam/redpower/core/TileExtended.java b/src/main/java/com/eloraam/redpower/core/TileExtended.java index ef72009..d7132d8 100644 --- a/src/main/java/com/eloraam/redpower/core/TileExtended.java +++ b/src/main/java/com/eloraam/redpower/core/TileExtended.java @@ -64,7 +64,7 @@ public abstract class TileExtended extends TileEntity { } public void scheduleTick(int time) { - long tn = super.worldObj.getWorldTime() + (long) time; + long tn = super.worldObj.getTotalWorldTime() + (long) time; if (this.timeSched <= 0L || this.timeSched >= tn) { this.timeSched = tn; this.updateBlock(); @@ -72,7 +72,7 @@ public abstract class TileExtended extends TileEntity { } public boolean isTickRunnable() { - return this.timeSched >= 0L && this.timeSched <= super.worldObj.getWorldTime(); + return this.timeSched >= 0L && this.timeSched <= super.worldObj.getTotalWorldTime(); } public boolean isTickScheduled() { diff --git a/src/main/java/com/eloraam/redpower/machine/TilePipe.java b/src/main/java/com/eloraam/redpower/machine/TilePipe.java index 03f3d1e..9e841a0 100644 --- a/src/main/java/com/eloraam/redpower/machine/TilePipe.java +++ b/src/main/java/com/eloraam/redpower/machine/TilePipe.java @@ -136,7 +136,7 @@ public class TilePipe extends TileCovered implements IPipeConnectable { super.worldObj, this, new WorldCoord(this), this.ConCache ); this.markDirty(); - if ((super.worldObj.getWorldTime() & 16L) == 0L) { + if ((super.worldObj.getTotalWorldTime() & 16L) == 0L) { this.hasChanged = true; this.markForUpdate(); this.markDirty();