diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index c0f675ea5..392978890 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -307,6 +307,18 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 4), new Object[] { "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 5) })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 12), new Object[] { + "***", "***", "***", Character.valueOf('*'), "ingotCopper" + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 5), new Object[] { + "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 12) + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 13), new Object[] { + "***", "***", "***", Character.valueOf('*'), "ingotTin" + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 6), new Object[] { + "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 13) + })); //Base Recipes CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianTNT, 1), new Object[] { @@ -642,9 +654,11 @@ public class Mekanism OreDictionary.registerOre("blockOsmium", new ItemStack(BasicBlock, 1, 0)); OreDictionary.registerOre("blockBronze", new ItemStack(BasicBlock, 1, 1)); OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(BasicBlock, 1, 2)); - OreDictionary.registerOre("blockCoal", new ItemStack(BasicBlock, 1, 3)); + OreDictionary.registerOre("blockCharcoal", new ItemStack(BasicBlock, 1, 3)); OreDictionary.registerOre("blockRefinedGlowstone", new ItemStack(BasicBlock, 1, 4)); OreDictionary.registerOre("blockSteel", new ItemStack(BasicBlock, 1, 5)); + OreDictionary.registerOre("blockCopper", new ItemStack(BasicBlock, 1, 12)); + OreDictionary.registerOre("blockTin", new ItemStack(BasicBlock, 1, 13)); OreDictionary.registerOre("dustDirtyIron", new ItemStack(DirtyDust, 1, 0)); OreDictionary.registerOre("dustDirtyGold", new ItemStack(DirtyDust, 1, 1)); diff --git a/common/mekanism/common/block/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java index 6914a9ba2..206e0d082 100644 --- a/common/mekanism/common/block/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -58,6 +58,8 @@ import cpw.mods.fml.relauncher.SideOnly; * 9: Dynamic Tank * 10: Dynamic Glass * 11: Dynamic Valve + * 12: Copper Block + * 13: Tin Block * @author AidanBrady * */ @@ -109,6 +111,8 @@ public class BlockBasic extends Block icons[9][0] = register.registerIcon("mekanism:DynamicTank"); icons[10][0] = register.registerIcon("mekanism:DynamicGlass"); icons[11][0] = register.registerIcon("mekanism:DynamicValve"); + icons[12][0] = register.registerIcon("mekanism:CopperBlock"); + icons[13][0] = register.registerIcon("mekanism:TinBlock"); glassRenderer.registerIcons(register); } @@ -189,6 +193,8 @@ public class BlockBasic extends Block list.add(new ItemStack(i, 1, 9)); list.add(new ItemStack(i, 1, 10)); list.add(new ItemStack(i, 1, 11)); + list.add(new ItemStack(i, 1, 12)); + list.add(new ItemStack(i, 1, 13)); } @Override diff --git a/common/mekanism/common/item/ItemBlockBasic.java b/common/mekanism/common/item/ItemBlockBasic.java index 9d00fcd6c..378c27946 100644 --- a/common/mekanism/common/item/ItemBlockBasic.java +++ b/common/mekanism/common/item/ItemBlockBasic.java @@ -32,6 +32,8 @@ import cpw.mods.fml.relauncher.SideOnly; * 9: Dynamic Tank * 10: Dynamic Glass * 11: Dynamic Valve + * 12: Copper Block + * 13: Tin Block * @author AidanBrady * */ @@ -191,6 +193,12 @@ public class ItemBlockBasic extends ItemBlock case 11: name = "DynamicValve"; break; + case 12: + name = "CopperBlock"; + break; + case 13: + name = "TinBlock"; + break; default: name = "Unknown"; break; diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index 5a1ee79e5..f9718c78f 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -39,6 +39,8 @@ tile.BasicBlock.SteelCasing.name=Steel Casing tile.BasicBlock.DynamicTank.name=Dynamic Tank tile.BasicBlock.DynamicGlass.name=Dynamic Glass tile.BasicBlock.DynamicValve.name=Dynamic Valve +tile.BasicBlock.CopperBlock.name=Copper Block +tile.BasicBlock.TinBlock.name=Tin Block //Machine Block tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber diff --git a/resources/assets/mekanism/textures/blocks/BronzeBlock copy.png b/resources/assets/mekanism/textures/blocks/BronzeBlock copy.png new file mode 100644 index 000000000..edc72e637 Binary files /dev/null and b/resources/assets/mekanism/textures/blocks/BronzeBlock copy.png differ diff --git a/resources/assets/mekanism/textures/blocks/SolarGeneratorSide.png b/resources/assets/mekanism/textures/blocks/CopperBlock.png similarity index 76% rename from resources/assets/mekanism/textures/blocks/SolarGeneratorSide.png rename to resources/assets/mekanism/textures/blocks/CopperBlock.png index bf8a8ed33..069f48d32 100644 Binary files a/resources/assets/mekanism/textures/blocks/SolarGeneratorSide.png and b/resources/assets/mekanism/textures/blocks/CopperBlock.png differ diff --git a/resources/assets/mekanism/textures/blocks/GasTankFront.png b/resources/assets/mekanism/textures/blocks/GasTankFront.png deleted file mode 100644 index 77a8b1905..000000000 Binary files a/resources/assets/mekanism/textures/blocks/GasTankFront.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/GasTankSide.png b/resources/assets/mekanism/textures/blocks/GasTankSide.png deleted file mode 100644 index 73c2a985b..000000000 Binary files a/resources/assets/mekanism/textures/blocks/GasTankSide.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/ObsidianTNTBottom.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTBottom.png deleted file mode 100644 index db6a5eab8..000000000 Binary files a/resources/assets/mekanism/textures/blocks/ObsidianTNTBottom.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/ObsidianTNTSide.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTSide.png deleted file mode 100644 index a12d9c502..000000000 Binary files a/resources/assets/mekanism/textures/blocks/ObsidianTNTSide.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/ObsidianTNTTop.png b/resources/assets/mekanism/textures/blocks/ObsidianTNTTop.png deleted file mode 100644 index 878871c5f..000000000 Binary files a/resources/assets/mekanism/textures/blocks/ObsidianTNTTop.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/SolarGeneratorFront.png b/resources/assets/mekanism/textures/blocks/SolarGeneratorFront.png deleted file mode 100644 index 6b8a2110b..000000000 Binary files a/resources/assets/mekanism/textures/blocks/SolarGeneratorFront.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/SolarGeneratorTop.png b/resources/assets/mekanism/textures/blocks/SolarGeneratorTop.png deleted file mode 100644 index ae32071b3..000000000 Binary files a/resources/assets/mekanism/textures/blocks/SolarGeneratorTop.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/blocks/GasTankTop.png b/resources/assets/mekanism/textures/blocks/TinBlock.png similarity index 75% rename from resources/assets/mekanism/textures/blocks/GasTankTop.png rename to resources/assets/mekanism/textures/blocks/TinBlock.png index b52567be6..6fb0c94b5 100644 Binary files a/resources/assets/mekanism/textures/blocks/GasTankTop.png and b/resources/assets/mekanism/textures/blocks/TinBlock.png differ diff --git a/resources/assets/mekanism/textures/items/wire.aluminum.png b/resources/assets/mekanism/textures/items/wire.aluminum.png deleted file mode 100644 index 503fdb1af..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.aluminum.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/items/wire.copper.png b/resources/assets/mekanism/textures/items/wire.copper.png deleted file mode 100644 index 7e414b521..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.copper.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/items/wire.iron.png b/resources/assets/mekanism/textures/items/wire.iron.png deleted file mode 100644 index 075c52e7c..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.iron.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/items/wire.silver.png b/resources/assets/mekanism/textures/items/wire.silver.png deleted file mode 100644 index 43a7598ea..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.silver.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/items/wire.superconductor.png b/resources/assets/mekanism/textures/items/wire.superconductor.png deleted file mode 100644 index 73bf0e7f0..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.superconductor.png and /dev/null differ diff --git a/resources/assets/mekanism/textures/items/wire.tin.png b/resources/assets/mekanism/textures/items/wire.tin.png deleted file mode 100644 index 654dccfcd..000000000 Binary files a/resources/assets/mekanism/textures/items/wire.tin.png and /dev/null differ