From 1032074b83f27904de1d0795026ac6a25459533e Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Mon, 16 Aug 2021 19:52:46 +0200 Subject: atempt to fix wierd burning cable bug --- src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java | 4 +++- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index ec5c984bc0..c52ebdf6e2 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -11,6 +11,7 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import ic2.api.energy.tile.IEnergySink; +import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -31,7 +32,8 @@ public class GenerateNodeMapPower extends GenerateNodeMap { @Override protected NodePath getNewPath(MetaPipeEntity[] aPipes) { - return new PowerNodePath(aPipes); + int startTime = MinecraftServer.getServer().getTickCounter(); + return new PowerNodePath(aPipes,startTime); } //used to apply voltage on death ends diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 1b80c5922d..3109dd10b3 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -13,12 +13,13 @@ public class PowerNodePath extends NodePath { int mLoss; int mVoltage = 0; int mMaxVoltage; - int mTick = 0; + int mTick; boolean mCountUp = true; - public PowerNodePath(MetaPipeEntity[] aCables) { + public PowerNodePath(MetaPipeEntity[] aCables,int startTime) { super(aCables); + mTick = startTime; } public int getLoss() { @@ -54,8 +55,9 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mAmperage*40 < this.mAmps) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - if (tBaseCable != null) + if (tBaseCable != null) { tBaseCable.setToFire(); + } } } } @@ -95,6 +97,7 @@ public class PowerNodePath extends NodePath { } private void reset(int aTimePassed) { + if (aTimePassed < 0) return; mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From 97b766d48c0e5b3c85faf1f761678276aea1e6a0 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Mon, 16 Aug 2021 20:40:54 +0200 Subject: a better way to stop wierd burning --- src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java | 3 +-- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index c52ebdf6e2..9b7e9deddb 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -32,8 +32,7 @@ public class GenerateNodeMapPower extends GenerateNodeMap { @Override protected NodePath getNewPath(MetaPipeEntity[] aPipes) { - int startTime = MinecraftServer.getServer().getTickCounter(); - return new PowerNodePath(aPipes,startTime); + return new PowerNodePath(aPipes); } //used to apply voltage on death ends diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 3109dd10b3..5cad66d7f4 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -13,13 +13,12 @@ public class PowerNodePath extends NodePath { int mLoss; int mVoltage = 0; int mMaxVoltage; - int mTick; + int mTick = 0; boolean mCountUp = true; - public PowerNodePath(MetaPipeEntity[] aCables,int startTime) { + public PowerNodePath(MetaPipeEntity[] aCables) { super(aCables); - mTick = startTime; } public int getLoss() { @@ -97,7 +96,9 @@ public class PowerNodePath extends NodePath { } private void reset(int aTimePassed) { - if (aTimePassed < 0) return; + if (aTimePassed < 0 || aTimePassed > 100) { + mAmps = 0; + } mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From 8ffa016d0e37c083c84cdd3b7aa03eb3d766476e Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Mon, 16 Aug 2021 21:24:51 +0200 Subject: remove import --- src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index 9b7e9deddb..ec5c984bc0 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -11,7 +11,6 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import ic2.api.energy.tile.IEnergySink; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -- cgit