From c30035ed06a654bb335975106e62a7e409899959 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 Jan 2017 23:26:40 -0600 Subject: [PATCH] getSubBlocks and Creative tab --- .../vazkii/botania/common/block/BlockAltGrass.java | 3 ++- .../java/vazkii/botania/common/block/BlockAltar.java | 3 ++- .../common/block/BlockFloatingSpecialFlower.java | 3 ++- .../vazkii/botania/common/block/BlockLightRelay.java | 3 ++- .../vazkii/botania/common/block/BlockLivingrock.java | 3 ++- .../vazkii/botania/common/block/BlockLivingwood.java | 3 ++- .../botania/common/block/BlockModDoubleFlower.java | 3 ++- .../vazkii/botania/common/block/BlockModFlower.java | 3 ++- .../vazkii/botania/common/block/BlockOpenCrate.java | 3 ++- .../vazkii/botania/common/block/BlockPlatform.java | 3 ++- .../java/vazkii/botania/common/block/BlockPylon.java | 3 ++- .../botania/common/block/BlockSpecialFlower.java | 3 ++- .../vazkii/botania/common/block/BlockStorage.java | 3 ++- .../botania/common/block/decor/BlockCustomBrick.java | 3 ++- .../common/block/decor/BlockFloatingFlower.java | 3 ++- .../botania/common/block/decor/BlockModMushroom.java | 3 ++- .../botania/common/block/decor/BlockPavement.java | 3 ++- .../botania/common/block/decor/BlockPetalBlock.java | 3 ++- .../block/decor/biomestone/BlockBiomeStone.java | 3 ++- .../common/block/decor/quartz/BlockSpecialQuartz.java | 3 ++- .../common/block/decor/walls/BlockBiomeStoneWall.java | 3 ++- .../common/block/decor/walls/BlockModWall.java | 3 ++- .../botania/common/block/mana/BlockForestDrum.java | 3 ++- .../vazkii/botania/common/block/mana/BlockPool.java | 3 ++- .../botania/common/block/mana/BlockSpawnerClaw.java | 3 ++- .../botania/common/block/mana/BlockSpreader.java | 3 ++- .../botania/common/core/BotaniaCreativeTab.java | 11 +++++------ 27 files changed, 57 insertions(+), 32 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 2e5efd835..6947352d0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -27,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -89,7 +90,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7953b5cbd..3192d30ee 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -128,7 +129,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index bd4311a17..fee9ee864 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -122,7 +123,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 6bb0fa870..e0566c316 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -27,6 +27,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -96,7 +97,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 04b586b96..e1585ade0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -83,7 +84,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index caf7731e6..0a16a32f3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -87,7 +88,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index d0dcf174c..41be916b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -33,6 +33,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -172,7 +173,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < COUNT; ++i) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index fe6bf9316..b44facb97 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -30,6 +30,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -122,7 +123,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index c68ede2b3..9bae0c51e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -28,6 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -105,7 +106,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < CrateVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index ba0329166..fe7f5a4e9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -121,7 +122,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 3519b628f..bdd914025 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -99,7 +100,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index a9255933b..9e1696db6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -35,6 +35,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -211,7 +212,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { stacks.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index f463592aa..7e5f81ca8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -73,7 +74,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(item, 1, i)); } 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 367342339..45ba03a39 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 4; i < CustomBrickVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } 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 c6fe1bd7b..02cfe6760 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -32,6 +32,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -153,7 +154,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(item, 1, i)); } 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 df075f4c6..bb41d497c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -28,6 +28,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -112,7 +113,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } 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 91131c6c8..69cf9ef98 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -102,7 +103,7 @@ public class BlockPavement extends BlockMod { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < TYPES; i++) stacks.add(new ItemStack(item, 1, i)); } 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 d2839fc31..602854d72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -24,6 +24,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -74,7 +75,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 eca5f2060..799c52eaa 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 @@ -21,6 +21,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -44,7 +45,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 b7c93c6fd..7c0b53667 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 @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -120,7 +121,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { stacks.add(new ItemStack(this, 1, 0)); stacks.add(new ItemStack(this, 1, 1)); stacks.add(new ItemStack(this, 1, 2)); 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 d9c345290..cbd5d9ddf 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 @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -77,7 +78,7 @@ public class BlockBiomeStoneWall extends BlockModWall { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull NonNullList list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } 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 15914c726..bab272943 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 @@ -23,6 +23,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -100,7 +101,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull NonNullList list) { list.add(new ItemStack(item)); } 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 d4267d3b2..77e2d5777 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -30,6 +30,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -115,7 +116,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } 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 6f112b1dd..669ea94c0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -34,6 +34,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -147,7 +148,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { par3.add(new ItemStack(item, 1, 0)); par3.add(new ItemStack(item, 1, 2)); par3.add(new ItemStack(item, 1, 3)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index abb670f14..2b819fd81 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -49,7 +50,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.MOB_SPAWNER)); } 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 d7029f563..81e0161f8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -31,6 +31,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -94,7 +95,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2f8042bd8..6188ad714 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -10,14 +10,13 @@ */ package vazkii.botania.common.core; -import java.util.List; - import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -29,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); - List list; + NonNullList list; public BotaniaCreativeTab() { super(LibMisc.MOD_ID); @@ -44,8 +43,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public Item getTabIconItem() { - return getIconItemStack().getItem(); + public ItemStack getTabIconItem() { + return getIconItemStack(); } @Override @@ -54,7 +53,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllRelevantItems(@Nonnull List list) { + public void displayAllRelevantItems(@Nonnull NonNullList list) { this.list = list; addItem(ModItems.lexicon);