diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index c7793db08..1592f78de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -83,11 +83,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index bd75a197b..2d56f216f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -126,11 +126,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { return BlockRenderLayer.CUTOUT; } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 99b33d7a5..05a70efa9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -207,11 +207,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockFloatingSpecialFlower(this), getRegistryName()); - } - @Nonnull @Override public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 7e5badc23..be4e23c9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -49,8 +49,6 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); - GameRegistry.register(this); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.GHOST_RAIL); MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8a60873a4..56a44f7af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -90,11 +90,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.class.getEnumConstants()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 179797391..41679c99f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -77,11 +77,6 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index c1391ab67..0bbb389fd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -81,11 +81,6 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 25f833cba..468b52d82 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -37,8 +37,6 @@ public abstract class BlockMod extends Block implements IModelRegister { setUnlocalizedName(name); setDefaultState(pickDefaultState()); // This MUST happen before registering the block setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(this); - registerItemForm(); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -47,10 +45,6 @@ public abstract class BlockMod extends Block implements IModelRegister { return blockState.getBaseState(); } - public void registerItemForm() { - GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); - } - protected boolean registerInCreative() { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 9bb74d151..1af4bc234 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -68,8 +68,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); setDefaultState(pickDefaultState()); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(this); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); setUnlocalizedName(name); setHardness(0F); setTickRandomly(false); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index f62e32b01..d5af29c03 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -64,18 +64,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab setUnlocalizedName(name); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(this); - registerItemForm(); setHardness(0F); setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); } - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 4201639af..e6ab56fa8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -102,11 +102,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return state; } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 9ae12501d..2a3a3c13d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -118,11 +118,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return getMetaFromState(state); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index caed897e1..2d9740760 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -88,11 +88,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index b774af4c1..2ae4c9f61 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -37,7 +37,6 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); - GameRegistry.register(this); setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3a40ae678..f8498f9e7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -124,8 +124,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I protected BlockSpecialFlower() { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); - GameRegistry.register(this); - GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 2ab618762..4e42eb71b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -79,11 +79,6 @@ public class BlockStorage extends BlockMod implements ILexiconable { par3.add(new ItemStack(this, 1, i)); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockStorage(this), getRegistryName()); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 915cd512c..6ca24f01c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -16,9 +16,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.subtile.SubTileEntity; @@ -164,183 +168,294 @@ import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.block.tile.string.TileRedStringRelay; +import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockElven; +import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemBlockPool; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockStorage; +import vazkii.botania.common.item.block.ItemBlockTinyPotato; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +@Mod.EventBusSubscriber public final class ModBlocks { + public static final Block flower = new BlockModFlower(); + public static final Block altar = new BlockAltar(); + public static final Block livingrock = new BlockLivingrock(); + public static final Block livingwood = new BlockLivingwood(); + public static final Block specialFlower = new BlockSpecialFlower(); + public static final Block spreader = new BlockSpreader(); + public static final Block pool = new BlockPool(); + public static final Block runeAltar = new BlockRuneAltar(); + public static final Block pylon = new BlockPylon(); + public static final Block pistonRelay = new BlockPistonRelay(); + public static final Block distributor = new BlockDistributor(); + public static final Block manaVoid = new BlockManaVoid(); + public static final Block manaDetector = new BlockManaDetector(); + public static final Block enchanter = new BlockEnchanter(); + public static final Block turntable = new BlockTurntable(); + public static final Block tinyPlanet = new BlockTinyPlanet(); + public static final Block alchemyCatalyst = new BlockAlchemyCatalyst(); + public static final Block openCrate = new BlockOpenCrate(); + public static final Block forestEye = new BlockForestEye(); + public static final Block storage = new BlockStorage(); + public static final Block forestDrum = new BlockForestDrum(); + public static final Block shinyFlower = new BlockShinyFlower(); + public static final Block platform = new BlockPlatform(); + public static final Block alfPortal = new BlockAlfPortal(); + public static final Block dreamwood = new BlockDreamwood(); + public static final Block conjurationCatalyst = new BlockConjurationCatalyst(); + public static final Block bifrost = new BlockBifrost(); + public static final Block solidVines = new BlockSolidVines(); + public static final Block buriedPetals = new BlockBuriedPetals(); + public static final Block floatingFlower = new BlockFloatingFlower(); + public static final Block tinyPotato = new BlockTinyPotato(); + public static final Block spawnerClaw = new BlockSpawnerClaw(); + public static final Block customBrick = new BlockCustomBrick(); + public static final Block enderEye = new BlockEnderEye(); + public static final Block starfield = new BlockStarfield(); + public static final Block rfGenerator = new BlockRFGenerator(); + public static final Block elfGlass = new BlockElfGlass(); + public static final Block brewery = new BlockBrewery(); + public static final Block manaGlass = new BlockManaGlass(); + public static final Block terraPlate = new BlockTerraPlate(); + public static final Block redStringContainer = new BlockRedStringContainer(); + public static final Block redStringDispenser = new BlockRedStringDispenser(); + public static final Block redStringFertilizer = new BlockRedStringFertilizer(); + public static final Block redStringComparator = new BlockRedStringComparator(); + public static final Block redStringRelay = new BlockRedStringRelay(); + public static final Block floatingSpecialFlower = new BlockFloatingSpecialFlower(); + public static final Block manaFlame = new BlockManaFlame(); + public static final Block prism = new BlockPrism(); + public static final Block enchantedSoil = new BlockEnchantedSoil(); + public static final Block petalBlock = new BlockPetalBlock(); + public static final Block corporeaIndex = new BlockCorporeaIndex(); + public static final Block corporeaFunnel = new BlockCorporeaFunnel(); + public static final Block mushroom = new BlockModMushroom(); + public static final Block pump = new BlockPump(); + public static final Block doubleFlower1 = new BlockModDoubleFlower1(); + public static final Block doubleFlower2 = new BlockModDoubleFlower2(); + public static final Block fakeAir = new BlockFakeAir(); + public static final Block blazeBlock = new BlockBlaze(); + public static final Block corporeaInterceptor = new BlockCorporeaInterceptor(); + public static final Block corporeaCrystalCube = new BlockCorporeaCrystalCube(); + public static final Block incensePlate = new BlockIncensePlate(); + public static final Block hourglass = new BlockHourglass(); + public static final Block ghostRail = new BlockGhostRail(); + public static final Block sparkChanger = new BlockSparkChanger(); + public static final Block root = new BlockRoot(); + public static final Block felPumpkin = new BlockFelPumpkin(); + public static final Block cocoon = new BlockCocoon(); + public static final Block lightRelay = new BlockLightRelay(); + public static final Block lightLauncher = new BlockLightLauncher(); + public static final Block manaBomb = new BlockManaBomb(); + public static final Block cacophonium = new BlockCacophonium(); + public static final Block bellows = new BlockBellows(); + public static final Block bifrostPerm = new BlockBifrostPerm(); + public static final Block cellBlock = new BlockCell(); + public static final Block redStringInterceptor = new BlockRedStringInterceptor(); + public static final Block gaiaHead = new BlockGaiaHead(); + public static final Block corporeaRetainer = new BlockCorporeaRetainer(); + public static final Block teruTeruBozu = new BlockTeruTeruBozu(); + public static final Block shimmerrock = new BlockShimmerrock(); + public static final Block shimmerwoodPlanks = new BlockShimmerwoodPlanks(); + public static final Block avatar = new BlockAvatar(); + public static final Block altGrass = new BlockAltGrass(); + public static final Block animatedTorch = new BlockAnimatedTorch(); - public static Block flower; - public static Block altar; - public static Block livingrock; - public static Block livingwood; - public static Block specialFlower; - public static Block spreader; - public static Block pool; - public static Block runeAltar; - public static Block pylon; - public static Block pistonRelay; - public static Block distributor; - public static Block manaVoid; - public static Block manaDetector; - public static Block enchanter; - public static Block turntable; - public static Block tinyPlanet; - public static Block alchemyCatalyst; - public static Block openCrate; - public static Block forestEye; - public static Block storage; - public static Block forestDrum; - public static Block shinyFlower; - public static Block platform; - public static Block alfPortal; - public static Block dreamwood; - public static Block conjurationCatalyst; - public static Block bifrost; - public static Block solidVines; - public static Block buriedPetals; - public static Block floatingFlower; - public static Block tinyPotato; - public static Block spawnerClaw; - public static Block customBrick; - public static Block enderEye; - public static Block starfield; - public static Block rfGenerator; - public static Block elfGlass; - public static Block brewery; - public static Block manaGlass; - public static Block terraPlate; - public static Block redStringContainer; - public static Block redStringDispenser; - public static Block redStringFertilizer; - public static Block redStringComparator; - public static Block redStringRelay; - public static Block floatingSpecialFlower; - public static Block manaFlame; - public static Block prism; - public static Block enchantedSoil; - public static Block petalBlock; - public static Block corporeaIndex; - public static Block corporeaFunnel; - public static Block mushroom; - public static Block pump; - public static Block doubleFlower1; - public static Block doubleFlower2; - public static Block fakeAir; - public static Block blazeBlock; - public static Block corporeaInterceptor; - public static Block corporeaCrystalCube; - public static Block incensePlate; - public static Block hourglass; - public static Block ghostRail; - public static Block sparkChanger; - public static Block root; - public static Block felPumpkin; - public static Block cocoon; - public static Block lightRelay; - public static Block lightLauncher; - public static Block manaBomb; - public static Block cacophonium; - public static Block bellows; - public static Block bifrostPerm; - public static Block cellBlock; - public static Block redStringInterceptor; - public static Block gaiaHead; - public static Block corporeaRetainer; - public static Block teruTeruBozu; - public static Block shimmerrock; - public static Block shimmerwoodPlanks; - public static Block avatar; - public static Block altGrass; - public static Block animatedTorch; + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); - public static void init() { - flower = new BlockModFlower(); - altar = new BlockAltar(); - livingrock = new BlockLivingrock(); - livingwood = new BlockLivingwood(); - specialFlower = new BlockSpecialFlower(); - spreader = new BlockSpreader(); - pool = new BlockPool(); - runeAltar = new BlockRuneAltar(); - pylon = new BlockPylon(); - pistonRelay = new BlockPistonRelay(); - distributor = new BlockDistributor(); - manaVoid = new BlockManaVoid(); - manaDetector = new BlockManaDetector(); - enchanter = new BlockEnchanter(); - turntable = new BlockTurntable(); - tinyPlanet = new BlockTinyPlanet(); - alchemyCatalyst = new BlockAlchemyCatalyst(); - openCrate = new BlockOpenCrate(); - forestEye = new BlockForestEye(); - storage = new BlockStorage(); - forestDrum = new BlockForestDrum(); - shinyFlower = new BlockShinyFlower(); - platform = new BlockPlatform(); - alfPortal = new BlockAlfPortal(); - dreamwood = new BlockDreamwood(); - conjurationCatalyst = new BlockConjurationCatalyst(); - bifrost = new BlockBifrost(); - solidVines = new BlockSolidVines(); - buriedPetals = new BlockBuriedPetals(); - floatingFlower = new BlockFloatingFlower(); - tinyPotato = new BlockTinyPotato(); - spawnerClaw = new BlockSpawnerClaw(); - customBrick = new BlockCustomBrick(); - enderEye = new BlockEnderEye(); - starfield = new BlockStarfield(); - rfGenerator = new BlockRFGenerator(); - elfGlass = new BlockElfGlass(); - brewery = new BlockBrewery(); - manaGlass = new BlockManaGlass(); - terraPlate = new BlockTerraPlate(); - redStringContainer = new BlockRedStringContainer(); - redStringDispenser = new BlockRedStringDispenser(); - redStringFertilizer = new BlockRedStringFertilizer(); - redStringComparator = new BlockRedStringComparator(); - redStringRelay = new BlockRedStringRelay(); - floatingSpecialFlower = new BlockFloatingSpecialFlower(); - manaFlame = new BlockManaFlame(); - prism = new BlockPrism(); - enchantedSoil = new BlockEnchantedSoil(); - petalBlock = new BlockPetalBlock(); - corporeaIndex = new BlockCorporeaIndex(); - corporeaFunnel = new BlockCorporeaFunnel(); - mushroom = new BlockModMushroom(); - pump = new BlockPump(); - doubleFlower1 = new BlockModDoubleFlower1(); - doubleFlower2 = new BlockModDoubleFlower2(); - fakeAir = new BlockFakeAir(); - blazeBlock = new BlockBlaze(); - corporeaInterceptor = new BlockCorporeaInterceptor(); - corporeaCrystalCube = new BlockCorporeaCrystalCube(); - incensePlate = new BlockIncensePlate(); - hourglass = new BlockHourglass(); - ghostRail = new BlockGhostRail(); - sparkChanger = new BlockSparkChanger(); - root = new BlockRoot(); - felPumpkin = new BlockFelPumpkin(); - cocoon = new BlockCocoon(); - lightRelay = new BlockLightRelay(); - lightLauncher = new BlockLightLauncher(); - manaBomb = new BlockManaBomb(); - cacophonium = new BlockCacophonium(); - bellows = new BlockBellows(); - bifrostPerm = new BlockBifrostPerm(); - cellBlock = new BlockCell(); - redStringInterceptor = new BlockRedStringInterceptor(); - gaiaHead = new BlockGaiaHead(); - corporeaRetainer = new BlockCorporeaRetainer(); - teruTeruBozu = new BlockTeruTeruBozu(); - shimmerrock = new BlockShimmerrock(); - shimmerwoodPlanks = new BlockShimmerwoodPlanks(); - avatar = new BlockAvatar(); - altGrass = new BlockAltGrass(); - animatedTorch = new BlockAnimatedTorch(); + r.register(flower); + r.register(altar); + r.register(livingrock); + r.register(livingwood); + r.register(specialFlower); + r.register(spreader); + r.register(pool); + r.register(runeAltar); + r.register(pylon); + r.register(pistonRelay); + r.register(distributor); + r.register(manaVoid); + r.register(manaDetector); + r.register(enchanter); + r.register(turntable); + r.register(tinyPlanet); + r.register(alchemyCatalyst); + r.register(openCrate); + r.register(forestEye); + r.register(storage); + r.register(forestDrum); + r.register(shinyFlower); + r.register(platform); + r.register(alfPortal); + r.register(dreamwood); + r.register(conjurationCatalyst); + r.register(bifrost); + r.register(solidVines); + r.register(buriedPetals); + r.register(floatingFlower); + r.register(tinyPotato); + r.register(spawnerClaw); + r.register(customBrick); + r.register(enderEye); + r.register(starfield); + r.register(rfGenerator); + r.register(elfGlass); + r.register(brewery); + r.register(manaGlass); + r.register(terraPlate); + r.register(redStringContainer); + r.register(redStringDispenser); + r.register(redStringFertilizer); + r.register(redStringComparator); + r.register(redStringRelay); + r.register(floatingSpecialFlower); + r.register(manaFlame); + r.register(prism); + r.register(enchantedSoil); + r.register(petalBlock); + r.register(corporeaIndex); + r.register(corporeaFunnel); + r.register(mushroom); + r.register(pump); + r.register(doubleFlower1); + r.register(doubleFlower2); + r.register(fakeAir); + r.register(blazeBlock); + r.register(corporeaInterceptor); + r.register(corporeaCrystalCube); + r.register(incensePlate); + r.register(hourglass); + r.register(ghostRail); + r.register(sparkChanger); + r.register(root); + r.register(felPumpkin); + r.register(cocoon); + r.register(lightRelay); + r.register(lightLauncher); + r.register(manaBomb); + r.register(cacophonium); + r.register(bellows); + r.register(bifrostPerm); + r.register(cellBlock); + r.register(redStringInterceptor); + r.register(gaiaHead); + r.register(corporeaRetainer); + r.register(teruTeruBozu); + r.register(shimmerrock); + r.register(shimmerwoodPlanks); + r.register(avatar); + r.register(altGrass); + r.register(animatedTorch); - ModFluffBlocks.init(); + RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); + RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); + initOreDict(); + initTileEntities(); + } + + @SuppressWarnings("ConstantConditions") + @SubscribeEvent + public static void registerItemBlocks(RegistryEvent.Register evt) { + //GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); + + IForgeRegistry r = evt.getRegistry(); + r.register(new ItemBlockWithMetadataAndName(flower).setRegistryName(flower.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(altar).setRegistryName(altar.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(livingrock).setRegistryName(livingrock.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName())); + r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(spreader).setRegistryName(spreader.getRegistryName())); + r.register(new ItemBlockPool(pool).setRegistryName(pool.getRegistryName())); + r.register(new ItemBlockMod(runeAltar).setRegistryName(runeAltar.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(pylon).setRegistryName(pylon.getRegistryName())); + r.register(new ItemBlockMod(pistonRelay).setRegistryName(pistonRelay.getRegistryName())); + r.register(new ItemBlockMod(distributor).setRegistryName(distributor.getRegistryName())); + r.register(new ItemBlockMod(manaVoid).setRegistryName(manaVoid.getRegistryName())); + r.register(new ItemBlockMod(manaDetector).setRegistryName(manaDetector.getRegistryName())); + r.register(new ItemBlockMod(enchanter).setRegistryName(enchanter.getRegistryName())); + r.register(new ItemBlockMod(turntable).setRegistryName(turntable.getRegistryName())); + r.register(new ItemBlockMod(tinyPlanet).setRegistryName(tinyPlanet.getRegistryName())); + r.register(new ItemBlockMod(alchemyCatalyst).setRegistryName(alchemyCatalyst.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(openCrate).setRegistryName(openCrate.getRegistryName())); + r.register(new ItemBlockMod(forestEye).setRegistryName(forestEye.getRegistryName())); + r.register(new ItemBlockStorage(storage).setRegistryName(storage.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(forestDrum).setRegistryName(forestDrum.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(shinyFlower).setRegistryName(shinyFlower.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(platform).setRegistryName(platform.getRegistryName())); + r.register(new ItemBlockMod(alfPortal).setRegistryName(alfPortal.getRegistryName())); + r.register(new ItemBlockMod(conjurationCatalyst).setRegistryName(conjurationCatalyst.getRegistryName())); + r.register(new ItemBlockMod(bifrost).setRegistryName(bifrost.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(floatingFlower).setRegistryName(floatingFlower.getRegistryName())); + r.register(new ItemBlockTinyPotato(tinyPotato).setRegistryName(tinyPotato.getRegistryName())); + r.register(new ItemBlockMod(spawnerClaw).setRegistryName(spawnerClaw.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(customBrick).setRegistryName(customBrick.getRegistryName())); + r.register(new ItemBlockMod(enderEye).setRegistryName(enderEye.getRegistryName())); + r.register(new ItemBlockMod(starfield).setRegistryName(starfield.getRegistryName())); + r.register(new ItemBlockMod(rfGenerator).setRegistryName(rfGenerator.getRegistryName())); + r.register(new ItemBlockElven(elfGlass).setRegistryName(elfGlass.getRegistryName())); + r.register(new ItemBlockMod(brewery).setRegistryName(brewery.getRegistryName())); + r.register(new ItemBlockMod(manaGlass).setRegistryName(manaGlass.getRegistryName())); + r.register(new ItemBlockMod(terraPlate).setRegistryName(terraPlate.getRegistryName())); + r.register(new ItemBlockMod(redStringContainer).setRegistryName(redStringContainer.getRegistryName())); + r.register(new ItemBlockMod(redStringDispenser).setRegistryName(redStringDispenser.getRegistryName())); + r.register(new ItemBlockMod(redStringFertilizer).setRegistryName(redStringFertilizer.getRegistryName())); + r.register(new ItemBlockMod(redStringComparator).setRegistryName(redStringComparator.getRegistryName())); + r.register(new ItemBlockMod(redStringRelay).setRegistryName(redStringRelay.getRegistryName())); + r.register(new ItemBlockFloatingSpecialFlower(floatingSpecialFlower).setRegistryName(floatingSpecialFlower.getRegistryName())); + r.register(new ItemBlockMod(prism).setRegistryName(prism.getRegistryName())); + r.register(new ItemBlockMod(enchantedSoil).setRegistryName(enchantedSoil.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(petalBlock).setRegistryName(petalBlock.getRegistryName())); + r.register(new ItemBlockMod(corporeaIndex).setRegistryName(corporeaIndex.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(mushroom).setRegistryName(mushroom.getRegistryName())); + r.register(new ItemBlockMod(pump).setRegistryName(pump.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(doubleFlower1).setRegistryName(doubleFlower1.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(doubleFlower2).setRegistryName(doubleFlower2.getRegistryName())); + r.register(new ItemBlockMod(blazeBlock).setRegistryName(blazeBlock.getRegistryName())); + r.register(new ItemBlockMod(corporeaInterceptor).setRegistryName(corporeaInterceptor.getRegistryName())); + r.register(new ItemBlockMod(corporeaCrystalCube).setRegistryName(corporeaCrystalCube.getRegistryName())); + r.register(new ItemBlockMod(incensePlate).setRegistryName(incensePlate.getRegistryName())); + r.register(new ItemBlockMod(hourglass).setRegistryName(hourglass.getRegistryName())); + r.register(new ItemBlockMod(ghostRail).setRegistryName(ghostRail.getRegistryName())); + r.register(new ItemBlockMod(sparkChanger).setRegistryName(sparkChanger.getRegistryName())); + r.register(new ItemBlockMod(root).setRegistryName(root.getRegistryName())); + r.register(new ItemBlockMod(felPumpkin).setRegistryName(felPumpkin.getRegistryName())); + r.register(new ItemBlockMod(cocoon).setRegistryName(cocoon.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(lightRelay).setRegistryName(lightRelay.getRegistryName())); + r.register(new ItemBlockMod(lightLauncher).setRegistryName(lightLauncher.getRegistryName())); + r.register(new ItemBlockMod(manaBomb).setRegistryName(manaBomb.getRegistryName())); + r.register(new ItemBlockMod(cacophonium).setRegistryName(cacophonium.getRegistryName())); + r.register(new ItemBlockMod(bellows).setRegistryName(bellows.getRegistryName())); + r.register(new ItemBlockMod(bifrostPerm).setRegistryName(bifrostPerm.getRegistryName())); + r.register(new ItemBlockMod(cellBlock).setRegistryName(cellBlock.getRegistryName())); + r.register(new ItemBlockMod(redStringInterceptor).setRegistryName(redStringInterceptor.getRegistryName())); + r.register(new ItemGaiaHead().setRegistryName(gaiaHead.getRegistryName())); + r.register(new ItemBlockMod(corporeaRetainer).setRegistryName(corporeaRetainer.getRegistryName())); + r.register(new ItemBlockMod(teruTeruBozu).setRegistryName(teruTeruBozu.getRegistryName())); + r.register(new ItemBlockMod(shimmerrock).setRegistryName(shimmerrock.getRegistryName())); + r.register(new ItemBlockMod(shimmerwoodPlanks).setRegistryName(shimmerwoodPlanks.getRegistryName())); + r.register(new ItemBlockMod(avatar).setRegistryName(avatar.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(altGrass).setRegistryName(altGrass.getRegistryName())); + r.register(new ItemBlockMod(animatedTorch).setRegistryName(animatedTorch.getRegistryName())); + } + + public static void addDispenserBehaviours() { + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); + + SeedBehaviours.init(); + } + + private static void initOreDict() { for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); @@ -363,19 +478,6 @@ public final class ModBlocks { OreDictionary.registerOre("soulSand", Blocks.SOUL_SAND); OreDictionary.registerOre("ice", Blocks.ICE); OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3)); - - RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); - RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); - - initTileEntities(); - } - - public static void addDispenserBehaviours() { - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); - BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); - - SeedBehaviours.init(); } private static void initTileEntities() { diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 8951039c4..986d5f5ae 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -18,7 +18,11 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -59,149 +63,155 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lib.LibBlockNames; +@Mod.EventBusSubscriber public final class ModFluffBlocks { - public static List slabsToRegister = new ArrayList(); + public static List slabsToRegister = new ArrayList<>(); - public static Block livingwoodStairs; - public static Block livingwoodSlab; - public static Block livingwoodSlabFull; - public static Block livingwoodWall; - public static Block livingwoodPlankStairs; - public static Block livingwoodPlankSlab; - public static Block livingwoodPlankSlabFull; - public static Block livingrockStairs; - public static Block livingrockSlab; - public static Block livingrockSlabFull; - public static Block livingrockWall; - public static Block livingrockBrickStairs; - public static Block livingrockBrickSlab; - public static Block livingrockBrickSlabFull; - public static Block dreamwoodStairs; - public static Block dreamwoodSlab; - public static Block dreamwoodSlabFull; - public static Block dreamwoodWall; - public static Block dreamwoodPlankStairs; - public static Block dreamwoodPlankSlab; - public static Block dreamwoodPlankSlabFull; + public static final Block livingwoodStairs = new BlockLivingwoodStairs(); + public static final Block livingwoodSlab = new BlockLivingwoodSlab(false); + public static final Block livingwoodSlabFull = new BlockLivingwoodSlab(true); + public static final Block livingwoodWall = new BlockLivingwoodWall(); + public static final Block livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); + public static final Block livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); + public static final Block livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); + public static final Block livingrockStairs = new BlockLivingrockStairs(); + public static final Block livingrockSlab = new BlockLivingrockSlab(false); + public static final Block livingrockSlabFull = new BlockLivingrockSlab(true); + public static final Block livingrockWall = new BlockLivingrockWall(); + public static final Block livingrockBrickStairs = new BlockLivingrockBrickStairs(); + public static final Block livingrockBrickSlab = new BlockLivingrockBrickSlab(false); + public static final Block livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); + public static final Block dreamwoodStairs = new BlockDreamwoodStairs(); + public static final Block dreamwoodSlab = new BlockDreamwoodSlab(false); + public static final Block dreamwoodSlabFull = new BlockDreamwoodSlab(true); + public static final Block dreamwoodWall = new BlockDreamwoodWall(); + public static final Block dreamwoodPlankStairs = new BlockDreamwoodPlankStairs(); + public static final Block dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); + public static final Block dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - public static Block darkQuartz; - public static Block darkQuartzSlab; - public static Block darkQuartzSlabFull; - public static Block darkQuartzStairs; - public static Block manaQuartz; - public static Block manaQuartzSlab; - public static Block manaQuartzSlabFull; - public static Block manaQuartzStairs; - public static Block blazeQuartz; - public static Block blazeQuartzSlab; - public static Block blazeQuartzSlabFull; - public static Block blazeQuartzStairs; - public static Block lavenderQuartz; - public static Block lavenderQuartzSlab; - public static Block lavenderQuartzSlabFull; - public static Block lavenderQuartzStairs; - public static Block redQuartz; - public static Block redQuartzSlab; - public static Block redQuartzSlabFull; - public static Block redQuartzStairs; - public static Block elfQuartz; - public static Block elfQuartzSlab; - public static Block elfQuartzSlabFull; - public static Block elfQuartzStairs; - public static Block sunnyQuartz; - public static Block sunnyQuartzSlab; - public static Block sunnyQuartzSlabFull; - public static Block sunnyQuartzStairs; + public static final Block darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); + public static final Block darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); + public static final Block darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true); + public static final Block darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz); + public static final Block manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA); + public static final Block manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false); + public static final Block manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true); + public static final Block manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz); + public static final Block blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE); + public static final Block blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false); + public static final Block blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true); + public static final Block blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz); + public static final Block lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER); + public static final Block lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false); + public static final Block lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true); + public static final Block lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz); + public static final Block redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED); + public static final Block redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false); + public static final Block redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true); + public static final Block redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz); + public static final Block elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF); + public static final Block elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false); + public static final Block elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true); + public static final Block elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz); + public static final Block sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY); + public static final Block sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false); + public static final Block sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true); + public static final Block sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz); - public static Block biomeStoneA; - public static Block biomeStoneB; - public static Block pavement; + public static final Block biomeStoneA = new BlockBiomeStoneA(); + public static final Block biomeStoneB = new BlockBiomeStoneB(); + public static final Block pavement = new BlockPavement(); public static final Block[] biomeStoneStairs = new Block[24]; public static final Block[] biomeStoneSlabs = new Block[24]; public static final Block[] biomeStoneFullSlabs = new Block[24]; - public static Block biomeStoneWall; + public static final Block biomeStoneWall = new BlockBiomeStoneWall(); public static final Block[] pavementStairs = new Block[BlockPavement.TYPES]; public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES]; public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; - public static Block shimmerrockSlab; - public static Block shimmerrockSlabFull; - public static Block shimmerrockStairs; - public static Block shimmerwoodPlankSlab; - public static Block shimmerwoodPlankSlabFull; - public static Block shimmerwoodPlankStairs; + public static final Block shimmerrockSlab = new BlockShimmerrockSlab(false); + public static final Block shimmerrockSlabFull = new BlockShimmerrockSlab(true); + public static final Block shimmerrockStairs = new BlockShimmerrockStairs(); + public static final Block shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false); + public static final Block shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true); + public static final Block shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs(); - public static Block managlassPane; - public static Block alfglassPane; - public static Block bifrostPane; + public static final Block managlassPane = new BlockManaglassPane(); + public static final Block alfglassPane = new BlockAlfglassPane(); + public static final Block bifrostPane = new BlockBifrostPane(); - public static void init() { - livingwoodStairs = new BlockLivingwoodStairs(); - livingwoodSlab = new BlockLivingwoodSlab(false); - livingwoodSlabFull = new BlockLivingwoodSlab(true); - livingwoodWall = new BlockLivingwoodWall(); - livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); - livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); - livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); - livingrockStairs = new BlockLivingrockStairs(); - livingrockSlab = new BlockLivingrockSlab(false); - livingrockSlabFull = new BlockLivingrockSlab(true); - livingrockWall = new BlockLivingrockWall(); - livingrockBrickStairs = new BlockLivingrockBrickStairs(); - livingrockBrickSlab = new BlockLivingrockBrickSlab(false); - livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); - dreamwoodStairs = new BlockDreamwoodStairs(); - dreamwoodSlab = new BlockDreamwoodSlab(false); - dreamwoodSlabFull = new BlockDreamwoodSlab(true); - dreamwoodWall = new BlockDreamwoodWall(); - dreamwoodPlankStairs = new BlockDreamwoodPlankStairs(); - dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); - dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - - biomeStoneA = new BlockBiomeStoneA(); - biomeStoneB = new BlockBiomeStoneB(); - pavement = new BlockPavement(); + @SubscribeEvent + public static void register(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); + r.register(livingwoodStairs); + r.register(livingwoodSlab); + r.register(livingwoodSlabFull); + r.register(livingwoodWall); + r.register(livingwoodPlankStairs); + r.register(livingwoodPlankSlab); + r.register(livingwoodPlankSlabFull); + r.register(livingrockStairs); + r.register(livingrockSlab); + r.register(livingrockSlabFull); + r.register(livingrockWall); + r.register(livingrockBrickStairs); + r.register(livingrockBrickSlab); + r.register(livingrockBrickSlabFull); + r.register(dreamwoodStairs); + r.register(dreamwoodSlab); + r.register(dreamwoodSlabFull); + r.register(dreamwoodWall); + r.register(dreamwoodPlankStairs); + r.register(dreamwoodPlankSlab); + r.register(dreamwoodPlankSlabFull); if(ConfigHandler.darkQuartzEnabled) { - darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); - darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); - darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true); - darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz); + r.register(darkQuartz); + r.register(darkQuartzSlab); + r.register(darkQuartzSlabFull); + r.register(darkQuartzStairs); } + + r.register(manaQuartz); + r.register(manaQuartzSlab); + r.register(manaQuartzSlabFull); + r.register(manaQuartzStairs); + r.register(blazeQuartz); + r.register(blazeQuartzSlab); + r.register(blazeQuartzSlabFull); + r.register(blazeQuartzStairs); + r.register(lavenderQuartz); + r.register(lavenderQuartzSlab); + r.register(lavenderQuartzSlabFull); + r.register(lavenderQuartzStairs); + r.register(redQuartz); + r.register(redQuartzSlab); + r.register(redQuartzSlabFull); + r.register(redQuartzStairs); + r.register(elfQuartz); + r.register(elfQuartzSlab); + r.register(elfQuartzSlabFull); + r.register(elfQuartzStairs); + r.register(sunnyQuartz); + r.register(sunnyQuartzSlab); + r.register(sunnyQuartzSlabFull); + r.register(sunnyQuartzStairs); - manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA); - manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false); - manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true); - manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz); - blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE); - blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false); - blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true); - blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz); - lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER); - lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false); - lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true); - lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz); - redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED); - redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false); - redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true); - redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz); - elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF); - elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false); - elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true); - elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz); - sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY); - sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false); - sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true); - sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz); - + r.register(biomeStoneA); + r.register(biomeStoneB); + r.register(pavement); + int count = 0; for (BiomeStoneVariant variant : BiomeStoneVariant.values()) { biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); + r.register(biomeStoneStairs[count]); + r.register(biomeStoneSlabs[count]); + r.register(biomeStoneFullSlabs[count]); count++; } @@ -213,9 +223,13 @@ public final class ModFluffBlocks { biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); + r.register(biomeStoneStairs[count]); + r.register(biomeStoneSlabs[count]); + r.register(biomeStoneFullSlabs[count]); count++; } - biomeStoneWall = new BlockBiomeStoneWall(); + + r.register(biomeStoneWall); count = 0; for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, @@ -223,19 +237,22 @@ public final class ModFluffBlocks { pavementStairs[count] = new BlockPavementStairs(color); pavementSlabs[count] = new BlockPavementSlab(false, color, count); pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); + r.register(pavementStairs[count]); + r.register(pavementSlabs[count]); + r.register(pavementFullSlabs[count]); count++; } - shimmerrockSlab = new BlockShimmerrockSlab(false); - shimmerrockSlabFull = new BlockShimmerrockSlab(true); - shimmerrockStairs = new BlockShimmerrockStairs(); - shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false); - shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true); - shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs(); + r.register(shimmerrockSlab); + r.register(shimmerrockSlabFull); + r.register(shimmerrockStairs); + r.register(shimmerwoodPlankSlab); + r.register(shimmerwoodPlankSlabFull); + r.register(shimmerwoodPlankStairs); - managlassPane = new BlockManaglassPane(); - alfglassPane = new BlockAlfglassPane(); - bifrostPane = new BlockBifrostPane(); + r.register(managlassPane); + r.register(alfglassPane); + r.register(bifrostPane); for(Block b : slabsToRegister) GameRegistry.register(new ItemBlockModSlab(b), b.getRegistryName()); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index ff34d0ca8..e6ca80a5a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -81,9 +81,6 @@ public class BlockBuriedPetals extends BlockModFlower { return ModItems.petal; } - @Override - public void registerItemForm() {} - @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index b8ddc78e4..b5137df40 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -78,11 +78,6 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index ac681ee31..29e04dc15 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -137,11 +137,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state; } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 26caa2ead..f7bdb5287 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -134,8 +134,4 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.lenses; } - - @Override - public void registerItemForm() {} - } 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 a1a5837e9..295ac7fb4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -67,8 +67,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); - GameRegistry.register(this); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 3149b8e1d..11a7d042f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -80,11 +80,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { list.add(new ItemStack(this, 1, i)); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index a32b08cdc..c6e5a189c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -105,11 +105,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return AABB; } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName()); - } - @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); 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 7a34590e1..8ee9e7741 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 @@ -34,7 +34,6 @@ public class BlockModPane extends BlockPane implements IModelRegister { // Backward compat don't kill me String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); 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 4350d5e06..e9ef05e6d 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 @@ -50,7 +50,6 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM useNeighborBrightness = true; } setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); - GameRegistry.register(this); if(!isDouble()) ModFluffBlocks.slabsToRegister.add(this); } 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 cb702eecc..cb221bd01 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 @@ -26,7 +26,6 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR public BlockModStairs(IBlockState state, String name) { super(state); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); 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 edf989481..d9bb41ba2 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 @@ -72,7 +72,6 @@ public class BlockBiomeStoneWall extends BlockModWall { @Override 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 cef3ca6ec..28c0458d0 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 @@ -95,7 +95,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM } public void register() { - GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index b18b8ed42..98dcafd60 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -94,11 +94,6 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return getDefaultState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.values()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @Override public boolean isFullCube(IBlockState state) { return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index e0964040b..4c63c9c7a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -117,11 +117,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return AABB; } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockPool(this), getRegistryName()); - } - @Override public int damageDropped(IBlockState state) { return state.getBlock().getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 00a1a0444..62639bab7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -89,11 +89,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index da1d21c2b..bb2b42be6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -29,7 +29,7 @@ public abstract class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); - setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)) + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index b23666a7d..ece0cb7f4 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -20,19 +20,13 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import vazkii.botania.client.lib.LibResources; -public class ItemBlockWithMetadataAndName extends ItemBlock { +public class ItemBlockWithMetadataAndName extends ItemBlockMod { - public ItemBlockWithMetadataAndName(Block par2Block) { - super(par2Block); + public ItemBlockWithMetadataAndName(Block block) { + super(block); setHasSubtypes(true); } - @Nonnull - @Override - public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); - } - @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) {