Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

Conflicts:
	resources/assets/briefcasespeakers/lang/en_US.lang

1 files changed, 21 insertions, 0 deletions

diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java
new file mode 100644
index 0000000..c340da6
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/block/BlockList.java
@@ -0,0 +1,21 @@
+package bspkrs.briefcasespeakers.block;
+
+import bspkrs.briefcasespeakers.config.ConfigHandler;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class BlockList
+{
+    public static Block    shadowOre;
+    
+    private static boolean isInitialized = false;
+    
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        if (!isInitialized)
+        {
+            shadowOre = new Block(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setTextureName("briefcasespeakers:shadowOre");
+        }
+    }
+}