Merge pull request #50 from Thorfusion/ExtraMaterials

Extra materials
Thorfusion · Nov 11, 2022 · e2afd2c · e2afd2c
2 parents 4d93b2f + 33ed274
commit e2afd2c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
@@ -404,7 +404,7 @@ else if(s.trim().equalsIgnoreCase("a") || s.trim().equalsIgnoreCase("ambient") |
 		recipes.enableBronzeBlock = Mekanism.configurationrecipes.get("Recipes","enableBronzeBlock", true).getBoolean();
 		recipes.enableRefinedObsidianBlock = Mekanism.configurationrecipes.get("Recipes","enableRefinedObsidianBlock", true).getBoolean();
 		recipes.enableCharcoalBlock = Mekanism.configurationrecipes.get("Recipes","enableCharcoalBlock", true).getBoolean();
-		recipes.enableRefinedGlowstoneBlock = Mekanism.configurationrecipes.get("Recipes","enableSteelBlock", true).getBoolean();
+		recipes.enableRefinedGlowstoneBlock = Mekanism.configurationrecipes.get("Recipes","enableGlowstoneBlock", true).getBoolean();
 		recipes.enableSteelBlock = Mekanism.configurationrecipes.get("Recipes","enableSteelBlock", true).getBoolean();
 		recipes.enableCopperBlock = Mekanism.configurationrecipes.get("Recipes","enableCopperBlock", true).getBoolean();
 		recipes.enableTinBlock = Mekanism.configurationrecipes.get("Recipes","enableTinBlock", true).getBoolean();

diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
@@ -1060,6 +1060,7 @@ public void addRecipes()
 
 		//Osmium Compressor Recipes
 		RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(MekanismItems.Ingot, 1, 3));
+		RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.dye,1, 4), new ItemStack(MekanismItems.Ingot, 1, 7));
 
 		//Crusher Recipes
 		RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.OtherDust, 1, 0));
@@ -1280,6 +1281,7 @@ public void registerOreDict()
 		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("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1));
@@ -1470,6 +1472,7 @@ public void preInit(FMLPreInitializationEvent event)
 		InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio"));
 		InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian"));
 		InfuseRegistry.registerInfuseType(new InfuseType("ENDER", "mekanism:infuse/Ender").setUnlocalizedName("ender"));
+		InfuseRegistry.registerInfuseType(new InfuseType("LEAD", "mekanism:infuse/Lead").setUnlocalizedName("lead"));
 	}
 
 	@EventHandler

diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java
@@ -392,6 +392,11 @@ public static void init() {
 			InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("TIN"), 50));
 		}
 
+		for(ItemStack ore : OreDictionary.getOres("dustLead"))
+		{
+			InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("LEAD"), 50));
+		}
+
 		try {
 			for(ItemStack ore : OreDictionary.getOres("treeSapling"))
 			{

diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java
@@ -14,7 +14,7 @@ public class ItemIngot extends ItemMekanism
 
 	public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", 
 										"Glowstone", "Steel", "Copper", 
-										"Tin"};
+										"Tin", "Lazuli"};
 
 	public ItemIngot()
 	{
@@ -25,7 +25,7 @@ public ItemIngot()
 	@Override
 	public void registerIcons(IIconRegister register)
 	{
-		for(int i = 0; i <= 6; i++)
+		for(int i = 0; i <= 7; i++)
 		{
 			icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Ingot");
 		}
@@ -40,7 +40,7 @@ public IIcon getIconFromDamage(int meta)
 	@Override
 	public void getSubItems(Item item, CreativeTabs tabs, List itemList)
 	{
-		for(int counter = 0; counter <= 6; counter++)
+		for(int counter = 0; counter <= 7; counter++)
 		{
 			itemList.add(new ItemStack(item, 1, counter));
 		}

diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -179,6 +179,7 @@ infuse.fungi=Fungi
 infuse.obsidian=Obsidian
 infuse.bio=Biomass
 infuse.ender=Ender
+infuse.lead=Lead
 
 //Ore Block
 tile.OreBlock.OsmiumOre.name=Osmium Ore
@@ -284,6 +285,8 @@ item.glowstoneIngot.name=Glowstone Ingot
 item.steelIngot.name=Steel Ingot
 item.copperIngot.name=Copper Ingot
 item.tinIngot.name=Tin Ingot
+item.lazuliIngot.name=Lazuli Ingot
+
 
 //Gasses
 gas.hydrogen=Hydrogen

diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Lead.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Lead.png
diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliIngot.png b/src/main/resources/assets/mekanism/textures/items/LazuliIngot.png