From 4b6d9e172de8642a9db5893f369c8f884413c86b Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Thu, 25 Nov 2021 02:22:38 +0100 Subject: harmonize config values to gibbl/sec Former-commit-id: c92597f3159693c6bf839d15d7ecd66de9615158 --- .../bartimaeusnek/bartworks/common/configs/ConfigHandler.java | 6 ++---- .../tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 22d219bd9a..64095f5cc4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -25,8 +25,6 @@ package com.github.bartimaeusnek.bartworks.common.configs; import com.github.bartimaeusnek.ASM.BWCoreTransformer; import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; -import com.github.bartimaeusnek.bartworks.API.SideReference; -import jdk.nashorn.internal.runtime.regexp.joni.Config; import net.minecraftforge.common.config.Configuration; import java.util.Arrays; @@ -75,7 +73,7 @@ public class ConfigHandler { public static boolean disableReboltedBlocksCasing = false; public static int pollutionHeatedWaterPumpSecond = 5; - public static int basePollutionMBFTick = 20; + public static int basePollutionMBFSecond = 400; private static final int[][] METAFORTIERS_ENERGY = { {100, 101, 102, 105}, @@ -140,7 +138,7 @@ public class ConfigHandler { ConfigHandler.bioVatMaxParallelBonus = ConfigHandler.c.get("Multiblocks","BioVat Maximum Bonus on Recipes", 1000,"This are the maximum parallel Operations the BioVat can do, when the output is half full.").getInt(1000); ConfigHandler.pollutionHeatedWaterPumpSecond = ConfigHandler.c.get("Pollution", "Pollution produced per second by the water pump", ConfigHandler.pollutionHeatedWaterPumpSecond, "How much should the Simple Stirling Water Pump produce pollution per second").getInt(ConfigHandler.pollutionHeatedWaterPumpSecond); - ConfigHandler.basePollutionMBFTick = ConfigHandler.c.get("Pollution", "Pollution produced per tick by the MBF per ingot", ConfigHandler.basePollutionMBFTick,"How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel").getInt(ConfigHandler.basePollutionMBFTick); + ConfigHandler.basePollutionMBFSecond = ConfigHandler.c.get("Pollution", "Pollution produced per tick by the MBF per ingot", ConfigHandler.basePollutionMBFSecond,"How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel").getInt(ConfigHandler.basePollutionMBFSecond); if (ConfigHandler.IDOffset == 0) { ConfigHandler.IDOffset = 12600; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java index a0d10ba151..6737431662 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java @@ -121,7 +121,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_MetaTileEntity_ElectricBl private int mHeatingCapacity; private byte glasTier; - private int polPtick = ConfigHandler.basePollutionMBFTick*ConfigHandler.megaMachinesMax; + private int polPtick = ConfigHandler.basePollutionMBFSecond / 20 * ConfigHandler.megaMachinesMax; public GT_TileEntity_MegaBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -426,7 +426,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_MetaTileEntity_ElectricBl this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.polPtick = ConfigHandler.basePollutionMBFTick * processed; + this.polPtick = ConfigHandler.basePollutionMBFSecond / 20 * processed; this.mOutputItems = new ItemStack[outputItems.size()]; this.mOutputItems = outputItems.toArray(this.mOutputItems); this.mOutputFluids = new FluidStack[outputFluids.size()]; -- cgit