diff --git a/src/main/java/taintedmagic/common/blocks/BlockShadowmetal.java b/src/main/java/taintedmagic/common/blocks/BlockShadowmetal.java deleted file mode 100644 index b9d836f..0000000 --- a/src/main/java/taintedmagic/common/blocks/BlockShadowmetal.java +++ /dev/null @@ -1,25 +0,0 @@ -package taintedmagic.common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.world.IBlockAccess; -import taintedmagic.common.TaintedMagic; - -public class BlockShadowmetal extends Block -{ - public BlockShadowmetal () - { - super(Material.iron); - this.setHardness(5.0F); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); - this.setBlockTextureName("taintedmagic:BlockShadowmetal"); - this.setBlockName("BlockShadowmetal"); - this.setStepSound(soundTypeMetal); - } - - @Override - public boolean isBeaconBase (IBlockAccess world, int x, int y, int z, int x2, int y2, int z2) - { - return true; - } -} diff --git a/src/main/java/taintedmagic/common/registry/BlockRegistry.java b/src/main/java/taintedmagic/common/registry/BlockRegistry.java index 7e8f8cc..902dcd9 100644 --- a/src/main/java/taintedmagic/common/registry/BlockRegistry.java +++ b/src/main/java/taintedmagic/common/registry/BlockRegistry.java @@ -5,7 +5,6 @@ import net.minecraft.block.Block; import taintedmagic.common.blocks.BlockLumos; import taintedmagic.common.blocks.BlockNightshadeBush; import taintedmagic.common.blocks.BlockShadowOre; -import taintedmagic.common.blocks.BlockShadowmetal; import taintedmagic.common.blocks.BlockWarpwoodLeaves; import taintedmagic.common.blocks.BlockWarpwoodLog; import taintedmagic.common.blocks.BlockWarpwoodPlanks; @@ -15,7 +14,6 @@ import taintedmagic.common.blocks.tile.TileLumos; public class BlockRegistry { public static Block BlockShadowOre; - public static Block BlockShadowmetal; public static Block BlockWarpwoodLog; public static Block BlockWarpwoodLeaves; @@ -30,9 +28,6 @@ public class BlockRegistry BlockShadowOre = new BlockShadowOre(); GameRegistry.registerBlock(BlockShadowOre, "BlockShadowOre"); - BlockShadowmetal = new BlockShadowmetal(); - GameRegistry.registerBlock(BlockShadowmetal, "BlockShadowmetal"); - BlockWarpwoodLog = new BlockWarpwoodLog(); GameRegistry.registerBlock(BlockWarpwoodLog, "BlockWarpwoodLog"); diff --git a/src/main/java/taintedmagic/common/registry/OreDictRegistry.java b/src/main/java/taintedmagic/common/registry/OreDictRegistry.java index da9cff2..59e534f 100644 --- a/src/main/java/taintedmagic/common/registry/OreDictRegistry.java +++ b/src/main/java/taintedmagic/common/registry/OreDictRegistry.java @@ -12,6 +12,5 @@ public class OreDictRegistry OreDictionary.registerOre("treeSapling", new ItemStack(BlockRegistry.BlockWarpwoodSapling)); OreDictionary.registerOre("ingotShadow", new ItemStack(ItemRegistry.ItemMaterial)); OreDictionary.registerOre("plankWood", new ItemStack(BlockRegistry.BlockWarpwoodPlanks)); - OreDictionary.registerOre("blockShadow", new ItemStack(BlockRegistry.BlockShadowmetal)); } } diff --git a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java index 1bb2914..539927b 100644 --- a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java +++ b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java @@ -30,18 +30,10 @@ public class RecipeRegistry */ public static void initCrafting () { - // Shadow Metal Block - GameRegistry.addShapedRecipe(new ItemStack(BlockRegistry.BlockShadowmetal), "AAA", "AAA", "AAA", 'A', - new ItemStack(ItemRegistry.ItemMaterial)); - // Shadow Metal Ingot from nuggets GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ItemMaterial, 1, 0), "AAA", "AAA", "AAA", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 8)); - // Shadow Metal Ingots from block - GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9), "A", 'A', - new ItemStack(BlockRegistry.BlockShadowmetal)); - // Shadow Metal Nuggets GameRegistry.addRecipe(new ItemStack(ItemRegistry.ItemMaterial, 9, 8), "A", 'A', new ItemStack(ItemRegistry.ItemMaterial, 1, 0)); @@ -135,11 +127,10 @@ public class RecipeRegistry "VOIDSASH", new ItemStack(ItemRegistry.ItemVoidwalkerSash, 1), 7, new AspectList().add(Aspect.VOID, 56) .add(Aspect.MAGIC, 40).add(Aspect.ARMOR, 66).add(Aspect.TRAVEL, 16).add(Aspect.FLIGHT, 10), new ItemStack(ConfigItems.itemGirdleRunic), - new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), - new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial), - new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial, 1, 1), - new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ItemRegistry.ItemMaterial), - new ItemStack(ConfigItems.itemResource, 1, 16), })); + new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 10), new ItemStack(Items.iron_ingot), + new ItemStack(ItemRegistry.ItemMaterial), new ItemStack(ConfigItems.itemResource, 1, 16), + new ItemStack(ItemRegistry.ItemMaterial, 1, 1), new ItemStack(Items.iron_ingot), + new ItemStack(ItemRegistry.ItemMaterial), new ItemStack(ConfigItems.itemResource, 1, 16), })); // Shard of Creation ResearchRegistry.recipes.put("ItemMaterial:5", @@ -353,7 +344,7 @@ public class RecipeRegistry new AspectList().add(Aspect.METAL, 28).add(Aspect.ARMOR, 20).add(Aspect.MAGIC, 12).add(Aspect.DARKNESS, 30) .add(Aspect.VOID, 22), new ItemStack(ConfigItems.itemHelmetVoid), - new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), + new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), new ItemStack(Items.emerald) })); // Shadow Fortress Chestplate @@ -361,8 +352,8 @@ public class RecipeRegistry new ItemStack(ItemRegistry.ItemShadowFortressChestplate), 7, new AspectList().add(Aspect.METAL, 38) .add(Aspect.ARMOR, 26).add(Aspect.MAGIC, 18).add(Aspect.DARKNESS, 34).add(Aspect.VOID, 26), new ItemStack(ConfigItems.itemChestVoid), - new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), - new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), + new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 0), + new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) })); // Shadow Fortress Leggings @@ -371,8 +362,8 @@ public class RecipeRegistry new ItemStack(ItemRegistry.ItemShadowFortressLeggings), 7, new AspectList().add(Aspect.METAL, 32) .add(Aspect.ARMOR, 24).add(Aspect.MAGIC, 16).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 24), new ItemStack(ConfigItems.itemLegsVoid), - new ItemStack[]{ new ItemStack(BlockRegistry.BlockShadowmetal), - new ItemStack(BlockRegistry.BlockShadowmetal), new ItemStack(BlockRegistry.BlockShadowmetal), + new ItemStack[]{ new ItemStack(ItemRegistry.ItemMaterial, 1, 0), + new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(ItemRegistry.ItemMaterial, 1, 0), new ItemStack(Items.gold_ingot), new ItemStack(Items.leather) })); // Thaumium Fortress Blade diff --git a/src/main/resources/assets/taintedmagic/textures/blocks/BlockShadowmetal.png b/src/main/resources/assets/taintedmagic/textures/blocks/BlockShadowmetal.png deleted file mode 100644 index df0ffff..0000000 Binary files a/src/main/resources/assets/taintedmagic/textures/blocks/BlockShadowmetal.png and /dev/null differ