From b4efdcf2a50b2c740f40854a61684cc3c2feb1be Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Mon, 20 Feb 2023 22:07:07 +0100 Subject: [PATCH] sort some mekce config to own file with submenu --- .../java/mekanism/api/MekanismConfig.java | 10 +++-- .../client/gui/GuiDigitalMinerConfig.java | 2 +- .../client/gui/GuiMekanismConfig.java | 18 ++++++++ .../java/mekanism/common/CommonProxy.java | 28 +++++++----- src/main/java/mekanism/common/Mekanism.java | 28 +++++++----- .../common/block/BlockCardboardBox.java | 2 +- .../common/integration/MekanismHooks.java | 8 ++-- .../common/integration/OreDictManager.java | 14 +++--- .../common/network/PacketConfigSync.java | 45 ++++++++++--------- .../machines/OsmiumCompressorRecipe.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 6 +-- .../common/tile/TileEntityElectricBlock.java | 6 +-- .../tile/TileEntityOsmiumCompressor.java | 2 +- 13 files changed, 102 insertions(+), 69 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 61a8375c4..6558b47d4 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -18,7 +18,6 @@ public class MekanismConfig public static boolean cardboardSpawners = true; public static boolean enableWorldRegeneration = true; public static boolean spawnBabySkeletons = true; - public static boolean enableBoPProgression = true; public static int obsidianTNTBlastRadius = 12; public static int osmiumPerChunk = 12; public static int copperPerChunk = 16; @@ -71,18 +70,23 @@ public class MekanismConfig public static boolean accurateHeavyWaterCapture = true; public static int heavyWaterChance = 4; + + } + public static class mekce { + public static boolean enableBoPProgression = true; public static boolean EnableQuartzCompat; public static boolean EnableDiamondCompat; public static boolean EnablePoorOresCompat; public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; - public static int IC2SinkTier; + public static int IC2SinkTier; public static int IC2SourceTier; - public static int digitalMinerMaxRadius; + public static int digitalMinerMaxRadius; public static boolean enableSingleUseCardboxes; } + public static class client { public static boolean enablePlayerSounds = true; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index d8745df5f..e7d39b2c9 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -673,7 +673,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { if(!radiusField.getText().isEmpty()) { - int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), MekanismConfig.general.digitalMinerMaxRadius)); + int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), MekanismConfig.mekce.digitalMinerMaxRadius)); ArrayList data = new ArrayList(); data.add(6); diff --git a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java index bf251bb95..f4b6f1004 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java @@ -29,6 +29,7 @@ public class GuiMekanismConfig extends GuiConfig list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tier"), "mekanism.configgui.ctgy.tier", TierEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.usage"), "mekanism.configgui.ctgy.usage", UsageEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.client"), "mekanism.configgui.ctgy.client", ClientEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.mekce"), "mekanism.configgui.ctgy.mekce", MEKCEEntry.class)); return list; } @@ -48,6 +49,23 @@ public class GuiMekanismConfig extends GuiConfig GuiConfig.getAbridgedConfigPath(Mekanism.configuration.toString())); } } + + public static class MEKCEEntry extends CategoryEntry + { + public MEKCEEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop) + { + super(owningScreen, owningEntryList, prop); + } + + @Override + protected GuiScreen buildChildScreen() + { + return new GuiConfig(owningScreen, + new ConfigElement(Mekanism.configurationce.getCategory("mekce")).getChildElements(), + owningScreen.modID, Configuration.CATEGORY_GENERAL, false, false, + GuiConfig.getAbridgedConfigPath(Mekanism.configurationce.toString())); + } + } public static class MachinesEntry extends CategoryEntry { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f6df9aa75..3e762c6a0 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -5,10 +5,12 @@ import java.lang.ref.WeakReference; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; +import mekanism.api.MekanismConfig; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.recipes; import mekanism.api.MekanismConfig.machines; import mekanism.api.MekanismConfig.usage; +import mekanism.api.MekanismConfig.mekce; import mekanism.api.Pos3D; import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.api.util.UnitDisplayUtils.TempType; @@ -255,7 +257,7 @@ public class CommonProxy implements IGuiProvider general.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(); general.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(); general.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(); - general.enableBoPProgression = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "enableBoPProgression", true).getBoolean(); + mekce.enableBoPProgression = Mekanism.configurationce.get("mekce", "enableBoPProgression", true, "when true and biome's o plenty is installed atomic alloy is made by using ender instead of obsidian").getBoolean(); general.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(); general.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); @@ -307,18 +309,18 @@ public class CommonProxy implements IGuiProvider general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); - general.EnableQuartzCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableQuartzCompat", true).getBoolean(); - general.EnableDiamondCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableDiamondCompat", true).getBoolean(); - general.EnablePoorOresCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnablePoorOresCompat", true).getBoolean(); - 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 64, we do not recommend going over 32", 1, 64).getInt(); - general.enableSingleUseCardboxes = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSingleUseCardboxes", true).getBoolean(); + mekce.EnableQuartzCompat = Mekanism.configuration.get("mekce", "EnableQuartzCompat", true, "Allows quartz dust to be enriched into quartz Also allows quartz ore to be enriched into quartz dust").getBoolean(); + mekce.EnableDiamondCompat = Mekanism.configuration.get("mekce", "EnableDiamondCompat", true, "Allows oredict'ed diamonds to be used in the enrichment chamber, like synthetic diamonds.").getBoolean(); + mekce.EnablePoorOresCompat = Mekanism.configuration.get("mekce", "EnablePoorOresCompat", true, "Allows poor ores from railcraft to be used in the purification chamber and gives one clump ie one ingot.").getBoolean(); + mekce.OreDictOsmium = Mekanism.configuration.get("mekce", "OreDictOsmium", true, "Adds the oredict (osmium) to osmium").getBoolean(); + mekce.OreDictPlatinum = Mekanism.configuration.get("mekce", "OreDictPlatinum", false, "Adds the oredict (platinum) to osmium").getBoolean(); + mekce.enableSiliconCompat = Mekanism.configuration.get("mekce", "EnableSiliconCompat", true, "When a mod that adds silicon (galacticraft, enderio and projectred) is detected, recipe for control circuit is changed from using iron to silicon in the metalurgic infuser").getBoolean(); + mekce.digitalMinerMaxRadius = Mekanism.configuration.get("mekce", "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); + mekce.enableSingleUseCardboxes = Mekanism.configuration.get("mekce", "EnableSingleUseCardboxes", true, "This allows to force single use on cardboxes or not").getBoolean(); - 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(); + mekce.IC2SinkTier = Mekanism.configuration.get("mekce", "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); + mekce.IC2SourceTier = Mekanism.configuration.get("mekce", "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(); @@ -510,6 +512,10 @@ public class CommonProxy implements IGuiProvider { Mekanism.configuration.save(); } + if(Mekanism.configurationce.hasChanged()) + { + Mekanism.configurationce.save(); + } } /** diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 55d492c3b..3d9312317 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -16,6 +16,7 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.api.MekanismConfig; +import mekanism.api.MekanismConfig.mekce; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.*; @@ -159,6 +160,8 @@ public class Mekanism public static Configuration configurationtools; public static Configuration configurationrecipes; + public static Configuration configurationce; + /** Mekanism version number */ public static Version versionNumber = new Version(GRADLE_VERSIONMOD); @@ -821,12 +824,12 @@ public class Mekanism MachineType.BASIC_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.BASIC, type), new Object[]{ "RCR", "iOi", "RCR", Character.valueOf('R'), "alloyBasic", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('i'), "ingotIron", Character.valueOf('O'), type.getStack() })); - if (general.OreDictOsmium) { + if (mekce.OreDictOsmium) { MachineType.ADVANCED_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ADVANCED, type), new Object[]{ "ECE", "oOo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('o'), "ingotOsmium", Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.BASIC, type) })); } - if (general.OreDictPlatinum) { + if (mekce.OreDictPlatinum) { MachineType.ADVANCED_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ADVANCED, type), new Object[]{ "ECE", "oOo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('o'), "ingotPlatinum", Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.BASIC, type) })); @@ -986,12 +989,12 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), new Object[]{ new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust) })); - if (general.OreDictOsmium) { + if (mekce.OreDictOsmium) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[]{ " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dustOsmium" })); } - if (general.OreDictPlatinum) { + if (mekce.OreDictPlatinum) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), new Object[]{ " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dustPlatinum" })); @@ -1037,7 +1040,7 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.SaltBlock), new ItemStack(MekanismItems.Salt, 4)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.CompressedDiamond)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismItems.Polyethene, 3, 0), new ItemStack(MekanismItems.Polyethene, 1, 2)); - if (MekanismConfig.general.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { + if (MekanismConfig.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { RecipeHandler.addEnrichmentChamberRecipe(Amethyst, new ItemStack(MekanismItems.CompressedEnder)); } @@ -1124,7 +1127,7 @@ public class Mekanism RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.sand), new ItemStack(Blocks.dirt)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.dirt), new ItemStack(Blocks.dirt, 1, 2)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("DIAMOND"), 10, new ItemStack(MekanismItems.EnrichedAlloy), new ItemStack(MekanismItems.ReinforcedAlloy)); - if (MekanismConfig.general.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { + if (MekanismConfig.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("ENDER"), 10, new ItemStack(MekanismItems.ReinforcedAlloy), new ItemStack(MekanismItems.AtomicAlloy)); } else { RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("OBSIDIAN"), 10, new ItemStack(MekanismItems.ReinforcedAlloy), new ItemStack(MekanismItems.AtomicAlloy)); @@ -1158,7 +1161,7 @@ public class Mekanism RecipeHandler.addChemicalWasherRecipe(new GasStack(oreGas, 1), new GasStack(oreGas.getCleanGas(), 1)); if (Resource.getFromName(oreGas.getName()) != null) { - if (Resource.getFromName(oreGas.getName()) == Resource.OSMIUM && (!general.OreDictOsmium && general.OreDictPlatinum)) continue; + if (Resource.getFromName(oreGas.getName()) == Resource.OSMIUM && (!mekce.OreDictOsmium && mekce.OreDictPlatinum)) continue; RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(MekanismItems.Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); } @@ -1201,7 +1204,7 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedDiamond), new InfuseObject(InfuseRegistry.get("DIAMOND"), 80)); InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedObsidian), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 80)); InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedEnder), new InfuseObject(InfuseRegistry.get("ENDER"), 80)); - if (MekanismConfig.general.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { + if (MekanismConfig.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { InfuseRegistry.registerInfuseObject(Amethyst, new InfuseObject(InfuseRegistry.get("ENDER"), 10)); } @@ -1295,13 +1298,13 @@ public class Mekanism OreDictionary.registerOre("shard" + resource.getName(), new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); OreDictionary.registerOre("crystal" + resource.getName(), new ItemStack(MekanismItems.Crystal, 1, resource.ordinal())); } - if(general.OreDictOsmium) + if(mekce.OreDictOsmium) { OreDictionary.registerOre("oreOsmium", new ItemStack(MekanismBlocks.OreBlock, 1, 0)); OreDictionary.registerOre("ingotOsmium", new ItemStack(MekanismItems.Ingot, 1, 1)); OreDictionary.registerOre("blockOsmium", new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); } - if(general.OreDictPlatinum) + if(mekce.OreDictPlatinum) { OreDictionary.registerOre("orePlatinum", new ItemStack(MekanismBlocks.OreBlock, 1, 0)); OreDictionary.registerOre("ingotPlatinum", new ItemStack(MekanismItems.Ingot, 1, 1)); @@ -1407,6 +1410,7 @@ public class Mekanism configurationgenerators = new Configuration(new File("config/mekanism/MekanismGenerators.cfg")); configurationtools = new Configuration(new File("config/mekanism/MekanismTools.cfg")); configurationrecipes = new Configuration(new File("config/mekanism/MekanismRecipes.cfg")); + configurationce = new Configuration(new File("config/mekanism/MekanismCE.cfg")); //Register tier information Tier.init(); @@ -1519,7 +1523,7 @@ public class Mekanism } } //Silicon Module - if (MekanismConfig.general.enableSiliconCompat) + if (MekanismConfig.mekce.enableSiliconCompat) { if (Loader.isModLoaded("EnderIO") || Loader.isModLoaded("GalacticraftCore") || Loader.isModLoaded("ProjRed|Core")) { isSiliconLoaded = true; @@ -1529,7 +1533,7 @@ public class Mekanism registerOreDict(); //Platinum Oredict Module - if (general.OreDictPlatinum) + if (mekce.OreDictPlatinum) { OreGas clean = (OreGas) GasRegistry.register(new OreGas("cleanPlatinum", "oregas.Platinum").setVisible(false)); GasRegistry.register(new OreGas("platinum", "oregas." + "platinum").setCleanGas(clean).setVisible(false)); diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 6b69cf493..b9d505374 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -106,7 +106,7 @@ public class BlockCardboardBox extends BlockContainer data.block.onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.block, 1, data.meta)); data.block.onPostBlockPlaced(world, x, y, z, data.meta); } - if(!MekanismConfig.general.enableSingleUseCardboxes) { + if(!MekanismConfig.mekce.enableSingleUseCardboxes) { float motion = 0.7F; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 2aa0b9c18..f4b93c369 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -95,19 +95,19 @@ public final class MekanismHooks } try { - if(MekanismConfig.general.OreDictOsmium) { + if(MekanismConfig.mekce.OreDictOsmium) { Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal())); } - if(MekanismConfig.general.OreDictPlatinum) { + if(MekanismConfig.mekce.OreDictPlatinum) { Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal())); } } catch(Exception e) {} try { - if(MekanismConfig.general.OreDictOsmium) { + if(MekanismConfig.mekce.OreDictOsmium) { Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); } - if(MekanismConfig.general.OreDictPlatinum) { + if(MekanismConfig.mekce.OreDictPlatinum) { Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotPlatinum"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); } Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.OtherDust, 1, 5)); diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 5425eec9a..a5b129fbe 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -40,10 +40,10 @@ public final class OreDictManager public static void init() { - if (MekanismConfig.general.OreDictOsmium) { + if (MekanismConfig.mekce.OreDictOsmium) { osmiumcompat.add("Osmium"); } - if (MekanismConfig.general.OreDictPlatinum) { + if (MekanismConfig.mekce.OreDictPlatinum) { osmiumcompat.add("Platinum"); } addLogRecipes(); @@ -127,12 +127,12 @@ public final class OreDictManager } catch (Exception e) { } } - if (MekanismConfig.general.OreDictPlatinum) { + if (MekanismConfig.mekce.OreDictPlatinum) { for (ItemStack ore : OreDictionary.getOres("orePlatinum")) { RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas("platinum"), 1000)); } } - if (MekanismConfig.general.OreDictOsmium || MekanismConfig.general.OreDictPlatinum) { + if (MekanismConfig.mekce.OreDictOsmium || MekanismConfig.mekce.OreDictPlatinum) { for (String s : osmiumcompat) { if (MekanismConfig.recipes.enableOsmiumBlock) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), new Object[]{ @@ -477,7 +477,7 @@ public final class OreDictManager } } public static void terralizationcompat() { - if (MekanismConfig.general.EnableQuartzCompat) { + if (MekanismConfig.mekce.EnableQuartzCompat) { // Enrich quartz dust into quartz for (ItemStack ore : OreDictionary.getOres("dustQuartz")) { RecipeHelper.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.quartz)); @@ -494,13 +494,13 @@ public final class OreDictManager } } // Add gemdiamond oredict for compressed diamond - if (MekanismConfig.general.EnableDiamondCompat) { + if (MekanismConfig.mekce.EnableDiamondCompat) { for (ItemStack ore : OreDictionary.getOres("gemDiamond")) { InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("DIAMOND"), 10)); RecipeHelper.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.CompressedDiamond)); } } - if (MekanismConfig.general.EnablePoorOresCompat) { + if (MekanismConfig.mekce.EnablePoorOresCompat) { for (ItemStack ore : OreDictionary.getOres("orePoorIron")) { for (ItemStack ore2 : OreDictionary.getOres("clumpIron")) { RecipeHelper.addPurificationChamberRecipe(ore, ore2); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index acc85df0f..9999c7671 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -5,6 +5,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.machines; import mekanism.api.MekanismConfig.usage; import mekanism.api.MekanismConfig.recipes; +import mekanism.api.MekanismConfig.mekce; import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.common.Mekanism; import mekanism.common.Tier; @@ -35,7 +36,7 @@ public class PacketConfigSync implements IMessageHandler