Skip to content

Commit 060e972

Browse files
author
Marc Singer
committed
Fixed #23
Fixed NullPointerException
1 parent 0fce2c1 commit 060e972

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

common/com/nexized/cross/manager/blockManager.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ public class blockManager {
4747
public static Block furnanceFusionOn;
4848

4949
public static void init() {
50-
oreAluminum = new crossOre(emecConfigurationFile.oreAluminumID, Material.rock).setHardness(3.0F).setUnlocalizedName("oreAluminum").setCreativeTab(emec.tabEnhanceMeCraft);
50+
// TODO: This void can be removed
51+
/*
52+
new crossOre(emecConfigurationFile.oreAluminumID, Material.rock).setHardness(3.0F).setUnlocalizedName("oreAluminum").setCreativeTab(emec.tabEnhanceMeCraft);
5153
5254
MinecraftForge.setBlockHarvestLevel(oreAluminum, "pickaxe", 2);
5355
GameRegistry.registerBlock(oreAluminum, oreAluminum.getUnlocalizedName());
54-
56+
*/
5557
}
5658

5759
public static void addBlocks(idManager idm, CreativeTabs tab)
@@ -61,7 +63,7 @@ public static void addBlocks(idManager idm, CreativeTabs tab)
6163
float blockResistance = 12.0F;
6264

6365
// @oreBlocks
64-
66+
oreAluminum = new crossOre(idm.getBlockID("oreAluminum"), Materiak.rock, tab).setHardness(3.0F).setResistance(oreResistance).setUnlocalizedName("oreAluminum");
6567
oreCopper = new crossOre(idm.getBlockID("oreCopper"), Material.rock, tab).setHardness(1.7F).setResistance(oreResistance).setUnlocalizedName("oreCopper");
6668
orePlatinum = new crossOre(idm.getBlockID("orePlatinum"), Material.rock, tab).setHardness(5.0F).setResistance(oreResistance).setUnlocalizedName("orePlatinum");
6769
oreSilver = new crossOre(idm.getBlockID("oreSilver"), Material.rock, tab).setHardness(3.0F).setResistance(oreResistance).setUnlocalizedName("oreSilver");
@@ -90,15 +92,15 @@ public static void addBlocks(idManager idm, CreativeTabs tab)
9092

9193
public static void registerBlocks() {
9294
// @setBlockHarvestLevel
93-
95+
MinecraftForge.setBlockHarvestLevel(oreAluminum, "pickaxe", 2);
9496
MinecraftForge.setBlockHarvestLevel(oreCopper, "pickaxe", 1);
9597
MinecraftForge.setBlockHarvestLevel(orePlatinum, "pickaxe", 3);
9698
MinecraftForge.setBlockHarvestLevel(oreSilver, "pickaxe", 2);
9799
MinecraftForge.setBlockHarvestLevel(oreTin, "pickaxe", 1);
98100
MinecraftForge.setBlockHarvestLevel(oreExperience, "pickaxe", 2);
99101

100102
// registerBlocks
101-
103+
GameRegistry.registerBlock(oreAluminum, oreAluminum.getUnlocalizedName());
102104
GameRegistry.registerBlock(oreCopper, oreCopper.getUnlocalizedName());
103105
GameRegistry.registerBlock(orePlatinum, orePlatinum.getUnlocalizedName());
104106
GameRegistry.registerBlock(oreSilver, oreSilver.getUnlocalizedName());

0 commit comments

Comments
 (0)