diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 6c2015936..69bd3debe 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -196,6 +196,7 @@ public class MekanismConfig public static class recipes { public static boolean enableOsmiumBlock = true; + public static boolean enableRawOsmiumBlock = true; public static boolean enableBronzeBlock = true; public static boolean enableRefinedObsidianBlock = true; public static boolean enableCharcoalBlock = true; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 0aa65aa59..7477d4bfb 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -412,6 +412,7 @@ public class CommonProxy implements IGuiProvider Tier.loadConfig(); recipes.enableOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableOsmiumBlock", true).getBoolean(); + recipes.enableRawOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableRawOsmiumBlock", true).getBoolean(); 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(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 9e6be893a..08a5d4ddd 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -249,6 +249,12 @@ public class Mekanism })); } + if (MekanismConfig.recipes.enableRawOsmiumBlock){ + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.RawOsmiumOre, 9, 1), new Object[]{ + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 10) + })); + } + if (MekanismConfig.recipes.enableBronzeBlock) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), new Object[]{ "***", "***", "***", Character.valueOf('*'), "ingotBronze" @@ -1266,6 +1272,7 @@ public class Mekanism OreDictionary.registerOre("ingotRefinedLapis", new ItemStack(MekanismItems.Ingot, 1, 7)); OreDictionary.registerOre("block" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); + OreDictionary.registerOre("blockRaw" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock2, 1, 10)); 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)); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index cea6e5be7..3ca6dd165 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -100,6 +100,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:7: Boiler Casing * 1:8: Boiler Valve * 1:9: Security Desk + * 1:10: Raw Osmium Block * @author AidanBrady * */ @@ -258,6 +259,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[8][0] = ctms[8][0].mainTextureData.icon; icons[9][0] = register.registerIcon(ICON_BASE); + + icons[10][0] = register.registerIcon("mekanism:RawOsmiumBlock"); break; } @@ -1130,7 +1133,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true), BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true), - SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true); + SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true), + RAW_OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_2, 10, "RawOsmiumBlock", null, false); public BasicBlock typeBlock; public int meta; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 8afbdb185..e9bf8ed99 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -123,6 +123,11 @@ public final class OreDictManager "XXX", "XXX", "XXX", Character.valueOf('X'), "ingot" + mekanismMaterial })); } + if (MekanismConfig.recipes.enableRawOsmiumBlock) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 10), new Object[]{ + "XXX", "XXX", "XXX", Character.valueOf('X'), "raw" + mekanismMaterial + })); + } 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" + mekanismMaterial diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index c1eb9e65a..a2e084ffc 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -120,6 +120,7 @@ public class PacketConfigSync implements IMessageHandler