From fbab674b9f065676b3a4d0eaa0805f43a3252371 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Tue, 22 Nov 2022 19:34:52 +0100 Subject: [PATCH 01/17] remove unused entry --- src/main/java/mekanism/api/MekanismConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index fca3fee6d..d0d06c884 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -167,7 +167,6 @@ public class MekanismConfig public static class tools { public static double armorSpawnRate; - public static boolean enableTools = true; } public static class recipes From 3379d4aadbdfd8103242b40c2e6ad7fd2fc275b5 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Tue, 22 Nov 2022 19:46:58 +0100 Subject: [PATCH 02/17] add config option for radius --- src/main/java/mekanism/api/MekanismConfig.java | 1 + src/main/java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/network/PacketConfigSync.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index d0d06c884..a3e37e9a4 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -74,6 +74,7 @@ public class MekanismConfig public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; + public static int digitalMinerMaxRadius; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 72caa6acf..c1951c576 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -310,6 +310,7 @@ public class CommonProxy implements IGuiProvider general.OreDictOsmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictOsmium", true).getBoolean(); general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); + general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 32", 1, 32).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 67dc22364..b85282141 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -80,6 +80,7 @@ public class PacketConfigSync implements IMessageHandler Date: Mon, 19 Dec 2022 00:52:24 +0100 Subject: [PATCH 03/17] Update README.md --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index f6828f9fb..e93919320 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,18 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO ## Modifications by +| Some Differences | MK | MK:[CE](https://www.curseforge.com/minecraft/mc-mods/mekanism-ce) | MK:[kmecpp](https://www.curseforge.com/minecraft/mc-mods/mekanism-patched) | +| --------------------------------------------------------------------------------------------------- | ------------------ | ----------------------------------------------------------------- | -------------------------------------------------------------------------- | +| Open Source | :heavy_check_mark: | :heavy_check_mark: | :x: | +| Dupe: Chemical Washer | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Fluidtank | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: [Fluidstack](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/49) | :x: | :heavy_check_mark: | :x: | +| Dupe: Factories | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Bins | :x: | :heavy_check_mark: | :heavy_check_mark: | +| BUG: [Osmium Compressor](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/32) | :x: | :heavy_check_mark: | :x: | +| BUG: [Storage Meter](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/40) | :x: | :heavy_check_mark: | :x: | +| NEW FEATURES | :x: | :heavy_check_mark: | :x: | + #### Clienthax : + dupe bug with chemical washer and fluidtank, fixes issue with railcraft From e428ad12d329a079e64c1f4995da7a88b45ae020 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:14:29 +0100 Subject: [PATCH 04/17] bump version to 9.10.20 --- build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index b363b7f04..9af26292e 100644 --- a/build.properties +++ b/build.properties @@ -4,5 +4,5 @@ FMP_version=1.2.0.347 CCLIB_version=1.1.3.141 NEI_version=1.0.5.120 CCC_version=1.0.7.48 -mod_version=9.10.19 -alt_version=9, 10, 19 +mod_version=9.10.20 +alt_version=9, 10, 20 From 958842e3ce432614304f71b7c286c0aee41761b3 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:27:57 +0100 Subject: [PATCH 05/17] Update README.md --- README.md | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e93919320..be67bcd1a 100644 --- a/README.md +++ b/README.md @@ -29,19 +29,26 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + [ForgeMultipart](https://files.thorfusion.com/mekanism/ForgeMultipart-1.7.10-1.2.0.347-universal.jar) + [CodeChickenLib](https://files.thorfusion.com/mekanism/CodeChickenLib-1.7.10-1.1.3.141-universal.jar) -## Modifications by +## Changes -| Some Differences | MK | MK:[CE](https://www.curseforge.com/minecraft/mc-mods/mekanism-ce) | MK:[kmecpp](https://www.curseforge.com/minecraft/mc-mods/mekanism-patched) | -| --------------------------------------------------------------------------------------------------- | ------------------ | ----------------------------------------------------------------- | -------------------------------------------------------------------------- | -| Open Source | :heavy_check_mark: | :heavy_check_mark: | :x: | -| Dupe: Chemical Washer | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Dupe: Fluidtank | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Dupe: [Fluidstack](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/49) | :x: | :heavy_check_mark: | :x: | -| Dupe: Factories | :x: | :heavy_check_mark: | :heavy_check_mark: | -| Dupe: Bins | :x: | :heavy_check_mark: | :heavy_check_mark: | -| BUG: [Osmium Compressor](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/32) | :x: | :heavy_check_mark: | :x: | -| BUG: [Storage Meter](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/40) | :x: | :heavy_check_mark: | :x: | -| NEW FEATURES | :x: | :heavy_check_mark: | :x: | +### Featured changes + +| Some Differences | MK | MK:[CE](https://www.curseforge.com/minecraft/mc-mods/mekanism-ce) | MK:[kmecpp](https://www.curseforge.com/minecraft/mc-mods/mekanism-patched) | +| --------------------------------------------------------------------------------------------------------- | ------------------ | ----------------------------------------------------------------- | -------------------------------------------------------------------------- | +| Open Source | :heavy_check_mark: | :heavy_check_mark: | :x: | +| Dupe: Chemical Washer | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Fluidtank | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: [Fluidstack](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/49) | :x: | :heavy_check_mark: | :x: | +| Dupe: Factories | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Bins | :x: | :heavy_check_mark: | :heavy_check_mark: | +| BUG: [Osmium Compressor](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/32) | :x: | :heavy_check_mark: | :x: | +| BUG: [Storage Meter](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/40) | :x: | :heavy_check_mark: | :x: | +| BUG: [Looping crash MK+RR+BC](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/33) | :x: | :heavy_check_mark: | :x: | +| FEATURE: [TerralizationCompat](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/30) | :x: | :heavy_check_mark: | :x: | +| FEATURE: [Biofuel cycle rework](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/pull/48) | :x: | :heavy_check_mark: | :x: | +| NEW FEATURES, BUGFIXES & MORE! | :x: | :heavy_check_mark: | :x: | + +### Full changelog #### Clienthax : + dupe bug with chemical washer and fluidtank, fixes issue with railcraft @@ -87,6 +94,7 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + removed the native cape module, the auto updater module and voiceserver Thorfusion#51 + fixed config for HeatGenerationFluidRate + disabled prefilled tanks by default ++ fixed looping crash with MK+RR+BC Thorfusion#33 #### [Pokemonplatin](https://github.com/Pokemonplatin) - Mekanism CE Team + Teleporter and Quantum Entangloporter now have a trusted channel for smp Thorfusion#22 @@ -104,6 +112,7 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + [Large feature] Reworked the bio-fuel cycle Thorfusion#48 + added lazuli ingots and lead infusion Thorfusion#50 + fixed energy storage meter increasing when generating no energy in industrial turbine Thorfusion#40 ++ Fix plastic properties Thorfusion#60 ## All contributors get capes From 4e6fe6f23f97fa1fe02b56760c7636eb20421376 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:52:29 +0100 Subject: [PATCH 06/17] Update Mekanism.txt --- Mekanism.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mekanism.txt b/Mekanism.txt index 0f7567b8c..281604ac0 100644 --- a/Mekanism.txt +++ b/Mekanism.txt @@ -1 +1 @@ -1.7.10:9.10.19:(13/09/22) Fixes fluidstack duplication and more \ No newline at end of file +1.7.10:9.10.20:(13/09/22) Fixes looping crash & more From 98da3a86d58e32ddee78611feea4adacdc447e50 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 22 Dec 2022 16:39:36 +0100 Subject: [PATCH 07/17] set default energy to rf --- src/main/java/mekanism/common/CommonProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 72caa6acf..f72018faa 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -312,7 +312,7 @@ public class CommonProxy implements IGuiProvider general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); - String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); + String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); if(s != null) { From 483ac0716a2b83d02ec13837f2e81a3d4dd9b309 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 22 Dec 2022 16:44:48 +0100 Subject: [PATCH 08/17] add configurable ic2 tier for mekanism --- src/main/java/mekanism/api/MekanismConfig.java | 2 ++ src/main/java/mekanism/common/CommonProxy.java | 2 ++ .../java/mekanism/common/network/PacketConfigSync.java | 7 +++++-- .../java/mekanism/common/tile/TileEntityElectricBlock.java | 5 +++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index fca3fee6d..7e75c7be9 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -74,6 +74,8 @@ public class MekanismConfig public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; + public static int IC2SinkTier; + public static int IC2SourceTier; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f72018faa..cbf614cec 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -311,6 +311,8 @@ public class CommonProxy implements IGuiProvider general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 2).getInt(); + general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 2).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 67dc22364..74dfe477b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -204,7 +204,8 @@ public class PacketConfigSync implements IMessageHandler Date: Sun, 30 Oct 2022 12:45:21 +0100 Subject: [PATCH 09/17] fix: universal cable connection to IC2 --- .../common/base/EnergyAcceptorWrapper.java | 5 ++-- .../common/multipart/PartUniversalCable.java | 6 ++--- .../java/mekanism/common/util/CableUtils.java | 25 ++++++++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 5ead4daa5..9fd36df50 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -4,6 +4,7 @@ import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -30,9 +31,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { wrapper = new RFAcceptor((IEnergyReceiver)tileEntity); } - else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) + else if(MekanismUtils.useIC2() && CableUtils.getIC2Tile(tileEntity) instanceof IEnergySink) { - wrapper = new IC2Acceptor((IEnergySink)tileEntity); + wrapper = new IC2Acceptor((IEnergySink)CableUtils.getIC2Tile(tileEntity)); } if(wrapper != null) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 70970d683..78846c352 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -105,9 +105,9 @@ public class PartUniversalCable extends PartTransmitter 0) @@ -115,7 +115,7 @@ public class PartUniversalCable extends PartTransmitter Date: Fri, 23 Dec 2022 00:04:39 +0100 Subject: [PATCH 10/17] bump version --- build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 9af26292e..eee3544ef 100644 --- a/build.properties +++ b/build.properties @@ -4,5 +4,5 @@ FMP_version=1.2.0.347 CCLIB_version=1.1.3.141 NEI_version=1.0.5.120 CCC_version=1.0.7.48 -mod_version=9.10.20 -alt_version=9, 10, 20 +mod_version=9.10.21 +alt_version=9, 10, 21 From ae1e7cfeacbf0cd92eb08280a4ea3d1590e7bb46 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 00:46:48 +0100 Subject: [PATCH 11/17] add configurable radius for digital miner #55 max configurable range is 64 --- .../java/mekanism/client/gui/GuiDigitalMinerConfig.java | 3 ++- src/main/java/mekanism/common/CommonProxy.java | 2 +- .../java/mekanism/common/tile/TileEntityDigitalMiner.java | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 1d35a4df8..1588686da 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -683,7 +684,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { if(!radiusField.getText().isEmpty()) { - int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), 32)); + int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), MekanismConfig.general.digitalMinerMaxRadius)); ArrayList data = new ArrayList(); data.add(6); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index c1951c576..8a9f0a46f 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -310,7 +310,7 @@ public class CommonProxy implements IGuiProvider general.OreDictOsmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictOsmium", true).getBoolean(); general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); - general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 32", 1, 32).getInt(); + general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 25c7e744f..3fbf86771 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -14,6 +14,7 @@ import java.util.Set; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.common.HashList; @@ -647,7 +648,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { super.readFromNBT(nbtTags); - radius = nbtTags.getInteger("radius"); + radius = Math.min(nbtTags.getInteger("radius"), MekanismConfig.general.digitalMinerMaxRadius); minY = nbtTags.getInteger("minY"); maxY = nbtTags.getInteger("maxY"); doEject = nbtTags.getBoolean("doEject"); @@ -742,7 +743,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } else if(type == 6) { - radius = dataStream.readInt(); + radius = Math.min(dataStream.readInt(), MekanismConfig.general.digitalMinerMaxRadius); } else if(type == 7) { @@ -1409,7 +1410,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public void setConfigurationData(NBTTagCompound nbtTags) { - radius = nbtTags.getInteger("radius"); + radius = Math.min(nbtTags.getInteger("radius"), MekanismConfig.general.digitalMinerMaxRadius); minY = nbtTags.getInteger("minY"); maxY = nbtTags.getInteger("maxY"); doEject = nbtTags.getBoolean("doEject"); From 40b970e58c86667efbbf66fdb6d3b4af2b481c7b Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 01:43:04 +0100 Subject: [PATCH 12/17] better readability on dump button on metalurgic infuser --- .../client/gui/GuiMetallurgicInfuser.java | 2 +- .../mekanism/gui/GuiMetallurgicInfuser.png | Bin 17162 -> 4465 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 072c76765..b56e47d5e 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -121,7 +121,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) + if(xAxis > 144 && xAxis < 168 && yAxis > 72 && yAxis < 83) { ArrayList data = new ArrayList(); data.add(0); diff --git a/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png index a8d74869197a8c6afc0f8d89ba811c2e33d661b5..df67eabc98b7e65acbd386abb6f481a91d1b539b 100644 GIT binary patch delta 1423 zcmeBbWBjNzK{A?|fq@}=O+*NgVo7)Ob!1?;@%pQb$SNRTA=x9ymw}<3pMjx=mx1Bu zWCn(orwk0$O$-dLOBopKw=gg$MU-a8&0%0*{*dYH9N_8ftPoI?pO%@E%D~`pd}Gi< z=6dhlJNkiU83g!*xB}__|NkF5b}TeBR7*=sQ&Y2|qQcP7(7?bTBqT&hNy*;ce%`!! z=H}+z-Q7UNt&OMLfRsQ*>Tocw`RbFwO%&g57&)5-JL^d{e6v!ATY zu01)5T?eG3i`^AOU1oOxQQ{n6Dw@Lu#9Pdv2BOY#7=b8ePB#$c%c(5N%cTGXHbp6E zR!)iOc0idPPOzmtoKlnDbLxsADbhz$WzMAnGA5oY97OGcP@>%FAYKEvD7x9fsf8f3 zH*#x(6g=iO08vsru^_6B#|}gt<_UI2Sf-$01GX+F6Q~dFOt28dEQpwmenoD9udkIy zW^qY=Q6y8bCQCf%m{{1#2Lqf}df5t@rUlPKE=jK=s|SKrx0h?&}!j-!y#F zk!5FKh-CO<@Px1afT}?~*Cu9$44_d!B@O4SbwElRexCTFbAXSb!5hfAwYfy*JtIQ_ z=ZigunLx5L`g8aL?Ag}-uRRd`TVAV5pFd#&1H%D^2cI3k8uB+hzU%kZP`Kgq&l(%O z_|Mya?frL?%VGWAeP5og{&!7e!C#|$jBkZD)bOvUzF#l;AkU6rIs4V)It>4`1RuQK z*8S|3{rVKpN%v+$svw;_zHn48~?~ zxHossim53Lh9Fmz+)Mn+@Z#Rd0w1ey9IgBRaT&z39lqjcwW+?vxlfc~);7iknbHG6nd7&2wxxsSeV+HSe`}T3 Qs)9ns)78&qol`;+0IW;XWB>pF literal 17162 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 From 97ded7ab2771fe6923ce7fde8ae3fa591b0f5715 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 01:49:29 +0100 Subject: [PATCH 13/17] add dump button for factories #39 --- .../java/mekanism/client/gui/GuiFactory.java | 17 ++++++----------- .../gui/factory/GuiAdvancedFactory.png | Bin 19060 -> 6622 bytes .../mekanism/gui/factory/GuiBasicFactory.png | Bin 18963 -> 6634 bytes .../mekanism/gui/factory/GuiEliteFactory.png | Bin 19009 -> 6607 bytes 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index a8f7967c0..d9766e355 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -165,18 +165,13 @@ public class GuiFactory extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 8 && xAxis < 168 && yAxis > 78 && yAxis < 83) + if(xAxis > 144 && xAxis < 168 && yAxis > 83 && yAxis < 93) { - ItemStack stack = mc.thePlayer.inventory.getItemStack(); - - if(stack != null && stack.getItem() instanceof ItemGaugeDropper) - { - ArrayList data = new ArrayList(); - data.add(1); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png index 43deb51df3c6dffabccb2e6f2bc54fde2f3cdaab..926ac0fc3a6657320ee2eb8d132b7a23782809d4 100644 GIT binary patch delta 3093 zcmcJPc~sL^7RO%*Ta-lvji5k`R!0<2wuAsC5C|ZPF$uCM0b~nMLIY)oUlf-r7KBLM zC|0bUI*x#1)rv~2wT@bsR*I-VV3e}OBw~PUg!%n`RPC8_#=ko6oSg6H-TQv``|dsO zM0pU?=YGI89t!}-`ezIW7Q=M^2!8;&$0nB8`~%(-wuP`F0N7&*z>Rzd>+SOt$xXNJ=01g3zW#>-9xAmsKr)&Ld?Yrk9rfWZxBI420M z8K@{s)9!83Uro|g&&gn;uKd^wPB)c|HR1yli#Fh zYPZUF?^Avygp`M)ReLtewjbACs#l+3DxoOljvCcjk-CK^uZw!KqiCYOR4v-BYVe8l z2+s7&r_m}I48Ku9vTD~seM^+8vZ|^o=@hG(!zt9&2=x0S-aujU;!sURsCGL|S;!nO ztI#!t>v#B16~)KLlSrg6Wl@QyiLX7voT?})f{JJ~n!hx6o4Pt(BVtSzkOwpJUVmQv zx-RrhFO@^xyuQHwRl3U{*IS)S(dI8xa90k;LCM;E ze$#o&$GMIptSzd&Y?aXMO^SVA#DxV zPaex~8%=b0vBBz|xAX8;*U^MU{XtgkWUn3;=^4weD|mhAgUQa_QPvOFyY;i&Mk2jlMw#7!C{BZs0gBAU zFE*@@usvR}-4v0Fo`jg+r8tbT9Hde6o(Gyg^6{0W5f#x^1B}>!PX(;6yvVWsfu;4l zC+wJ34u?Y|5~);bV`HO}lN0=e4<26E3(HtOE0PUA;SVq9!|DHfHsh~z0InmSAA}pn z<%Y!O0WjAZ`C-7(hD9)FMKgvQG3KI3qZ|YCIil-EbVLk|mx|UIuM(vhuMssGdx|8+ zE+ShKswl-|wdk118sx}5lORNFOlgS3%u0i4AhLUDx&jdkoEsv6I0hosxMd5>=Mer_ zzJioANz~}a&6dN(>&&AOi}+c&Xr7MjmRcu%h&WoV zMZv^LhLn)O0q=3S_`L*oXpKeVm$~gzTtA zxk=lyQu7I^IVpZb0g<}?^yNqJV=?+XG|-<@l<=x&SK*Qr3(`_kPpp+_%_+`*Y0PVIWy+8(m^n=$^Gk4B_oLhlXTvkh)O937S#-bK;Acmwrlb+j@nm)cntXZ6W*{T4~bD{;GIx&&1 zH2>+u)gS4#H> zKO$|A$E0}=;5bbDPBlKUuokS%$oNirq;0p^ncddTK5XO5il!=8xMvJOb{8B<@X`p- zk*{vPI+}@6R`WGk34Dz=fOHvBw6YZLslvtlE9!-4HlE);ZGn=H{EF5ArBZqO3;Nm8P4#PC!~aXRlbDH&}p$K7{$(=gmyoU``t%RHqLx!y#qtOACn7K-TaUO#nDkNDOL zvRWBe@XZ3CDo*M98lK{cer8`vL&j5EgLy(=NC21~EK02w{jQQd)7mfR2&<)ay;#U3 zrRI5dFQ#}i*Pz%|Xr1fW3U#negx78vh*hD#jXoScM*iL|@`5xxfeb#f5`r7xJal|X z-j^pZih9zs^UgRLFi7N|gG_<&fm9x|4!?-dsBdKG8_b2x3CI5Z&=xZ+lgUQ!Rz9|G0oT$@67PD94}}9=GzOzT-L*H?aHwj15mkfE_y>k@>KJioCfb2KCa^ze!?{NJzJ zFMW5iJATc(5;S41{AGwe&P+J9b)UiYOO>&mowbj^<;UX&eLt7`1k9F($JTl&2ASR; zW&?e9YAN#<(Snf}oMK}XeOa5tQ-$lGs-u+oc0ls+xIqPd?0;U?bSkI0vsMf!a0A)c z3wuC_^-S?^Hh>VJ_}+7Q#k7O?npr1@8+RTYXGI%|Jr-lu-e-XDHY@Nr`-9u^52yd4 e?8#Fj9alArMt^X+XaN67gV3PJz~+F&9sdC~HI={s literal 19060 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 O09NKUW~nBgyZ#HS7bOS) diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png index b876b292eec581ce76525937e4b0caf272290fb7..1a64c4562c374842eb378ce12291efddfe3ef13e 100644 GIT binary patch delta 3137 zcmcIlc~nzZ8h=R>*#!hqR4@j`qDW*Z2@pacB1&v0ds|r6? z^(3oLeW=V5z>;g%Bziw7npJ|TwYqMXcH{9bEX@@=SuVE8w(c&C5kg1 zp)P(0Jh@bA8H3>|$w^RrbVA)8t|+Ujs@nGj>k^yIQ`P3Et3&3%py|T_OT_`o5~`fX zoGmI=wFaw8y%+LhVq%CyVvsz)V5v1r*~DBZ&d&$)sZ^@>o9x8Jnv^90<82;EoSHjx z{P0Xez}#VyG@T3a*}91Na+fCwInzfEOqbE5IWEr<%9qX`S!|@w6a}+1DHMQ~6 zl^(LRc=?fprJ^iF^#`-5OhsOS`V3=%n>t^!S5*|F&U2nhaS+G5EoQqbxi+%+t*@iO z1m!W$<=oA)@f#;tdlVmsDfmuv`>mdZ1kUq<-WF_~j<$Xn!kWkoAJ4KAM_Z3EKOE;U zUvZqr;Zf@STZ5#B2Pn>cbg=>Je3AWR%T z0X43d?Y}!001V9F9||~qW-UaN9Cj2pDkRuFF)PDi-~OzGB!~QrYyc1pVMr(=fetnk zZKN;YVQDbjz-|&quy%rtE9?c4D?SjMTH#=b%g;#9%yrM@((|~2cpVFYe1(<3N@u%( ztz!?LDc7OHFsMU?!BiK4a9v;6`b^grhC8}WFf8jbVDQtkS#6|`d$-6r`;*;$_N7pu z$dKMTL5rRpoHV58r-k(bqCTPn2g~$#z+R31dcl4D_q7zcI2=qcK!PxB*HVJv27%gO zJDf)_^t1S#DB*Xi^@f|_jBAFGFqj)5kY$u&|7$)O8dyk(yFVwFo0W4Iy6C^%JuK-U ze0PJDh>qvVop2TI%2*giR#ITFG7h8t>l6-0Muzb}Qjw6(P5$%Oxu74#S*laLw{ z;i`5f2<$gOhI`t?0d@|UxWcf)6ag<&3lJ983bK3|kRnvq9jcs>#N7v5UisPk64R2n zxTMVep7|5$t~yK}9%b{Si_d53dA#O(#WtX4t@vOosYY&cXU64+P~r^($5xU= zSmwMlwZbyRhi8fpQBJ4QX9hY3+}C$i)#;{k&UHASK2qa04h63R*SpYX_}9jpcogm$ z@6Y&)Yof9@A?%|yySa`CyQM?8vbn3OCA5zfMChU*Uf1NgZe0O}+qm`_9KB+ngt684zZ95_ zUeVTjv*NWwsXJYMqvD-NUHn+drdqthusH(9y9FVLWDPnHbr3uF|R)(^bW^;KNqEpVbjV$TF#$ z>b-`p@sujegt6tVd@dxE{TvL~dbU)GH_s}mzO7H1@BCqi$}@eaN1D6XG31S~h3j(! z$cNkeoy@7fX}hIst0B~N+xG_F$XcriP!6u;@k{KUg2&=W=uQ&M9=F-Ab|Diu-`?{o zn!Dy)Gk&8 zo?(mBLa|)yrGbJHz3jGw!mWoQ#n{g1{wMCeSnU2?NQ7Zes27Bm6{R^j!AMpO*_^|Q zH1`81QlIEznZUcad5Q=WP!%hNV@0(&@iD8j3f8x-(D|7%SLUth=`pf;2)LXT>7=ds9@zia=D|Oe{b!QT|8oYc`!UVJ U<`U~`=<5#z&_jJM`RpzI1*RO2L;wH) literal 18963 zcmeI4c|4SB|Hp5%oK)1KQlci>oiY2G8M~+~2U#MSC&VoR-t7k|;~mDQQ

