Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first.

This commit is contained in:
Ben Spiers committed 2014-08-03 20:27:20 +01:00
1 parent 2048083e11
commit 14852b0b5d
17 files changed
+388 -369

No files matched your search

@@ -11,8 +11,16 @@ import mekanism.common.block.BlockOre;
import mekanism.common.block.BlockPlastic;
import mekanism.common.block.BlockPlasticFence;
import mekanism.common.block.BlockSalt;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockCardboardBox;
import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockOre;
import mekanism.common.item.ItemBlockPlastic;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("Mekanism")
@@ -28,11 +36,35 @@ public class MekanismBlocks
public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock");
public static final Block GasTank = new BlockGasTank().setBlockName("GasTank");
public static final Block CardboardBox = new BlockCardboardBox().setBlockName("CardboardBox");
public static final Block BlockHDPE = new BlockPlastic().setBlockName("PlasticBlock");
public static final Block BlockSlickHDPE = new BlockPlastic().setBlockName("SlickPlasticBlock");
public static final Block BlockGlowHDPE = new BlockPlastic().setBlockName("GlowPlasticBlock");
public static final Block BlockReinforcedHDPE = new BlockPlastic().setBlockName("ReinforcedPlasticBlock");
public static final Block BlockRoadHDPE = new BlockPlastic().setBlockName("RoadPlasticBlock");
public static final Block BlockHDPEFence = new BlockPlasticFence().setBlockName("PlasticFence");
public static final Block PlasticBlock = new BlockPlastic().setBlockName("PlasticBlock");
public static final Block SlickPlasticBlock = new BlockPlastic().setBlockName("SlickPlasticBlock");
public static final Block GlowPlasticBlock = new BlockPlastic().setBlockName("GlowPlasticBlock");
public static final Block ReinforcedPlasticBlock = new BlockPlastic().setBlockName("ReinforcedPlasticBlock");
public static final Block RoadPlasticBlock = new BlockPlastic().setBlockName("RoadPlasticBlock");
public static final Block PlasticFence = new BlockPlasticFence().setBlockName("PlasticFence");
public static final Block SaltBlock = new BlockSalt().setBlockName("SaltBlock");
/**
* Adds and registers all blocks.
*/
public static void register()
{
GameRegistry.registerBlock(BasicBlock, ItemBlockBasic.class, "BasicBlock");
GameRegistry.registerBlock(BasicBlock2, ItemBlockBasic.class, "BasicBlock2");
GameRegistry.registerBlock(MachineBlock, ItemBlockMachine.class, "MachineBlock");
GameRegistry.registerBlock(MachineBlock2, ItemBlockMachine.class, "MachineBlock2");
GameRegistry.registerBlock(OreBlock, ItemBlockOre.class, "OreBlock");
GameRegistry.registerBlock(EnergyCube, ItemBlockEnergyCube.class, "EnergyCube");
GameRegistry.registerBlock(ObsidianTNT, "ObsidianTNT");
GameRegistry.registerBlock(BoundingBlock, "BoundingBlock");
GameRegistry.registerBlock(GasTank, ItemBlockGasTank.class, "GasTank");
GameRegistry.registerBlock(CardboardBox, ItemBlockCardboardBox.class, "CardboardBox");
GameRegistry.registerBlock(PlasticBlock, ItemBlockPlastic.class, "PlasticBlock");
GameRegistry.registerBlock(SlickPlasticBlock, ItemBlockPlastic.class, "SlickPlasticBlock");
GameRegistry.registerBlock(GlowPlasticBlock, ItemBlockPlastic.class, "GlowPlasticBlock");
GameRegistry.registerBlock(ReinforcedPlasticBlock, ItemBlockPlastic.class, "ReinforcedPlasticBlock");
GameRegistry.registerBlock(RoadPlasticBlock, ItemBlockPlastic.class, "RoadPlasticBlock");
GameRegistry.registerBlock(PlasticFence, "PlasticFence");
GameRegistry.registerBlock(SaltBlock, "SaltBlock");
}
}