aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-11 21:40:26 +0200
committerTechnus <daniel112092@gmail.com>2017-09-11 21:40:26 +0200
commit0d9d2040bc43f4e18d227b3c51a3edc4f9994747 (patch)
tree4f25941382d31b74da3e5d3128ffca599419f524 /src/main/java
parent69683365d7faa798c5d782c8e3779b5d323c6ff6 (diff)
downloadGT5-Unofficial-0d9d2040bc43f4e18d227b3c51a3edc4f9994747.tar.gz
GT5-Unofficial-0d9d2040bc43f4e18d227b3c51a3edc4f9994747.tar.bz2
GT5-Unofficial-0d9d2040bc43f4e18d227b3c51a3edc4f9994747.zip
Implement tick counter?
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java5
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 34e2303937..b7d6b0a0fa 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.common.GT_Proxy.serverSideDimensionWiseTickCounter;
public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTileEntityCable {
public final float mThickNess;
@@ -250,8 +251,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
mTransferredAmperageOK=mTransferredAmperage;
mTransferredAmperage = 0;
- tickDiff=Math.min((int)(aBaseMetaTileEntity.getWorld().getTotalWorldTime()-lastTickTime),1);
- lastTickTime=aBaseMetaTileEntity.getWorld().getTotalWorldTime();
+ tickDiff=Math.min((int)(serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId)-lastTickTime),1);
+ lastTickTime=serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId);
if(lastTickDiff<tickDiff)
mOverheat=(short)Math.max(0,mOverheat-100);
lastTickDiff=tickDiff;
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index f6d4ca65a7..d8d5060370 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -74,6 +74,7 @@ import java.text.DateFormat;
import java.util.*;
public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
+ public static HashMap<Integer,Long> serverSideDimensionWiseTickCounter =new HashMap<>();
private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL,
new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD,
OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS,
@@ -1248,6 +1249,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
}
}
+ int dimID=aEvent.world.provider.dimensionId;
+ if(serverSideDimensionWiseTickCounter.containsKey(dimID)){
+ serverSideDimensionWiseTickCounter.put(dimID, serverSideDimensionWiseTickCounter.get(dimID)+1);
+ }else{
+ serverSideDimensionWiseTickCounter.put(dimID,0L);
+ }
+
GT_Pollution.onWorldTick(aEvent);
}
}