From d622f0cd586fe1294d9a59adf752512922fd3155 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jul 2016 18:04:17 -0500 Subject: [PATCH] Move block registration out of constructors --- build.properties | 2 +- .../botania/common/block/BlockGaiaHead.java | 10 +++- .../botania/common/block/BlockGhostRail.java | 12 +++- .../vazkii/botania/common/block/BlockMod.java | 12 +++- .../common/block/BlockModDoubleFlower.java | 12 +++- .../botania/common/block/BlockModFlower.java | 11 +++- .../botania/common/block/BlockSolidVines.java | 9 ++- .../common/block/BlockSpecialFlower.java | 10 +++- .../common/block/IRegisterCallback.java | 8 +++ .../botania/common/block/ModBlocks.java | 12 ++++ .../botania/common/block/ModFluffBlocks.java | 57 ------------------- .../common/block/decor/BlockModMushroom.java | 13 ++++- .../block/decor/panes/BlockModPane.java | 12 +++- .../block/decor/slabs/BlockModSlab.java | 13 +++-- .../block/decor/stairs/BlockModStairs.java | 14 ++++- .../decor/walls/BlockBiomeStoneWall.java | 4 +- .../block/decor/walls/BlockModWall.java | 12 ++-- 17 files changed, 127 insertions(+), 96 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/IRegisterCallback.java diff --git a/build.properties b/build.properties index f3174e9bf..eaaa6886f 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2018 +forge_version=12.18.1.2041 build_number=314 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 9acc0d285..f5605c9c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -38,10 +38,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull implements IModelRegister { +public class BlockGaiaHead extends BlockSkull implements IModelRegister, IRegisterCallback { public BlockGaiaHead() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); setUnlocalizedName(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } @@ -90,4 +91,9 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); } + + @Override + public void register() { + GameRegistry.register(this); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 690eebdbb..df2662fa1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -36,15 +36,15 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockGhostRail extends BlockRailBase implements ILexiconable { +public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { super(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); setUnlocalizedName(LibBlockNames.GHOST_RAIL); MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); @@ -108,4 +108,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { public IProperty getShapeProperty() { return BlockRailPowered.SHAPE; } + + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e05cc29ce..82cd912a9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -25,13 +25,13 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockMod extends Block implements IModelRegister { +public class BlockMod extends Block implements IModelRegister, IRegisterCallback { public BlockMod(Material par2Material, String name) { super(par2Material); setUnlocalizedName(name); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - registerItemForm(); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -49,4 +49,10 @@ public class BlockMod extends Block implements IModelRegister { public void registerModels() { } + + @Override + public void register() { + GameRegistry.register(this); + registerItemForm(); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 37ce7349d..6859a11ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IRegisterCallback { private static final int COUNT = 8; private final boolean second; @@ -59,8 +59,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I this.setHardness(0.0F); this.setSoundType(SoundType.PLANT); String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setHardness(0F); setTickRandomly(false); @@ -218,4 +218,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); } + @Override + public final void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 2d89c4c7c..aff8c93fe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -47,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { +public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IRegisterCallback { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -57,8 +57,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup protected BlockModFlower(String name) { setUnlocalizedName(name); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - registerItemForm(); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setHardness(0F); setSoundType(SoundType.PLANT); setTickRandomly(false); @@ -165,4 +165,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup world.setBlockState(pos.up(), flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } + @Override + public void register() { + GameRegistry.register(this); + registerItemForm(); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 51912a242..e45cf38ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -32,10 +32,11 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -public class BlockSolidVines extends BlockVine implements ILexiconable { +public class BlockSolidVines extends BlockVine implements ILexiconable, IRegisterCallback { public BlockSolidVines() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); @@ -66,4 +67,8 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { return LexiconData.vineBall; } + @Override + public void register() { + GameRegistry.register(this); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7b7f45cc1..698f50a05 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -65,7 +65,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IRegisterCallback { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( @@ -121,8 +121,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); protected BlockSpecialFlower() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); - GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); @@ -377,4 +376,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } } + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/IRegisterCallback.java b/src/main/java/vazkii/botania/common/block/IRegisterCallback.java new file mode 100644 index 000000000..8a47ef02a --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/IRegisterCallback.java @@ -0,0 +1,8 @@ +package vazkii.botania.common.block; + +public interface IRegisterCallback { + /** + * Register block and any itemblocks + */ + void register(); +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 5c1a90b32..b833691cf 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -175,8 +175,12 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import java.util.HashSet; +import java.util.Set; + public final class ModBlocks { + public static final Set ALL_BLOCKS = new HashSet<>(); public static Block flower; public static Block altar; public static Block livingrock; @@ -352,6 +356,14 @@ public final class ModBlocks { ModFluffBlocks.init(); + for (Block b : ALL_BLOCKS) { + if (b instanceof IRegisterCallback) { + ((IRegisterCallback) b).register(); + } else { + throw new RuntimeException(b.getRegistryName() + " doesn't have register callbacks!"); + } + } + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 62691fd73..01143a6f3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -271,63 +271,6 @@ public final class ModFluffBlocks { managlassPane = new BlockManaglassPane(); alfglassPane = new BlockAlfglassPane(); bifrostPane = new BlockBifrostPane(); - - if(ConfigHandler.darkQuartzEnabled) { - ((BlockModSlab) darkQuartzSlab).register(); - ((BlockModSlab) darkQuartzSlabFull).register(); - } - ((BlockModSlab) manaQuartzSlab).register(); - ((BlockModSlab) manaQuartzSlabFull).register(); - ((BlockModSlab) blazeQuartzSlab).register(); - ((BlockModSlab) blazeQuartzSlabFull).register(); - ((BlockModSlab) lavenderQuartzSlab).register(); - ((BlockModSlab) lavenderQuartzSlabFull).register(); - ((BlockModSlab) redQuartzSlab).register(); - ((BlockModSlab) redQuartzSlabFull).register(); - ((BlockModSlab) elfQuartzSlab).register(); - ((BlockModSlab) elfQuartzSlabFull).register(); - ((BlockModSlab) sunnyQuartzSlab).register(); - ((BlockModSlab) sunnyQuartzSlabFull).register(); - - ((BlockModSlab) livingwoodSlab).register(); - ((BlockModSlab) livingwoodSlabFull).register(); - ((BlockModSlab) livingwoodPlankSlab).register(); - ((BlockModSlab) livingwoodPlankSlabFull).register(); - ((BlockModSlab) livingrockSlab).register(); - ((BlockModSlab) livingrockSlabFull).register(); - ((BlockModSlab) livingrockBrickSlab).register(); - ((BlockModSlab) livingrockBrickSlabFull).register(); - ((BlockModSlab) dreamwoodSlab).register(); - ((BlockModSlab) dreamwoodSlabFull).register(); - ((BlockModSlab) dreamwoodPlankSlab).register(); - ((BlockModSlab) dreamwoodPlankSlabFull).register(); - - ((BlockModSlab) netherBrickSlab).register(); - ((BlockModSlab) netherBrickSlabFull).register(); - ((BlockModSlab) soulBrickSlab).register(); - ((BlockModSlab) soulBrickSlabFull).register(); - ((BlockModSlab) snowBrickSlab).register(); - ((BlockModSlab) snowBrickSlabFull).register(); - ((BlockModSlab) tileSlab).register(); - ((BlockModSlab) tileSlabFull).register(); - - ((BlockModSlab) dirtPathSlab).register(); - ((BlockModSlab) dirtPathSlabFull).register(); - - ((BlockModSlab) shimmerrockSlab).register(); - ((BlockModSlab) shimmerrockSlabFull).register(); - ((BlockModSlab) shimmerwoodPlankSlab).register(); - ((BlockModSlab) shimmerwoodPlankSlabFull).register(); - - for(int i = 0; i < 24; i++) { - ((BlockModSlab) biomeStoneSlabs[i]).register(); - ((BlockModSlab) biomeStoneFullSlabs[i]).register(); - } - - for(int i = 0; i < pavementSlabs.length; i++) { - ((BlockModSlab) pavementSlabs[i]).register(); - ((BlockModSlab) pavementFullSlabs[i]).register(); - } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 70cc14779..640ac86fa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -38,6 +38,8 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -50,13 +52,13 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { +public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); public BlockModMushroom() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); @@ -153,4 +155,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index da85f97ee..c60f7353f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; @@ -26,14 +27,14 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockModPane extends BlockPane { +public class BlockModPane extends BlockPane implements IRegisterCallback { public BlockModPane(Block source) { super(Material.GLASS, false); // Backward compat don't kill me String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + ModBlocks.ALL_BLOCKS.add(this); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); @@ -53,4 +54,9 @@ public class BlockModPane extends BlockPane { return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 7a408a90b..e90da5033 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -24,6 +24,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -33,16 +35,18 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { +public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister, IRegisterCallback { private final String name; private final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); + private static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); this.name = name; setUnlocalizedName(name); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + ModBlocks.ALL_BLOCKS.add(this); doubleSlab = full; if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); @@ -96,10 +100,11 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM return new ItemStack(getSingleBlock()); } + @Override public void register() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); if (!isDouble()) - GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockModSlab(this), getRegistryName()); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 3de4a27f4..612181548 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -16,17 +16,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { +public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister, IRegisterCallback { public BlockModStairs(IBlockState state, String name) { super(state); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; @@ -42,4 +44,10 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR public void registerModels() { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); } + + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 8420433eb..80e4c3054 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -66,8 +66,8 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + public void register() { + GameRegistry.register(this); GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 0e634615f..c278f7ff1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -30,6 +30,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -38,13 +40,14 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { +public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister, IRegisterCallback { public BlockModWall(Block block, int meta) { super(block); // For backward compat don't kill me String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; - register(name); + setRegistryName(name); + ModBlocks.ALL_BLOCKS.add(this); setUnlocalizedName(name); setDefaultState(blockState.getBaseState() .withProperty(UP, false) @@ -90,8 +93,9 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return true; } - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + @Override + public void register() { + GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); }