From ab9b666f8998662e66890518f7004a04082e23df Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Thu, 14 Sep 2023 15:34:44 +0200 Subject: [PATCH 1/5] Clean Up Integration Modules Merged and refactored `OreDictOsmium` and `OreDictPlatinum` under `PlatReplacement`. Cleaned up BoP and Silicon module --- .../java/mekanism/api/MekanismConfig.java | 3 +- .../client/render/MekanismRenderer.java | 4 +- .../java/mekanism/common/CommonProxy.java | 4 +- src/main/java/mekanism/common/Mekanism.java | 198 +++++++---------- .../java/mekanism/common/MekanismItems.java | 5 +- src/main/java/mekanism/common/Resource.java | 4 +- .../common/integration/MekanismHooks.java | 15 -- .../common/integration/OreDictManager.java | 206 ++++++++---------- .../common/network/PacketConfigSync.java | 6 +- .../machines/OsmiumCompressorRecipe.java | 3 +- .../tile/TileEntityOsmiumCompressor.java | 26 +-- .../generators/common/MekanismGenerators.java | 18 +- .../mekanism/tools/common/MekanismTools.java | 21 +- 13 files changed, 210 insertions(+), 303 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index bac13d56b96..7533a303fe3 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -76,8 +76,7 @@ public static class mekce { public static boolean EnableQuartzCompat; public static boolean EnableDiamondCompat; public static boolean EnablePoorOresCompat; - public static boolean OreDictOsmium; - public static boolean OreDictPlatinum; + public static boolean PlatReplacement; public static boolean enableSiliconCompat; public static int IC2SinkTier; public static int IC2SourceTier; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 2b313a5d9cb..1c6105bb0c2 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -12,6 +12,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.*; import mekanism.common.ObfuscatedNames; +import mekanism.common.Resource; import mekanism.common.base.ISpecialBounds; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -99,8 +100,7 @@ public void onStitch(TextureStitchEvent.Pre event) GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurTrioxide")); GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfuricAcid")); GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogenChloride")); - GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium")); - GasRegistry.getGas("liquidPlatinum").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium")); + GasRegistry.getGas("liquid" + Resource.OSMIUM.getName()).setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium")); GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:liquid/LiquidStone")); GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:liquid/LiquidEthene")); GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidBrine")); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index e354de2925c..2d015b70eb9 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -5,7 +5,6 @@ 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; @@ -312,8 +311,7 @@ public void loadConfiguration() mekce.EnableQuartzCompat = Mekanism.configurationce.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.configurationce.get("mekce", "EnableDiamondCompat", true, "Allows oredict'ed diamonds to be used in the enrichment chamber, like synthetic diamonds.").getBoolean(); mekce.EnablePoorOresCompat = Mekanism.configurationce.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.configurationce.get("mekce", "OreDictOsmium", true, "Adds the oredict (osmium) to osmium").getBoolean(); - mekce.OreDictPlatinum = Mekanism.configurationce.get("mekce", "OreDictPlatinum", false, "Adds the oredict (platinum) to osmium").getBoolean(); + mekce.PlatReplacement = Mekanism.configurationce.get("mekce", "PlatReplacement", false, "Replaces Mekanism Osmium to Platinum").getBoolean(); mekce.enableSiliconCompat = Mekanism.configurationce.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.configurationce.get("mekce", "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); mekce.enableSingleUseCardboxes = Mekanism.configurationce.get("mekce", "EnableSingleUseCardboxes", true, "This allows to force single use on cardboxes or not").getBoolean(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d51c31a9e72..13059e4a9e1 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -16,7 +16,6 @@ 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.*; @@ -232,12 +231,12 @@ public void addRecipes() } if (MekanismConfig.recipes.enableRefinedObsidianBlock) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), new Object[]{ - "***", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), new Object[]{ - "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 2) - })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), new Object[]{ + "***", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), new Object[]{ + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 2) + })); } if (MekanismConfig.recipes.enableRefinedGlowstoneBlock) { @@ -293,8 +292,8 @@ public void addRecipes() if (MekanismConfig.recipes.enableSaltBlock) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.SaltBlock), new Object[] { - "**", "**", Character.valueOf('*'), MekanismItems.Salt - })); + "**", "**", Character.valueOf('*'), MekanismItems.Salt + })); } //Base Recipes @@ -630,10 +629,10 @@ public void addRecipes() })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 2), new Object[]{ - "RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood" + "RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 3), new Object[]{ - "RCR", "dWd", "RCR", Character.valueOf('R'), "alloyUltimate", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('d'), "gemDiamond", Character.valueOf('W'), "plankWood" + "RCR", "dWd", "RCR", Character.valueOf('R'), "alloyUltimate", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('d'), "gemDiamond", Character.valueOf('W'), "plankWood" })); } @@ -692,10 +691,10 @@ public void addRecipes() } if (MekanismConfig.recipes.enableEntangloporter) { - MachineType.QUANTUM_ENTANGLOPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 0), new Object[]{ - "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore - })); - } + MachineType.QUANTUM_ENTANGLOPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 0), new Object[]{ + "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore + })); + } if (MekanismConfig.recipes.enableFormulaicAssembler) { MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[]{ @@ -821,16 +820,11 @@ public void addRecipes() 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 (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 (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) - })); - } + + 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'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.BASIC, type) + })); + MachineType.ELITE_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ELITE, type), new Object[]{ "RCR", "gOg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.ADVANCED, type) })); @@ -842,7 +836,7 @@ public void addRecipes() CraftingManager.getInstance().getRecipeList().add(new BinRecipe()); } - //Transmitters + //Transmitters if (MekanismConfig.recipes.enableUniversalCables) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0), new Object[]{ "SRS", Character.valueOf('S'), "ingotSteel", Character.valueOf('R'), "dustRedstone" @@ -986,16 +980,9 @@ public void addRecipes() 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 (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 (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" - })); - } + 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'), "dust" + Resource.OSMIUM.getName() + })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), new Object[]{ "SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i) })); @@ -1014,10 +1001,8 @@ public void addRecipes() FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes - ItemStack Amethyst = GameRegistry.findItemStack("BiomesOPlenty", "gems", 1); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.OtherDust, 2, 6)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.OtherDust, 2, 6)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(MekanismItems.CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(MekanismItems.CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(MekanismItems.CompressedRedstone)); @@ -1037,9 +1022,6 @@ public void addRecipes() 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.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { - RecipeHandler.addEnrichmentChamberRecipe(Amethyst, new ItemStack(MekanismItems.CompressedEnder)); - } for(int i = 0; i < EnumColor.DYES.length; i++) { @@ -1057,21 +1039,21 @@ public void addRecipes() //Crusher Recipes RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.OtherDust, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal())); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal())); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.gravel)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stone)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand, 2)); - - for(int i = 0; i < 16; i++) - { - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.string, 4)); - } + RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal())); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal())); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.gravel)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stone)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick, 1, 0)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand, 2)); + + for(int i = 0; i < 16; i++) + { + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.string, 4)); + } //BioFuel Crusher Recipes RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.tallgrass), new ItemStack(MekanismItems.BioFuel, 1)); @@ -1088,13 +1070,13 @@ public void addRecipes() RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.pumpkin), new ItemStack(MekanismItems.BioFuel, 4)); //Purification Chamber Recipes - RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint)); + RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint)); - //Chemical Injection Chamber Recipes - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.dirt), "water", new ItemStack(Blocks.clay)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.hardened_clay), "water", new ItemStack(Blocks.clay)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.brick), "water", new ItemStack(Items.clay_ball)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.gunpowder), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3)); + //Chemical Injection Chamber Recipes + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.dirt), "water", new ItemStack(Blocks.clay)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.hardened_clay), "water", new ItemStack(Blocks.clay)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.brick), "water", new ItemStack(Items.clay_ball)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.gunpowder), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3)); RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(MekanismItems.Yeast), "molasse", new ItemStack(MekanismItems.Yeast, 3)); //Precision Sawmill Recipes @@ -1114,24 +1096,24 @@ public void addRecipes() RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.redstone_torch), new ItemStack(Items.stick), new ItemStack(Items.redstone), 1); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ItemStack(Blocks.planks, 4)); - //Metallurgic Infuser Recipes - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.EnrichedIron)); + //Metallurgic Infuser Recipes + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.EnrichedIron)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(MekanismItems.EnrichedIron), new ItemStack(MekanismItems.OtherDust, 1, 1)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Items.sugar), new ItemStack(MekanismItems.Yeast)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Blocks.dirt), new ItemStack(Blocks.mycelium)); - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.mossy_cobblestone)); - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 1)); - 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)); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.mossy_cobblestone)); + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 1)); + 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.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)); } - //Chemical Infuser Recipes - RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 2), new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 2)); + //Chemical Infuser Recipes + RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 2), new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 2)); RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 1), new GasStack(GasRegistry.getGas("water"), 1), new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("hydrogen"), 1), new GasStack(GasRegistry.getGas("chlorine"), 1), new GasStack(GasRegistry.getGas("hydrogenChloride"), 1)); RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("deuterium"), 1), new GasStack(GasRegistry.getGas("tritium"), 1), new GasStack(GasRegistry.getGas("fusionFuelDT"), 2)); @@ -1158,10 +1140,8 @@ public void addRecipes() RecipeHandler.addChemicalWasherRecipe(new GasStack(oreGas, 1), new GasStack(oreGas.getCleanGas(), 1)); if (Resource.getFromName(oreGas.getName()) != null) { - 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())); - } + } } } @@ -1188,28 +1168,25 @@ public void addRecipes() //Solar Neutron Activator Recipes RecipeHandler.addSolarNeutronRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new GasStack(GasRegistry.getGas("tritium"), 1)); - //Infuse objects + //Infuse objects InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.BioFuel), new InfuseObject(InfuseRegistry.get("BIO"), 5)); InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 0), new InfuseObject(InfuseRegistry.get("CARBON"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20)); - InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 80)); - InfuseRegistry.registerInfuseObject(new ItemStack(Items.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.redstone_block), new InfuseObject(InfuseRegistry.get("REDSTONE"), 90)); - InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 80)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.red_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.brown_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 80)); + InfuseRegistry.registerInfuseObject(new ItemStack(Items.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.redstone_block), new InfuseObject(InfuseRegistry.get("REDSTONE"), 90)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 80)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.red_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.brown_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); 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.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) { - InfuseRegistry.registerInfuseObject(Amethyst, new InfuseObject(InfuseRegistry.get("ENDER"), 10)); - } //Chemical Oxidiser Recipes RecipeHandler.addChemicalOxidizerRecipe(new ItemStack(MekanismItems.BioFuel), new GasStack(GasRegistry.getGas("biomass"), 75)); //Fuels - GameRegistry.registerFuelHandler(new IFuelHandler() { + GameRegistry.registerFuelHandler(new IFuelHandler() { @Override public int getBurnTime(ItemStack fuel) { @@ -1234,6 +1211,12 @@ public int getBurnTime(ItemStack fuel) RecipeSorter.register("mekanism_shapeless", ShapelessMekanismRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("bin", BinRecipe.class, Category.SHAPELESS, ""); + //BoP Compat + if (GameRegistry.findItemStack("BiomesOPlenty", "gems", 1) != null) { + ItemStack Amethyst = GameRegistry.findItemStack("BiomesOPlenty", "gems", 1); + RecipeHandler.addEnrichmentChamberRecipe(Amethyst, new ItemStack(MekanismItems.CompressedEnder)); + InfuseRegistry.registerInfuseObject(Amethyst, new InfuseObject(InfuseRegistry.get("ENDER"), 10)); + } } /** @@ -1271,6 +1254,7 @@ public void registerOreDict() OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(MekanismItems.Ingot, 1, 0)); + OreDictionary.registerOre("ingot" + Resource.OSMIUM.getName(), new ItemStack(MekanismItems.Ingot, 1, 1)); OreDictionary.registerOre("ingotBronze", new ItemStack(MekanismItems.Ingot, 1, 2)); OreDictionary.registerOre("ingotRefinedGlowstone", new ItemStack(MekanismItems.Ingot, 1, 3)); OreDictionary.registerOre("ingotSteel", new ItemStack(MekanismItems.Ingot, 1, 4)); @@ -1278,7 +1262,7 @@ public void registerOreDict() OreDictionary.registerOre("ingotTin", new ItemStack(MekanismItems.Ingot, 1, 6)); OreDictionary.registerOre("ingotRefinedLapis", new ItemStack(MekanismItems.Ingot, 1, 7)); - + OreDictionary.registerOre("block" + Resource.OSMIUM.getName(), new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); OreDictionary.registerOre("blockCharcoal", new ItemStack(MekanismBlocks.BasicBlock, 1, 3)); @@ -1289,31 +1273,13 @@ public void registerOreDict() for(Resource resource : Resource.values()) { - if (!(!mekce.OreDictOsmium && resource.getName() == "Osmium")) { - OreDictionary.registerOre("dust" + resource.getName(), new ItemStack(MekanismItems.Dust, 1, resource.ordinal())); - OreDictionary.registerOre("dustDirty" + resource.getName(), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); - OreDictionary.registerOre("clump" + resource.getName(), new ItemStack(MekanismItems.Clump, 1, resource.ordinal())); - 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(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(mekce.OreDictPlatinum) - { - OreDictionary.registerOre("orePlatinum", new ItemStack(MekanismBlocks.OreBlock, 1, 0)); - OreDictionary.registerOre("ingotPlatinum", new ItemStack(MekanismItems.Ingot, 1, 1)); - OreDictionary.registerOre("blockPlatinum", new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); - OreDictionary.registerOre("dustPlatinum", new ItemStack(MekanismItems.Dust, 1, 2)); - OreDictionary.registerOre("dustDirtyPlatinum", new ItemStack(MekanismItems.DirtyDust, 1, 2)); - OreDictionary.registerOre("clumpPlatinum", new ItemStack(MekanismItems.Clump, 1, 2)); - OreDictionary.registerOre("shardPlatinum", new ItemStack(MekanismItems.Shard, 1, 2)); - OreDictionary.registerOre("crystalPlatinum", new ItemStack(MekanismItems.Crystal, 1, 2)); + OreDictionary.registerOre("dust" + resource.getName(), new ItemStack(MekanismItems.Dust, 1, resource.ordinal())); + OreDictionary.registerOre("dustDirty" + resource.getName(), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); + OreDictionary.registerOre("clump" + resource.getName(), new ItemStack(MekanismItems.Clump, 1, resource.ordinal())); + OreDictionary.registerOre("shard" + resource.getName(), new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); + OreDictionary.registerOre("crystal" + resource.getName(), new ItemStack(MekanismItems.Crystal, 1, resource.ordinal())); } + OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1)); OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2)); @@ -1536,14 +1502,6 @@ public void init(FMLInitializationEvent event) //Integrate certain OreDictionary recipes registerOreDict(); - //Platinum Oredict Module - 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)); - RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(clean, 200), new ItemStack(MekanismItems.Crystal, 1, 2)); - } - //Load this module addRecipes(); addEntities(); diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 34e7ba78057..96e0424a92d 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -1,5 +1,7 @@ package mekanism.common; +import cpw.mods.fml.common.Loader; +import mekanism.api.MekanismConfig; import mekanism.common.item.*; import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; @@ -103,7 +105,8 @@ public static void register() GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone"); GameRegistry.registerItem(CompressedDiamond, "CompressedDiamond"); GameRegistry.registerItem(CompressedObsidian, "CompressedObsidian"); - GameRegistry.registerItem(CompressedEnder, "CompressedEnder"); + if (MekanismConfig.mekce.enableBoPProgression && Loader.isModLoaded("BiomesOPlenty")) + GameRegistry.registerItem(CompressedEnder, "CompressedEnder"); GameRegistry.registerItem(PortableTeleporter, "PortableTeleporter"); GameRegistry.registerItem(TeleportationCore, "TeleportationCore"); GameRegistry.registerItem(Clump, "Clump"); diff --git a/src/main/java/mekanism/common/Resource.java b/src/main/java/mekanism/common/Resource.java index f54a5c83373..27613d53772 100644 --- a/src/main/java/mekanism/common/Resource.java +++ b/src/main/java/mekanism/common/Resource.java @@ -1,10 +1,12 @@ package mekanism.common; +import static mekanism.api.MekanismConfig.mekce.PlatReplacement; + public enum Resource { IRON("Iron"), GOLD("Gold"), - OSMIUM("Osmium"), + OSMIUM(PlatReplacement ? "Platinum" : "Osmium"), COPPER("Copper"), TIN("Tin"), SILVER("Silver"), diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index f4b93c3693e..2701be5a8ef 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -95,21 +95,6 @@ public void hookIC2Recipes() } try { - if(MekanismConfig.mekce.OreDictOsmium) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, Resource.OSMIUM.ordinal())); - } - 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.mekce.OreDictOsmium) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); - } - 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)); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.glowstone_dust)); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.OtherDust, 1, 1)); diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index a5b129fbe38..6cca228cb4f 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -34,18 +34,8 @@ public final class OreDictManager { - private static final List minorCompat = Arrays.asList("Nickel", "Aluminum"); - private static final List siliconcompat = Arrays.asList("itemSilicon", "silicon"); - private static List osmiumcompat = new ArrayList<>(); - public static void init() { - if (MekanismConfig.mekce.OreDictOsmium) { - osmiumcompat.add("Osmium"); - } - if (MekanismConfig.mekce.OreDictPlatinum) { - osmiumcompat.add("Platinum"); - } addLogRecipes(); for (ItemStack ore : OreDictionary.getOres("plankWood")) { @@ -124,128 +114,120 @@ public static void init() { for (ItemStack ore : OreDictionary.getOres("dust" + resource.getName())) { RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + resource.getName()).get(0), 1)); } - } catch (Exception e) { - } + } catch (Exception e) {} } - if (MekanismConfig.mekce.OreDictPlatinum) { - for (ItemStack ore : OreDictionary.getOres("orePlatinum")) { - RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas("platinum"), 1000)); - } + + if (MekanismConfig.recipes.enableOsmiumBlock) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), new Object[]{ + "XXX", "XXX", "XXX", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName() + })); + } + if (MekanismConfig.recipes.enableMachineUpgrades) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[]{ + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dust" + Resource.OSMIUM.getName() + })); + } + if (MekanismConfig.recipes.enableMetallurgicInfuser) { + BlockMachine.MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[]{ + "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName() + })); } - 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[]{ - "XXX", "XXX", "XXX", Character.valueOf('X'), "ingot" + s - })); - } - if (MekanismConfig.recipes.enableMachineUpgrades) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[]{ - " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dust" + s - })); - } - if (MekanismConfig.recipes.enableMetallurgicInfuser) { - BlockMachine.MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[]{ - "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingot" + s - })); - } - if (MekanismConfig.recipes.enablePurificationChamber) { - BlockMachine.MachineType.PURIFICATION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 9), new Object[]{ - "ECE", "ORO", "ECE", Character.valueOf('C'), MekanismUtils.getControlCircuit(Tier.BaseTier.ADVANCED), Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingot" + s, Character.valueOf('R'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0) - })); - } + if (MekanismConfig.recipes.enablePurificationChamber) { + BlockMachine.MachineType.PURIFICATION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 9), new Object[]{ + "ECE", "ORO", "ECE", Character.valueOf('C'), MekanismUtils.getControlCircuit(Tier.BaseTier.ADVANCED), Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('R'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0) + })); + } - if (MekanismConfig.recipes.enableSteelCasing) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), new Object[]{ - "SGS", "GPG", "SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingot" + s, Character.valueOf('G'), "blockGlass" - })); - } + if (MekanismConfig.recipes.enableSteelCasing) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), new Object[]{ + "SGS", "GPG", "SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('G'), "blockGlass" + })); + } - if (MekanismConfig.recipes.enableElectricPump) { - BlockMachine.MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), new Object[]{ - " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingot" + s - })); - } + if (MekanismConfig.recipes.enableElectricPump) { + BlockMachine.MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), new Object[]{ + " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName() + })); + } - if (MekanismConfig.recipes.enableElectroliticCore) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ElectrolyticCore), new Object[]{ - "EPE", "IEG", "EPE", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "dust" + s, Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" - })); - } + if (MekanismConfig.recipes.enableElectroliticCore) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ElectrolyticCore), new Object[]{ + "EPE", "IEG", "EPE", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "dust" + Resource.OSMIUM.getName(), Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" + })); + } - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[]{ - "O O", "OSO", "O O", Character.valueOf('O'), "ingot" + s, Character.valueOf('S'), "stickWood" - })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[]{ + "O O", "OSO", "O O", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('S'), "stickWood" + })); - if (MekanismConfig.recipes.enableGaugeDropper) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[]{ - " O ", "G G", "GGG", Character.valueOf('O'), "ingot" + s, Character.valueOf('G'), "paneGlass" - })); - } + if (MekanismConfig.recipes.enableGaugeDropper) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[]{ + " O ", "G G", "GGG", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('G'), "paneGlass" + })); + } - if (MekanismConfig.recipes.enableTierInstaller) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 1), new Object[]{ - "ECE", "oWo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(Tier.BaseTier.ADVANCED), Character.valueOf('o'), "ingot" + s, Character.valueOf('W'), "plankWood" - })); - } + if (MekanismConfig.recipes.enableTierInstaller) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 1), new Object[]{ + "ECE", "oWo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(Tier.BaseTier.ADVANCED), Character.valueOf('o'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('W'), "plankWood" + })); + } - if (MekanismConfig.recipes.enableEnergyCubes) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(Tier.EnergyCubeTier.ADVANCED), new Object[]{ - "ETE", "oBo", "ETE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('o'), "ingot" + s, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(Tier.EnergyCubeTier.BASIC) - })); - } + if (MekanismConfig.recipes.enableEnergyCubes) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(Tier.EnergyCubeTier.ADVANCED), new Object[]{ + "ETE", "oBo", "ETE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('o'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(Tier.EnergyCubeTier.BASIC) + })); + } - //Gas Tank Recipes - if (MekanismConfig.recipes.enableGasTanks) { - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.BASIC), new Object[]{ - "APA", "P P", "APA", Character.valueOf('P'), "ingot" + s, Character.valueOf('A'), "alloyBasic" - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ADVANCED), new Object[]{ - "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + s, Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.BASIC) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ELITE), new Object[]{ - "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + s, Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ADVANCED) - })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ULTIMATE), new Object[]{ - "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + s, Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ELITE) - })); - } - if (!Mekanism.isSiliconLoaded) { - for (ItemStack ore : OreDictionary.getOres("ingot" + s)) { - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); - } - } - } + //Gas Tank Recipes + if (MekanismConfig.recipes.enableGasTanks) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.BASIC), new Object[]{ + "APA", "P P", "APA", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ADVANCED), new Object[]{ + "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ELITE), new Object[]{ + "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ULTIMATE), new Object[]{ + "APA", "PTP", "APA", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(Tier.GasTankTier.ELITE) + })); } - if (Mekanism.isSiliconLoaded) { - for (String s : siliconcompat) { - for (ItemStack ore : OreDictionary.getOres(s)) { - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); - } + + if (Mekanism.isSiliconLoaded && OreDictionary.doesOreNameExist("itemSilicon")) { + for (ItemStack ore : OreDictionary.getOres("itemSilicon")) { + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); + } + } else { + + for (ItemStack ore : OreDictionary.getOres("ingot" + Resource.OSMIUM.getName())) { + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); } } + + List minorCompat = Arrays.asList("Nickel", "Aluminum"); for (String s : minorCompat) { - for (ItemStack ore : OreDictionary.getOres("ore" + s)) { - try { - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 2)); - } catch (Exception e) { + for (ItemStack ore : OreDictionary.getOres("ore" + s)) { + try { + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 2)); + } catch (Exception e) { + } } - } - for (ItemStack ore : OreDictionary.getOres("ingot" + s)) { - try { - RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 1)); - } catch (Exception e) { + for (ItemStack ore : OreDictionary.getOres("ingot" + s)) { + try { + RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dust" + s).get(0), 1)); + } catch (Exception e) { + } } - } - for (ItemStack ore : OreDictionary.getOres("dust" + s)) { - try { - RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1)); - } catch (Exception e) { + for (ItemStack ore : OreDictionary.getOres("dust" + s)) { + try { + RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1)); + } catch (Exception e) { + } } - } } for (ItemStack ore : OreDictionary.getOres("oreYellorite")) { diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 615648bb362..44f428974b1 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -80,8 +80,7 @@ public void toBytes(ByteBuf dataStream) dataStream.writeBoolean(mekce.EnableQuartzCompat); dataStream.writeBoolean(mekce.EnableDiamondCompat); dataStream.writeBoolean(mekce.EnablePoorOresCompat); - dataStream.writeBoolean(mekce.OreDictOsmium); - dataStream.writeBoolean(mekce.OreDictPlatinum); + dataStream.writeBoolean(mekce.PlatReplacement); dataStream.writeBoolean(mekce.enableSiliconCompat); dataStream.writeInt(mekce.IC2SinkTier); dataStream.writeInt(mekce.IC2SourceTier); @@ -276,8 +275,7 @@ public void fromBytes(ByteBuf dataStream) mekce.EnableQuartzCompat = dataStream.readBoolean(); mekce.EnableDiamondCompat = dataStream.readBoolean(); mekce.EnablePoorOresCompat = dataStream.readBoolean(); - mekce.OreDictOsmium = dataStream.readBoolean(); - mekce.OreDictPlatinum = dataStream.readBoolean(); + mekce.PlatReplacement = dataStream.readBoolean(); mekce.enableSiliconCompat = dataStream.readBoolean(); mekce.IC2SinkTier = dataStream.readInt(); mekce.IC2SourceTier = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java index 16988b52a6e..850efe3a3a4 100644 --- a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java @@ -1,6 +1,7 @@ package mekanism.common.recipe.machines; import mekanism.api.MekanismConfig; +import mekanism.common.Resource; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; import net.minecraft.item.ItemStack; @@ -14,7 +15,7 @@ public OsmiumCompressorRecipe(AdvancedMachineInput input, ItemStackOutput output public OsmiumCompressorRecipe(ItemStack input, ItemStack output) { - super(input, (MekanismConfig.mekce.OreDictPlatinum && !MekanismConfig.mekce.OreDictOsmium) ? "liquidPlatinum" : "liquidOsmium", output); + super(input, "liquid" + Resource.OSMIUM.getName(), output); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 16b62f537bc..b4ed4f425dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -7,6 +7,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; +import mekanism.common.Resource; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; @@ -30,34 +31,17 @@ public Map getRecipes() @Override public GasStack getItemGas(ItemStack itemstack) { - int amount = 0; - boolean replaceWithPlat = MekanismConfig.mekce.OreDictPlatinum && !MekanismConfig.mekce.OreDictOsmium; - - if (replaceWithPlat) { - for (ItemStack ore : OreDictionary.getOres("ingotPlatinum")) { - if (ore.isItemEqual(itemstack)) { - return new GasStack(GasRegistry.getGas("liquidPlatinum"), 200); - } - } - - for (ItemStack ore : OreDictionary.getOres("blockPlatinum")) { - if (ore.isItemEqual(itemstack)) { - return new GasStack(GasRegistry.getGas("liquidPlatinum"), 1800); - } - } - } else { - for (ItemStack ore : OreDictionary.getOres("ingotOsmium")) { + for (ItemStack ore : OreDictionary.getOres("ingot" + Resource.OSMIUM.getName())) { if (ore.isItemEqual(itemstack)) { - return new GasStack(GasRegistry.getGas("liquidOsmium"), 200); + return new GasStack(GasRegistry.getGas("liquid" + Resource.OSMIUM.getName()), 200); } } - for (ItemStack ore : OreDictionary.getOres("blockOsmium")) { + for (ItemStack ore : OreDictionary.getOres("block" + Resource.OSMIUM.getName())) { if (ore.isItemEqual(itemstack)) { - return new GasStack(GasRegistry.getGas("liquidOsmium"), 1800); + return new GasStack(GasRegistry.getGas("liquid" + Resource.OSMIUM.getName()), 1800); } } - } return null; } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index a3d38b19e96..05f770661dd 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -11,13 +11,9 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.infuse.InfuseRegistry; -import mekanism.common.FuelHandler; -import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; +import mekanism.common.*; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.GasTankTier; -import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketSimpleGui; @@ -118,13 +114,13 @@ public void addRecipes() { if (generatorsrecipes.enableHeatGenerator) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 0), new Object[]{ - "III", "WOW", "CFC", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "ingotCopper", Character.valueOf('O'), "ingotOsmium", Character.valueOf('F'), Blocks.furnace, Character.valueOf('W'), "plankWood" + "III", "WOW", "CFC", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "ingotCopper", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('F'), Blocks.furnace, Character.valueOf('W'), "plankWood" })); } if (generatorsrecipes.enableSolarGenerator) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 1), new Object[]{ - "SSS", "AIA", "PEP", Character.valueOf('S'), GeneratorsItems.SolarPanel, Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), "ingotIron", Character.valueOf('P'), "dustOsmium", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() + "SSS", "AIA", "PEP", Character.valueOf('S'), GeneratorsItems.SolarPanel, Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), "ingotIron", Character.valueOf('P'), "dust" + Resource.OSMIUM.getName(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() })); } @@ -142,19 +138,19 @@ public void addRecipes() if (generatorsrecipes.enableGasGenerator) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 3), new Object[]{ - "PEP", "ICI", "PEP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), MekanismItems.ElectrolyticCore + "PEP", "ICI", "PEP", Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), MekanismItems.ElectrolyticCore })); } if (generatorsrecipes.enableSolarPanel) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsItems.SolarPanel), new Object[]{ - "GGG", "RAR", "PPP", Character.valueOf('G'), "paneGlass", Character.valueOf('R'), "dustRedstone", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "ingotOsmium" + "GGG", "RAR", "PPP", Character.valueOf('G'), "paneGlass", Character.valueOf('R'), "dustRedstone", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "ingot" + Resource.OSMIUM.getName() })); } if (generatorsrecipes.enableWindGenerator) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 6), new Object[]{ - " O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) + " O ", "OAO", "ECE", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); } @@ -184,7 +180,7 @@ public void addRecipes() if (generatorsrecipes.enableTurbineCasing) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 4, 10), new Object[]{ - " S ", "SOS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('O'), "ingotOsmium" + " S ", "SOS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('O'), "ingot" + Resource.OSMIUM.getName() })); } diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 2804e93c441..94541002003 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -12,6 +12,7 @@ import io.netty.buffer.ByteBuf; import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; +import mekanism.common.Resource; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.recipe.ShapedMekanismRecipe; @@ -206,37 +207,37 @@ public void addRecipes() "X", "X", "T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); - if(OreDictionary.doesOreNameExist("ingotOsmium")) { + if(OreDictionary.doesOreNameExist("ingot" + Resource.OSMIUM.getName())) { //Osmium CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumPaxel, 1), new Object[]{ "XYZ", " T ", " T ", Character.valueOf('X'), ToolsItems.OsmiumAxe, Character.valueOf('Y'), ToolsItems.OsmiumPickaxe, Character.valueOf('Z'), ToolsItems.OsmiumShovel, Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumPickaxe, 1), new Object[]{ - "XXX", " T ", " T ", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick + "XXX", " T ", " T ", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumAxe, 1), new Object[]{ - "XX", "XT", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick + "XX", "XT", " T", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumShovel, 1), new Object[]{ - "X", "T", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick + "X", "T", "T", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumHoe, 1), new Object[]{ - "XX", " T", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick + "XX", " T", " T", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumSword, 1), new Object[]{ - "X", "X", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick + "X", "X", "T", Character.valueOf('X'), "ingot" + Resource.OSMIUM.getName(), Character.valueOf('T'), Items.stick })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumHelmet, 1), new Object[]{ - "***", "* *", Character.valueOf('*'), "ingotOsmium" + "***", "* *", Character.valueOf('*'), "ingot" + Resource.OSMIUM.getName() })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumChestplate, 1), new Object[]{ - "* *", "***", "***", Character.valueOf('*'), "ingotOsmium" + "* *", "***", "***", Character.valueOf('*'), "ingot" + Resource.OSMIUM.getName() })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumLeggings, 1), new Object[]{ - "***", "* *", "* *", Character.valueOf('*'), "ingotOsmium" + "***", "* *", "* *", Character.valueOf('*'), "ingot" + Resource.OSMIUM.getName() })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(ToolsItems.OsmiumBoots, 1), new Object[]{ - "* *", "* *", Character.valueOf('*'), "ingotOsmium" + "* *", "* *", Character.valueOf('*'), "ingot" + Resource.OSMIUM.getName() })); } //Bronze From d4f0f9ee18703102aaa1aa93d6c18095f63e1e55 Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Sat, 16 Sep 2023 15:11:15 +0200 Subject: [PATCH 2/5] Restore missing oredict for SiliconCompat --- .../java/mekanism/common/integration/OreDictManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 6cca228cb4f..ff5b82fb28c 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -195,9 +195,12 @@ public static void init() { })); } - if (Mekanism.isSiliconLoaded && OreDictionary.doesOreNameExist("itemSilicon")) { - for (ItemStack ore : OreDictionary.getOres("itemSilicon")) { - RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); + if (Mekanism.isSiliconLoaded && (OreDictionary.doesOreNameExist("itemSilicon") || OreDictionary.doesOreNameExist("silicon"))) { + List siliconCompat = Arrays.asList("itemSilicon", "silicon"); + for (String s : siliconCompat) { + for (ItemStack ore : OreDictionary.getOres(s)) { + RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("REDSTONE"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); + } } } else { From 3155541cdf847abb75d36f865d2d23a160c5ce7c Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Sat, 16 Sep 2023 16:18:37 +0200 Subject: [PATCH 3/5] Move Silicon Checks --- src/main/java/mekanism/common/Mekanism.java | 3 ++- src/main/java/mekanism/common/integration/OreDictManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 13059e4a9e1..07e773bb5a6 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1496,7 +1496,8 @@ public void init(FMLInitializationEvent event) if (MekanismConfig.mekce.enableSiliconCompat) { if (Loader.isModLoaded("EnderIO") || Loader.isModLoaded("GalacticraftCore") || Loader.isModLoaded("ProjRed|Core")) { - isSiliconLoaded = true; + if (OreDictionary.doesOreNameExist("itemSilicon") || OreDictionary.doesOreNameExist("silicon")) + isSiliconLoaded = true; } } //Integrate certain OreDictionary recipes diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index ff5b82fb28c..b4f01117bee 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -195,7 +195,7 @@ public static void init() { })); } - if (Mekanism.isSiliconLoaded && (OreDictionary.doesOreNameExist("itemSilicon") || OreDictionary.doesOreNameExist("silicon"))) { + if (Mekanism.isSiliconLoaded) { List siliconCompat = Arrays.asList("itemSilicon", "silicon"); for (String s : siliconCompat) { for (ItemStack ore : OreDictionary.getOres(s)) { From bf65b717ede12c652d621331c31c0e0645f32192 Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Sat, 16 Sep 2023 16:18:45 +0200 Subject: [PATCH 4/5] Bump Version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6ec5fa50c21..8e039415019 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ FMP_version=1.2.0.345 CCLIB_version=1.1.3.141 NEI_version=1.0.5.120 CCC_version=1.0.7.48 -mod_version=9.10.30 -alt_version=9, 10, 30 +mod_version=9.10.31 +alt_version=9, 10, 31 From ca17e3bdf09820450c69106faa55ac81705ba635 Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Sat, 16 Sep 2023 16:31:00 +0200 Subject: [PATCH 5/5] Rework SiliconCompat Checks --- src/main/java/mekanism/common/Mekanism.java | 10 ---------- .../mekanism/common/integration/OreDictManager.java | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 07e773bb5a6..6f3549603a8 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -212,8 +212,6 @@ public class Mekanism public static Set activeVibrators = new HashSet(); - public static boolean isSiliconLoaded; - /** * Adds all in-game crafting, smelting and machine recipes. */ @@ -1492,14 +1490,6 @@ public void init(FMLInitializationEvent event) } } } - //Silicon Module - if (MekanismConfig.mekce.enableSiliconCompat) - { - if (Loader.isModLoaded("EnderIO") || Loader.isModLoaded("GalacticraftCore") || Loader.isModLoaded("ProjRed|Core")) { - if (OreDictionary.doesOreNameExist("itemSilicon") || OreDictionary.doesOreNameExist("silicon")) - isSiliconLoaded = true; - } - } //Integrate certain OreDictionary recipes registerOreDict(); diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index b4f01117bee..21d60540966 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -1,5 +1,6 @@ package mekanism.common.integration; +import cpw.mods.fml.common.Loader; import ic2.api.recipe.RecipeInputOreDict; import ic2.api.recipe.Recipes; @@ -195,7 +196,7 @@ public static void init() { })); } - if (Mekanism.isSiliconLoaded) { + if (MekanismConfig.mekce.enableSiliconCompat && (Loader.isModLoaded("EnderIO") || Loader.isModLoaded("GalacticraftCore") || Loader.isModLoaded("ProjRed|Core"))) { List siliconCompat = Arrays.asList("itemSilicon", "silicon"); for (String s : siliconCompat) { for (ItemStack ore : OreDictionary.getOres(s)) {