tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
Mekanism-tilera-Edition/src/main/java/mekanism/common/MekanismBlocks.java

79 lines
4.6 KiB
Java
Raw Normal View History

Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
package mekanism.common;
import mekanism.common.block.BlockBasic;
import mekanism.common.block.BlockBounding;
import mekanism.common.block.BlockCardboardBox;
import mekanism.common.block.BlockEnergyCube;
import mekanism.common.block.BlockGasTank;
import mekanism.common.block.BlockMachine;
import mekanism.common.block.BlockObsidianTNT;
import mekanism.common.block.BlockOre;
import mekanism.common.block.BlockPlastic;
import mekanism.common.block.BlockPlasticFence;
import mekanism.common.block.BlockSalt;
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.
2014-08-03 21:21:07 +02:00
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;
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
import net.minecraft.block.Block;
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.
2014-08-03 21:21:07 +02:00
import cpw.mods.fml.common.registry.GameRegistry;
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
Re-organise imports. I went for what seemed like a good level of organisation: Java __________ Mekanism __________ Minecraft Forge FML __________ Netty LWJGL __________ Other APIs __________ Static Imports.
2014-09-03 20:00:03 +02:00
import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1;
import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2;
import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3;
Clean up Machine and Basic Blocks a bit. Got rid of the direct object equality testing, and introduce enums that we can switch through when needed.
2014-09-03 01:09:47 +02:00
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
@ObjectHolder("Mekanism")
public class MekanismBlocks
{
Clean up Machine and Basic Blocks a bit. Got rid of the direct object equality testing, and introduce enums that we can switch through when needed.
2014-09-03 01:09:47 +02:00
public static final Block BasicBlock = new BlockBasic(BASIC_BLOCK_1).setBlockName("BasicBlock");
public static final Block BasicBlock2 = new BlockBasic(BASIC_BLOCK_2).setBlockName("BasicBlock2");
public static final Block MachineBlock = new BlockMachine(MACHINE_BLOCK_1).setBlockName("MachineBlock");
public static final Block MachineBlock2 = new BlockMachine(MACHINE_BLOCK_2).setBlockName("MachineBlock2");
public static final Block MachineBlock3 = new BlockMachine(MACHINE_BLOCK_3).setBlockName("MachineBlock3");
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
public static final Block OreBlock = new BlockOre().setBlockName("OreBlock");
public static final Block ObsidianTNT = new BlockObsidianTNT().setBlockName("ObsidianTNT").setCreativeTab(Mekanism.tabMekanism);
public static final Block EnergyCube = new BlockEnergyCube().setBlockName("EnergyCube");
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");
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.
2014-08-03 21:21:07 +02:00
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");
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
public static final Block SaltBlock = new BlockSalt().setBlockName("SaltBlock");
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.
2014-08-03 21:21:07 +02:00
/**
* 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");
Clean up Machine and Basic Blocks a bit. Got rid of the direct object equality testing, and introduce enums that we can switch through when needed.
2014-09-03 01:09:47 +02:00
GameRegistry.registerBlock(MachineBlock3, ItemBlockMachine.class, "MachineBlock3");
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.
2014-08-03 21:21:07 +02:00
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");
Add recipe and ItemBlock to plastic barriers.
2014-09-02 21:29:09 +02:00
GameRegistry.registerBlock(PlasticFence, ItemBlockPlastic.class, "PlasticFence");
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.
2014-08-03 21:21:07 +02:00
GameRegistry.registerBlock(SaltBlock, "SaltBlock");
}
Make the mod classes significantly less godlike. Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:58:12 +02:00
}
Reference in a new issue Copy permalink