From 01c243ee9f58c3f64fc883f931ad9a81813f894f Mon Sep 17 00:00:00 2001 From: Sphyix Date: Thu, 16 Sep 2021 22:49:29 +0200 Subject: fix int overflow on amps calculation --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index df6f2671e4..0baa642406 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -98,6 +98,7 @@ public class PowerNodePath extends NodePath { private void reset(int aTimePassed) { if (aTimePassed < 0 || aTimePassed > 100) { mAmps = 0; + return; } mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From 8b9f24202072698748cad0b5f6d0b6c9f9ce2a42 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 21 Nov 2021 12:59:24 +0100 Subject: Revert "fix int overflow on amps calculation" This reverts commit 01c243ee9f58c3f64fc883f931ad9a81813f894f. --- src/main/java/gregtech/api/graphs/paths/PowerNodePath.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 0baa642406..df6f2671e4 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -98,7 +98,6 @@ public class PowerNodePath extends NodePath { private void reset(int aTimePassed) { if (aTimePassed < 0 || aTimePassed > 100) { mAmps = 0; - return; } mAmps = Math.max(0, mAmps - (mMaxAmps * aTimePassed)); } -- cgit From afb42fefa781ae26a1165c7b753455beb7583a0f Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 21 Nov 2021 13:34:01 +0100 Subject: added infinity armor to hazmats --- src/main/java/gregtech/common/GT_Proxy.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index a1706ee6e9..40716a2fa6 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -632,6 +632,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_leggings, 1, W)); GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_boots, 1, W)); + //Infinity Hazmat + addFullHazmatToGeneralItem("Avaritia", "Infinity_Helm", 1L); + addFullHazmatToGeneralItem("Avaritia", "Infinity_Chest", 1L); + addFullHazmatToGeneralItem("Avaritia", "Infinity_Pants", 1L); + addFullHazmatToGeneralItem("Avaritia", "Infinity_Shoes", 1L); + GregTech_API.sLoadStarted = true; for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { -- cgit