_j>-EdA)FdukZE!T;J<`t^T-Yr=$Jy$?7`l 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 TTy4PCs$1?})Y*(u) z&sPQjK$UJ~ZVv!*(4!nMZ7TH7Rd|sN{hQ)xVq*dTPulwy%)SHw3jcD<%biH72* z##@fP-*rilmhNz4)4l5v>A{p%Us~5gg7JOF*v4r3yv=nzn+ORJ;R(@Et2QkDsmw(8 zo$-b9fwp*v$!vOkS0yhN!dr z`1aR&liF^BmsPZP?$lMcUJwSN2U?2ON@`RMJew41KUG0%L~zOkk&05gXXlKTl!|Tp#IUl;{Aa$gI_&u zn^NZNbe`?jJh(?M%zcJv=40g5bxpJb<^`wk8NaE%aPK;j($KhA=z`sZ3!7~^c$7Ky z>i*n_UY=R%f8sP_PZo=enrPW8&XiTAU5Ww=w9I$>61Eh7dh_k+Z>UZga@dPU_D#R3 zCHUPzLBTrGuF^j8mjf3VGr&&&=8)Ul?nJAmRL2l3Ib|xyi!B6Sd?HO6o3f=#v>wnJB>&Z0L&kwxX-uAP#L2_a8v*f-?KD64dGHRIi%LC!cEik<(J zHHK~agfrw`r1o95-8aDb*L3Mu;SUHOT zKt)~hCkMpF{Q?y#iRm^LO7#l!rmE^M@8_gLMOtDDC$S~8ksxdtTo738!?Ez@h(SvR zQ_L6o>kD|E8_)aR2Y^*iIP09mPBzw5CZDU%VDUXbeLt=MQUCx0BR>Iy=>>`r9-t?O zXQ&+8U z{S38-b*a#^q!^`*7_K7rGSoJaG>CAru|t^gg&=~UPe3x!SPX(h(Z>+*6bxo10*l7r zP#81{OF?2VR6L1_AtFXU+B9Y8$w0_rQ|-+yN1KBzL+veMv4Dy~`TF|m`{MNZLQfQi zLZP70SQHkEglZr~{yZ_m56KfP84>xSV-AX#LXJSp;qwp@U4{qWM{KCAEotcMXLMX# z!Pka(qEU7bMU)>yfWqjbQIiF+m|tTAK0@!|uCbUX&>Q4}Jh2Fh!%P|{_;N^m4WH2D zSNC@thUUb^X7b=K{pE5eZCWI@*bX5WMLMC`FOi~k{sItX4~qCcLMCXj9U97#$wn{c zu*W86f|A7Z-M)iB`! zVDam)I4TB5#S_PCjH?OPfKrFW5Ho&AWqjRnIxHrY%@=YRVj73b@B~rNHei4nD;!tz z>w==1@xA#%s9PWnXMmclc+x27Dl>YMp{)jappe5v*snJIa=RHXG_K~PO6Gi~k0dut zcuY_P&8TSHOhfZMoc*Q@&xxg99NrunG`;#P4vUJmuppUG&?e?sQ!EB!fv4b1(3T`K zOA~@Q)|_ZgGC)c49SRuh#prSxE&n2fWw9A}Hb_8X2?QpRLcn8@WCEFlWRn>LECGY{ zV6pK(E(Q`n21sNeu~ zO>iWF1U#99##>^{P0TDQmKJy-lsrEOo3u?1aU+>l1RX#krWaEi^SrI1P>1^ zh(lvoKP=`!z_3{u4-%3EdN7eVvV@g~WFClUB9jE2JOm2%hs7k+NfZ_V(qRyhL>8Wn zB$Gilq{t-UC@hdk@c40FAc5im;z?vA5lf*U$!xp_(u2)nA<0-Y4y2%QOe}#sdCx{l zCnm%ARFjrUlD*ExhDzs�)6Y=;p(T!+{b91X%$%{@MLI642Tqk2_2&Z4>XyL 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 YbFqVt!hr&f7y$avEo{xxOgHcPA8%>(CjbBd From 04a76f7b1fcec9e9fd03cd18615657bcd314715a Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 18:11:34 +0100 Subject: [PATCH 14/17] add null check on access --- .../java/mekanism/client/gui/GuiQuantumEntangloporter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 5e10c5f18..9d9dd8207 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -113,6 +113,9 @@ public class GuiQuantumEntangloporter extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); data.add(freq); + if (access == null) { + return; + } data.add(access.ordinal()); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); From f4badd9f639bfee010bcb20d823fd31525453faa Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 18:26:26 +0100 Subject: [PATCH 15/17] fix that default selection actually work and not generate npe --- src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 9d9dd8207..4980be01d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -101,6 +101,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism buttonList.add(protectedButton); buttonList.add(setButton); buttonList.add(deleteButton); + + access = ISecurityTile.SecurityMode.TRUSTED; } public void setFrequency(String freq) From daea345a0684db4f534a05146ca5c482bd082c2c Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:10:58 +0100 Subject: [PATCH 16/17] add min max for int for setting tier level --- src/main/java/mekanism/common/CommonProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index cbf614cec..5774561c0 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -311,8 +311,8 @@ public class CommonProxy implements IGuiProvider general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); - general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 2).getInt(); - general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 2).getInt(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 2, "Tier level for machines", 1, 4).getInt(); + general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 2, "Tier level for generators", 1, 4).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); From 7bf339c9bd0afddb296bb4d837b031f21253ae36 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:21:42 +0100 Subject: [PATCH 17/17] set default back to 4 few uses industrial 2 classic, setting it back to 4 for performance reasons due how ic2 experimental is coded. --- src/main/java/mekanism/common/CommonProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 5774561c0..6720cdae5 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -311,8 +311,8 @@ public class CommonProxy implements IGuiProvider general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); - general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 2, "Tier level for machines", 1, 4).getInt(); - general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 2, "Tier level for generators", 1, 4).getInt(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); + general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 4, "Tier level for generators, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString();