From 8317fd64af5f3b92ea8f9b0947bde51fc4832069 Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Tue, 31 Jan 2023 23:02:18 +0100 Subject: [PATCH] Immersive Heavy Water Configurable module to make Mekanism accurately mimic IRL Heavy Water production. Enabling `accurateHeavyWaterCapture` will: -Allow Electrolytic Separator to extract Heavy Water from Water when a Filter Upgrade is provided. -Disable Electric Pumps from pumping Heavy Water and accepting the Filter Upgrade. TO-DO: GUI shenanigans. . . --- .../java/mekanism/api/MekanismConfig.java | 3 + .../client/gui/GuiElectrolyticSeparator.java | 17 +++-- .../java/mekanism/common/CommonProxy.java | 5 +- .../common/network/PacketConfigSync.java | 4 ++ .../common/tile/TileEntityElectricPump.java | 9 ++- .../tile/TileEntityElectrolyticSeparator.java | 64 +++++++++++++++---- 6 files changed, 77 insertions(+), 25 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 94c444e3e..e2d8499b8 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -68,6 +68,9 @@ public class MekanismConfig public static double heatPerFuelTick = 4; public static boolean allowTransmitterAlloyUpgrade; public static boolean allowProtection = true; + public static boolean accurateHeavyWaterCapture = true; + public static int heavyWaterChance = 5; + public static boolean EnableQuartzCompat; public static boolean EnableDiamondCompat; public static boolean EnablePoorOresCompat; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 0728c8b1d..19bf0518b 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -68,14 +68,14 @@ public class GuiElectrolyticSeparator extends GuiMekanism return tileEntity.fluidTank; } }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); - - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.extraTank; - } - }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 51)); + if (tileEntity.hasFilter()) + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { + @Override + public FluidTank getTank() + { + return tileEntity.extraTank; + } + }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 51)); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @Override public GasTank getTank() @@ -96,7 +96,6 @@ public class GuiElectrolyticSeparator extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); - if (tileEntity.hasFilter()) guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiProgress(new IProgressInfoHandler() diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 393361e06..f6df9aa75 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -300,7 +300,10 @@ public class CommonProxy implements IGuiProvider general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble(); general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean(); general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean(); - + general.accurateHeavyWaterCapture = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWater", false).getBoolean(); + general.heavyWaterChance = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWaterGen", 5).getInt(); + + general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 919a8961c..acc85df0f 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -74,6 +74,8 @@ public class PacketConfigSync implements IMessageHandler