From 6206f965ea028c216ac4de7e41e36b2ff897b817 Mon Sep 17 00:00:00 2001 From: Mary Date: Sat, 12 Sep 2015 21:19:21 -0700 Subject: [PATCH] Fix oredictionary registrations that were previously ignored as invalid --- .../fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java | 3 --- .../java/fox/spiteful/avaritia/blocks/BlockResource.java | 2 -- .../java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java | 6 ++++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java index d1c0e85..32bd638 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java @@ -4,9 +4,7 @@ import fox.spiteful.avaritia.Avaritia; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.oredict.OreDictionary; public class BlockCrystalMatrix extends Block { @@ -19,7 +17,6 @@ public class BlockCrystalMatrix extends Block { setHarvestLevel("pickaxe", 3); setBlockTextureName("avaritia:block_crystal_matrix"); setCreativeTab(Avaritia.tab); - OreDictionary.registerOre("blockCrystalMatrix", new ItemStack(this, 1, 0)); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java index b1647be..0d0ae56 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java @@ -30,8 +30,6 @@ public class BlockResource extends Block { setBlockName("avaritia_resource"); setHarvestLevel("pickaxe", 3); setCreativeTab(Avaritia.tab); - OreDictionary.registerOre("blockCosmicNeutronium", new ItemStack(this, 1, 0)); - OreDictionary.registerOre("blockInfinity", new ItemStack(this, 1, 1)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index f078bde..f7223a2 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -6,6 +6,9 @@ import fox.spiteful.avaritia.tile.TileEntityCompressor; import fox.spiteful.avaritia.tile.TileEntityDireCrafting; import fox.spiteful.avaritia.tile.TileEntityNeutron; import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + public class LudicrousBlocks { @@ -33,7 +36,10 @@ public class LudicrousBlocks { return; crystal_matrix = GameRegistry.registerBlock(new BlockCrystalMatrix(), "Crystal_Matrix"); + OreDictionary.registerOre("blockCrystalMatrix", new ItemStack(crystal_matrix, 1, 0)); resource_block = GameRegistry.registerBlock(new BlockResource(), ItemBlockResource.class, "Resource_Block"); + OreDictionary.registerOre("blockCosmicNeutronium", new ItemStack(resource_block, 1, 0)); + OreDictionary.registerOre("blockInfinity", new ItemStack(resource_block, 1, 1)); neutron_collector = GameRegistry.registerBlock(new BlockNeutronCollector(), "Neutron_Collector"); GameRegistry.registerTileEntity(TileEntityNeutron.class, "Avaritia_Neutron"); compressor = GameRegistry.registerBlock(new BlockCompressor(), "Neutronium_Compressor");