From 0d9d2040bc43f4e18d227b3c51a3edc4f9994747 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Mon, 11 Sep 2017 21:40:26 +0200
Subject: Implement tick counter?

---
 .../metatileentity/implementations/GT_MetaPipeEntity_Cable.java   | 5 +++--
 src/main/java/gregtech/common/GT_Proxy.java                       | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

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);
         }
     }
-- 
cgit