diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 03e0cb7c1..43d824978 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -16,11 +16,6 @@ public class BlockDreamwood extends BlockLivingwood { super(LibBlockNames.DREAM_WOOD); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockDreamwood(this), getRegistryName()); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 83d6fcefe..3f915be2c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -43,7 +43,6 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); - GameRegistry.register(this); setUnlocalizedName(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 6ca24f01c..d27bb1ab7 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -170,6 +170,7 @@ 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.ItemBlockDreamwood; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockMod; @@ -392,6 +393,7 @@ public final class ModBlocks { 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 ItemBlockDreamwood(dreamwood).setRegistryName(dreamwood.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())); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 986d5f5ae..cd1d673ca 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -18,6 +18,8 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -60,7 +62,10 @@ import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockModSlab; +import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @Mod.EventBusSubscriber @@ -150,20 +155,25 @@ public final class ModFluffBlocks { 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); @@ -179,22 +189,27 @@ public final class ModFluffBlocks { 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); @@ -246,6 +261,7 @@ public final class ModFluffBlocks { r.register(shimmerrockSlab); r.register(shimmerrockSlabFull); r.register(shimmerrockStairs); + r.register(shimmerwoodPlankSlab); r.register(shimmerwoodPlankSlabFull); r.register(shimmerwoodPlankStairs); @@ -253,9 +269,88 @@ public final class ModFluffBlocks { r.register(managlassPane); r.register(alfglassPane); r.register(bifrostPane); - - for(Block b : slabsToRegister) - GameRegistry.register(new ItemBlockModSlab(b), b.getRegistryName()); + } + + @SuppressWarnings("ConstantConditions") + @SubscribeEvent + public static void registerItemBlocks(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); + r.register(new ItemBlockMod(livingwoodStairs).setRegistryName(livingwoodStairs.getRegistryName())); + r.register(new ItemBlockModSlab(livingwoodSlab).setRegistryName(livingwoodSlab.getRegistryName())); + r.register(new ItemBlockMod(livingwoodWall).setRegistryName(livingwoodWall.getRegistryName())); + + r.register(new ItemBlockMod(livingwoodPlankStairs).setRegistryName(livingwoodPlankStairs.getRegistryName())); + r.register(new ItemBlockModSlab(livingwoodPlankSlab).setRegistryName(livingwoodPlankSlab.getRegistryName())); + + r.register(new ItemBlockMod(livingrockStairs).setRegistryName(livingrockStairs.getRegistryName())); + r.register(new ItemBlockModSlab(livingrockSlab).setRegistryName(livingrockSlab.getRegistryName())); + r.register(new ItemBlockMod(livingrockWall).setRegistryName(livingrockWall.getRegistryName())); + + r.register(new ItemBlockMod(livingrockBrickStairs).setRegistryName(livingrockBrickStairs.getRegistryName())); + r.register(new ItemBlockModSlab(livingrockBrickSlab).setRegistryName(livingrockBrickSlab.getRegistryName())); + + r.register(new ItemBlockMod(dreamwoodStairs).setRegistryName(dreamwoodStairs.getRegistryName())); + r.register(new ItemBlockModSlab(dreamwoodSlab).setRegistryName(dreamwoodSlab.getRegistryName())); + r.register(new ItemBlockMod(dreamwoodWall).setRegistryName(dreamwoodWall.getRegistryName())); + + r.register(new ItemBlockMod(dreamwoodPlankStairs).setRegistryName(dreamwoodPlankStairs.getRegistryName())); + r.register(new ItemBlockModSlab(dreamwoodPlankSlab).setRegistryName(dreamwoodPlankSlab.getRegistryName())); + + if(ConfigHandler.darkQuartzEnabled) { + r.register(new ItemBlockSpecialQuartz(darkQuartz).setRegistryName(darkQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(darkQuartzSlab).setRegistryName(darkQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(darkQuartzStairs).setRegistryName(darkQuartzStairs.getRegistryName())); + } + + r.register(new ItemBlockSpecialQuartz(manaQuartz).setRegistryName(manaQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(manaQuartzSlab).setRegistryName(manaQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(manaQuartzStairs).setRegistryName(manaQuartzStairs.getRegistryName())); + + r.register(new ItemBlockSpecialQuartz(blazeQuartz).setRegistryName(blazeQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(blazeQuartzSlab).setRegistryName(blazeQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(blazeQuartzStairs).setRegistryName(blazeQuartzStairs.getRegistryName())); + + r.register(new ItemBlockSpecialQuartz(lavenderQuartz).setRegistryName(lavenderQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(lavenderQuartzSlab).setRegistryName(lavenderQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(lavenderQuartzStairs).setRegistryName(lavenderQuartzStairs.getRegistryName())); + + r.register(new ItemBlockSpecialQuartz(redQuartz).setRegistryName(redQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(redQuartzSlab).setRegistryName(redQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(redQuartzStairs).setRegistryName(redQuartzStairs.getRegistryName())); + + r.register(new ItemBlockSpecialQuartz(elfQuartz).setRegistryName(elfQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(elfQuartzSlab).setRegistryName(elfQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(elfQuartzStairs).setRegistryName(elfQuartzStairs.getRegistryName())); + + r.register(new ItemBlockSpecialQuartz(sunnyQuartz).setRegistryName(sunnyQuartz.getRegistryName())); + r.register(new ItemBlockModSlab(sunnyQuartzSlab).setRegistryName(sunnyQuartzSlab.getRegistryName())); + r.register(new ItemBlockMod(sunnyQuartzStairs).setRegistryName(sunnyQuartzStairs.getRegistryName())); + + r.register(new ItemBlockWithMetadataAndName(biomeStoneA).setRegistryName(biomeStoneA.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(biomeStoneB).setRegistryName(biomeStoneB.getRegistryName())); + r.register(new ItemBlockWithMetadataAndName(pavement).setRegistryName(pavement.getRegistryName())); + + for (int i = 0; i < 24; i++) { + r.register(new ItemBlockMod(biomeStoneStairs[i].setRegistryName(biomeStoneStairs[i].getRegistryName()))); + r.register(new ItemBlockModSlab(biomeStoneSlabs[i].setRegistryName(biomeStoneSlabs[i].getRegistryName()))); + } + + r.register(new ItemBlockWithMetadataAndName(biomeStoneWall).setRegistryName(biomeStoneWall.getRegistryName())); + + for (int i = 0; i < BlockPavement.TYPES; i++) { + r.register(new ItemBlockMod(pavementStairs[i].setRegistryName(pavementStairs[i].getRegistryName()))); + r.register(new ItemBlockModSlab(pavementSlabs[i].setRegistryName(pavementSlabs[i].getRegistryName()))); + } + + r.register(new ItemBlockModSlab(shimmerrockSlab).setRegistryName(shimmerrockSlab.getRegistryName())); + r.register(new ItemBlockMod(shimmerrockStairs).setRegistryName(shimmerrockStairs.getRegistryName())); + + r.register(new ItemBlockModSlab(shimmerwoodPlankSlab).setRegistryName(shimmerwoodPlankSlab.getRegistryName())); + r.register(new ItemBlockMod(shimmerwoodPlankStairs).setRegistryName(shimmerwoodPlankStairs.getRegistryName())); + + r.register(new ItemBlockMod(managlassPane).setRegistryName(managlassPane.getRegistryName())); + r.register(new ItemBlockMod(alfglassPane).setRegistryName(alfglassPane.getRegistryName())); + r.register(new ItemBlockMod(bifrostPane).setRegistryName(bifrostPane.getRegistryName())); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 6101a159e..e57a071dd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -96,11 +96,6 @@ public class BlockPavement extends BlockMod { 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/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index ff3b741d2..8bc7e15f2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -55,11 +55,6 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @Nonnull @Override public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { 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 8ee9e7741..b044ab7a5 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(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 96dfea6c3..54822e153 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -75,11 +75,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.values()[meta]); } - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockSpecialQuartz(this), getRegistryName()); - } - public String[] getNames() { return new String[] { "tile.botania:block" + type + "Quartz", 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 cb221bd01..ab405643c 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(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; 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 d9bb41ba2..e544fe600 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 @@ -70,11 +70,6 @@ public class BlockBiomeStoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); } - @Override - public void register() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList list) { 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 28c0458d0..3c34789f0 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 @@ -47,7 +47,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM setRegistryName(name); setUnlocalizedName(name); setDefaultState(pickDefaultState()); - register(); setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -94,10 +93,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return true; } - public void register() { - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList list) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index ce52d20ca..67e7fec9a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -121,7 +121,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(stackItem instanceof ItemPiston) // Workaround because the blockMeta ItemPiston gives crashes getStateFromMeta blockMeta = 0; - stateToPlace = ((ItemBlock) stackItem).block.getStateFromMeta(blockMeta); + stateToPlace = ((ItemBlock) stackItem).getBlock().getStateFromMeta(blockMeta); } else if(stackItem instanceof ItemBlockSpecial) stateToPlace = ((Block) ReflectionHelper.getPrivateValue(ItemBlockSpecial.class, (ItemBlockSpecial) stackItem, LibObfuscation.REED_ITEM)).getDefaultState(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 034eb8c31..7c3db11ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -377,7 +377,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(EnchantmentData data : enchants) { Enchantment otherEnch = data.enchantment; - if (!ench.func_191560_c(otherEnch)) + if (!ench.isCompatibleWith(otherEnch)) return false; }