Sounds work, got rid of the error logs. Still a ton of strange functionality

This commit is contained in:
aidancbrady committed 2016-05-26 12:35:37 -04:00
1 parent ceec3e71e9
commit 2c39f6a689
16 files changed
+313 -329

No files matched your search

@@ -1,10 +1,8 @@
package mekanism.generators.common;
import static mekanism.common.MekanismBlocks.init;
import static mekanism.generators.common.block.states.BlockStateGenerator.GeneratorBlock.GENERATOR_BLOCK_1;
import static mekanism.generators.common.block.states.BlockStateReactor.ReactorBlock.REACTOR_BLOCK;
import static mekanism.generators.common.block.states.BlockStateReactor.ReactorBlock.REACTOR_GLASS;
import mekanism.common.MekanismItems;
import mekanism.generators.common.block.BlockGenerator;
import mekanism.generators.common.block.BlockReactor;
import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorBlockStateMapper;
@@ -20,22 +18,22 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@ObjectHolder("MekanismGenerators")
public class GeneratorsBlocks
{
public static final Block Generator = init(BlockGenerator.getGeneratorBlock(GENERATOR_BLOCK_1), "Generator");
public static final Block Reactor = init(BlockReactor.getReactorBlock(REACTOR_BLOCK), "Reactor");
public static final Block ReactorGlass = init(BlockReactor.getReactorBlock(REACTOR_GLASS), "ReactorGlass");
public static final Block Generator = BlockGenerator.getGeneratorBlock(GENERATOR_BLOCK_1);
public static final Block Reactor = BlockReactor.getReactorBlock(REACTOR_BLOCK);
public static final Block ReactorGlass = BlockReactor.getReactorBlock(REACTOR_GLASS);
private static final IStateMapper generatorMapper = new GeneratorBlockStateMapper();
private static final IStateMapper reactorMapper = new ReactorBlockStateMapper();
public static void register()
{
GameRegistry.register(Generator);
GameRegistry.register(Reactor);
GameRegistry.register(ReactorGlass);
GameRegistry.register(init(Generator, "Generator"));
GameRegistry.register(init(Reactor, "Reactor"));
GameRegistry.register(init(ReactorGlass, "ReactorGlass"));
GameRegistry.register(MekanismItems.init(new ItemBlockGenerator(Generator), "Generator"));
GameRegistry.register(MekanismItems.init(new ItemBlockReactor(Reactor), "Reactor"));
GameRegistry.register(MekanismItems.init(new ItemBlockReactor(ReactorGlass), "ReactorGlass"));
GameRegistry.register(GeneratorsItems.init(new ItemBlockGenerator(Generator), "Generator"));
GameRegistry.register(GeneratorsItems.init(new ItemBlockReactor(Reactor), "Reactor"));
GameRegistry.register(GeneratorsItems.init(new ItemBlockReactor(ReactorGlass), "ReactorGlass"));
ModelLoader.setCustomStateMapper(Generator, generatorMapper);
ModelLoader.setCustomStateMapper(Reactor, reactorMapper);
@@ -43,4 +41,9 @@ public class GeneratorsBlocks
MekanismGenerators.proxy.registerBlockRenders();
}
public static Block init(Block block, String name)
{
return block.setUnlocalizedName(name).setRegistryName("mekanismgenerators:" + name);
}
}