From 20ddcf16e4b5dd425e44127a5a3fee63c0361cb3 Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Wed, 24 Nov 2021 18:29:49 +0100 Subject: added config values for BW machines Former-commit-id: e4f343233ad202d0c58bc05a50817b4f4311e72c --- .../bartimaeusnek/bartworks/common/configs/ConfigHandler.java | 7 +++++++ .../tileentities/classic/BW_TileEntity_HeatedWaterPump.java | 8 ++++++-- .../tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src/main/java') 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 b8e87bf046..f7e49b0fb3 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 @@ -26,6 +26,7 @@ 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; @@ -73,6 +74,9 @@ public class ConfigHandler { public static boolean disableBoltedBlocksCasing = false; public static boolean disableReboltedBlocksCasing = false; + public static int pollutionHeatedWaterPumpSecond = 5; + public static int basePollutionMBFTick = 5120; + private static final int[][] METAFORTIERS_ENERGY = { {100, 101, 102, 105}, {1110, 1115, 1120, 1127}, @@ -135,6 +139,9 @@ public class ConfigHandler { ConfigHandler.megaMachinesMax = ConfigHandler.c.get("Multiblocks", "Mega Machines Maximum Recipes per Operation", 256, "This changes the Maximum Recipes per Operation to the specified Valure").getInt(256); 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); + if (ConfigHandler.IDOffset == 0) { ConfigHandler.IDOffset = 12600; ConfigHandler.c.get("System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS").set(12600); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java index 0df48330d5..07dc78f6e1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java @@ -160,7 +160,7 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr Optional.ofNullable(this.worldObj).ifPresent(e -> { if (e.getTotalWorldTime() % 20 == 0) { Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord)).ifPresent(c -> - GT_Pollution.addPollution(c, 5) + GT_Pollution.addPollution(c, ConfigHandler.pollutionHeatedWaterPumpSecond) ); } } @@ -331,7 +331,11 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr public String[] getInfoData() { return new String[]{ StatCollector.translateToLocal("tooltip.tile.waterpump.0.name") + " " + - GT_Utility.formatNumbers(ConfigHandler.mbWaterperSec) + StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), + GT_Utility.formatNumbers(ConfigHandler.mbWaterperSec) + + String.format( + StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), + ConfigHandler.pollutionHeatedWaterPumpSecond + ), StatCollector.translateToLocal("tooltip.tile.waterpump.2.name")}; } 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 f2af0dd849..a0d10ba151 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 = super.getPollutionPerTick(null) * ConfigHandler.megaMachinesMax; + private int polPtick = ConfigHandler.basePollutionMBFTick*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 = super.getPollutionPerTick(null) * processed; + this.polPtick = ConfigHandler.basePollutionMBFTick * processed; this.mOutputItems = new ItemStack[outputItems.size()]; this.mOutputItems = outputItems.toArray(this.mOutputItems); this.mOutputFluids = new FluidStack[outputFluids.size()]; -- cgit