Merge pull request #142 from Thorfusion/Cleaner-Plat-Compat

Plat Compat Shenanigans
Thorfusion · Oct 15, 2023 · 2df7cd9 · 2df7cd9
2 parents 3eb98a1 + f3e4473
commit 2df7cd9
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 74 deletions.
diff --git 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.31
-alt_version=9, 10, 31
+mod_version=9.10.32
+alt_version=9, 10, 32
diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java
@@ -100,7 +100,8 @@ 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("liquid" + Resource.OSMIUM.getName()).setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
+			GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium"));
+			GasRegistry.getGas("liquidPlatinum").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/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
@@ -206,11 +206,14 @@ public class Mekanism
 
 	public static Set<Coord4D> activeVibrators = new HashSet<Coord4D>();
 
+
 	/**
 	 * Adds all in-game crafting, smelting and machine recipes.
 	 */
 	public void addRecipes()
 	{
+		String mekanismMaterial = Resource.OSMIUM.getOredictName();
+
 		//Storage Recipes
 
 		if (MekanismConfig.recipes.enableCharcoalBlock) {
@@ -814,7 +817,7 @@ public void addRecipes()
 				}));
 
 				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)
+						"ECE", "oOo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('o'), "ingot" + mekanismMaterial, Character.valueOf('O'), MekanismUtils.getFactory(FactoryTier.BASIC, type)
 				}));
 
 				MachineType.ELITE_FACTORY.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getFactory(FactoryTier.ELITE, type), new Object[]{
@@ -973,7 +976,7 @@ public void addRecipes()
 						new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust)
 				}));
 				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()
+						" P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dust" + mekanismMaterial
 				}));
 				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)
@@ -1216,6 +1219,8 @@ public int getBurnTime(ItemStack fuel)
 	 */
 	public void registerOreDict()
 	{
+		String mekanismMaterial = Resource.OSMIUM.getOredictName();
+
 		//Add specific items to ore dictionary for recipe usage in other mods.
 		OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0));
 		OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem());
@@ -1246,15 +1251,15 @@ 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("ingot" + mekanismMaterial, 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));
 		OreDictionary.registerOre("ingotCopper", new ItemStack(MekanismItems.Ingot, 1, 5));
 		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("block" + mekanismMaterial, 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));
@@ -1265,11 +1270,11 @@ public void registerOreDict()
 
 		for(Resource resource : Resource.values())
 		{
-			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("dust" + resource.getOredictName(), new ItemStack(MekanismItems.Dust, 1, resource.ordinal()));
+			OreDictionary.registerOre("dustDirty" + resource.getOredictName(), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal()));
+			OreDictionary.registerOre("clump" + resource.getOredictName(), new ItemStack(MekanismItems.Clump, 1, resource.ordinal()));
+			OreDictionary.registerOre("shard" + resource.getOredictName(), new ItemStack(MekanismItems.Shard, 1, resource.ordinal()));
+			OreDictionary.registerOre("crystal" + resource.getOredictName(), new ItemStack(MekanismItems.Crystal, 1, resource.ordinal()));
 		}
 
 		OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1));
@@ -1374,7 +1379,11 @@ public void preInit(FMLPreInitializationEvent event)
 		configurationrecipes = new Configuration(new File("config/mekanism/MekanismRecipes.cfg"));
 		configurationce = new Configuration(new File("config/mekanism/MekanismCE.cfg"));
 
-        //Register tier information
+		//Load configuration
+		proxy.loadConfiguration();
+		proxy.onConfigSync(false);
+
+		//Register tier information
         Tier.init();
 
 		GasRegistry.register(new Gas("hydrogen")).registerFluid();
@@ -1404,10 +1413,9 @@ public void preInit(FMLPreInitializationEvent event)
 		FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true));
 
 		for(Resource resource : Resource.values()) {
-			String name = resource.getName();
 
-			OreGas clean = (OreGas) GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false));
-			GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false));
+			OreGas clean = (OreGas) GasRegistry.register(new OreGas("clean" + resource.getOredictName(), "oregas." + resource.getOredictName().toLowerCase()).setVisible(false));
+			GasRegistry.register(new OreGas(resource.getOredictName().toLowerCase(), "oregas." + resource.getOredictName().toLowerCase()).setCleanGas(clean).setVisible(false));
 		}
 
 		//Register Gasifyable Items
@@ -1469,10 +1477,6 @@ public void init(FMLInitializationEvent event)
 		//Register with TransmitterNetworkRegistry
 		TransmitterNetworkRegistry.initiate();
 
-		//Load configuration
-		proxy.loadConfiguration();
-		proxy.onConfigSync(false);
-
 		//Add baby skeleton spawner
 		if(general.spawnBabySkeletons)
 		{

diff --git a/src/main/java/mekanism/common/Resource.java b/src/main/java/mekanism/common/Resource.java
@@ -1,12 +1,14 @@
 package mekanism.common;
 
-import static mekanism.api.MekanismConfig.mekce.PlatReplacement;
+import mekanism.api.MekanismConfig;
+
+import java.util.Objects;
 
 public enum Resource
 {
 	IRON("Iron"),
 	GOLD("Gold"),
-	OSMIUM(PlatReplacement ? "Platinum" : "Osmium"),
+	OSMIUM("Osmium"),
 	COPPER("Copper"),
 	TIN("Tin"),
 	SILVER("Silver"),
@@ -19,11 +21,17 @@ private Resource(String s)
 		name = s;
 	}
 
+	/**
+	 * Returns resource from a String.
+	 * Used to convert Oregas into their physical output
+	 *
+	 */
 	public static Resource getFromName(String s)
 	{
 		for(Resource r : values())
 		{
-			if(r.name.toLowerCase().equals(s.toLowerCase()))
+			String resourceName = r.getOredictName().toLowerCase();
+			if(resourceName.equals(s.toLowerCase()))
 			{
 				return r;
 			}
@@ -32,8 +40,24 @@ public static Resource getFromName(String s)
 		return null;
 	}
 
+	/**
+	 * Returns the name of a resource.
+	 *
+	 */
 	public String getName()
 	{
 		return name;
 	}
+
+	/**
+	 * Returns the oredictionary name of a resource.
+	 *
+	 */
+	public String getOredictName() {
+		String oreName = name;
+		if (MekanismConfig.mekce.PlatReplacement && Objects.equals(oreName, "Osmium"))
+			oreName = "Platinum";
+
+		return oreName;
+	}
 }
diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java
@@ -10,7 +10,6 @@
 import java.util.Map;
 
 import li.cil.oc.api.Driver;
-import mekanism.api.MekanismConfig;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismItems;
@@ -103,7 +102,7 @@ public void hookIC2Recipes()
 		try {
 			for(Resource resource : Resource.values())
 			{
-				Recipes.macerator.addRecipe(new RecipeInputOreDict("clump" + resource.getName()), null, new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal()));
+				Recipes.macerator.addRecipe(new RecipeInputOreDict("clump" + resource.getOredictName()), null, new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal()));
 			}
 		} catch(Exception e) {}