From 36e7b45821fa69d1e9452dd987740f16bdcac7f0 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Fri, 3 Oct 2014 17:05:21 +0200 Subject: [PATCH] added checked way to obain sub blocks --- src/main/java/appeng/block/AEBaseBlock.java | 15 +++++++++++++++ .../block/crafting/BlockCraftingMonitor.java | 13 ++++++++----- .../block/crafting/BlockCraftingStorage.java | 14 ++++++++------ .../appeng/block/crafting/BlockCraftingUnit.java | 9 ++++++--- src/main/java/appeng/block/misc/BlockPaint.java | 8 ++++++-- .../appeng/block/networking/BlockCableBus.java | 5 +++-- .../appeng/block/networking/BlockEnergyCell.java | 10 +++++++--- .../java/appeng/block/solids/BlockSkyStone.java | 11 ++++++----- .../appeng/block/spatial/BlockMatrixFrame.java | 8 ++++++-- .../java/appeng/block/storage/BlockSkyChest.java | 7 ++++--- 10 files changed, 69 insertions(+), 31 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index bfd1ad1c..e9ab89ca 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -12,11 +12,13 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.IResource; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -798,4 +800,17 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } } + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + public final void getSubBlocks(Item item, CreativeTabs tabs, List itemStacks) + { + this.getCheckedSubBlocks( item, tabs, itemStacks ); + } + + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) + { + super.getSubBlocks( item, tabs, itemStacks ); + } } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 1cc696d8..c32a09db 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -2,6 +2,8 @@ package appeng.block.crafting; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -18,7 +20,8 @@ public class BlockCraftingMonitor extends BlockCraftingUnit public BlockCraftingMonitor() { super( BlockCraftingMonitor.class ); - setTileEntity( TileCraftingMonitorTile.class ); + + this.setTileEntity( TileCraftingMonitorTile.class ); } @Override @@ -38,15 +41,15 @@ public class BlockCraftingMonitor extends BlockCraftingUnit default: case 0: return super.getIcon( 0, 0 ); - case 0 | FLAG_FORMED: + case FLAG_FORMED: return ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon(); } } @Override - public void getSubBlocks(Item i, CreativeTabs c, List l) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - l.add( new ItemStack( this, 1, 0 ) ); + itemStacks.add( new ItemStack( this, 1, 0 ) ); } - } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index 61f6992c..ee364c13 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -2,6 +2,8 @@ package appeng.block.crafting; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -66,12 +68,12 @@ public class BlockCraftingStorage extends BlockCraftingUnit } @Override - public void getSubBlocks(Item i, CreativeTabs c, List l) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - l.add( new ItemStack( this, 1, 0 ) ); - l.add( new ItemStack( this, 1, 1 ) ); - l.add( new ItemStack( this, 1, 2 ) ); - l.add( new ItemStack( this, 1, 3 ) ); + itemStacks.add( new ItemStack( this, 1, 0 ) ); + itemStacks.add( new ItemStack( this, 1, 1 ) ); + itemStacks.add( new ItemStack( this, 1, 2 ) ); + itemStacks.add( new ItemStack( this, 1, 3 ) ); } - } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index cb8eb813..c4a25226 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -3,6 +3,8 @@ package appeng.block.crafting; import java.util.EnumSet; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -131,9 +133,10 @@ public class BlockCraftingUnit extends AEBaseBlock } @Override - public void getSubBlocks(Item i, CreativeTabs c, List l) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - l.add( new ItemStack( this, 1, 0 ) ); - l.add( new ItemStack( this, 1, 1 ) ); + itemStacks.add( new ItemStack( this, 1, 0 ) ); + itemStacks.add( new ItemStack( this, 1, 1 ) ); } } diff --git a/src/main/java/appeng/block/misc/BlockPaint.java b/src/main/java/appeng/block/misc/BlockPaint.java index 4e6031cc..4b932434 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -4,11 +4,14 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MaterialLiquid; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -51,9 +54,10 @@ public class BlockPaint extends AEBaseBlock } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - // nothing.. + // do nothing } @Override diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index bcee17a1..513b67c6 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -395,9 +395,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - + // do nothing } public void setupTile() diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index b3a89b08..7e4094b9 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -3,6 +3,8 @@ package appeng.block.networking; import java.util.EnumSet; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -37,15 +39,17 @@ public class BlockEnergyCell extends AEBaseBlock } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - super.getSubBlocks( id, tab, list ); + super.getCheckedSubBlocks( item, tabs, itemStacks ); ItemStack charged = new ItemStack( this, 1 ); NBTTagCompound tag = Platform.openNbtData( charged ); tag.setDouble( "internalCurrentPower", getMaxPower() ); tag.setDouble( "internalMaxPower", getMaxPower() ); - list.add( charged ); + + itemStacks.add( charged ); } @Override diff --git a/src/main/java/appeng/block/solids/BlockSkyStone.java b/src/main/java/appeng/block/solids/BlockSkyStone.java index fc83662e..35326f10 100644 --- a/src/main/java/appeng/block/solids/BlockSkyStone.java +++ b/src/main/java/appeng/block/solids/BlockSkyStone.java @@ -151,12 +151,13 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item i, CreativeTabs ct, List l) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - super.getSubBlocks( i, ct, l ); - l.add( new ItemStack( i, 1, 1 ) ); - l.add( new ItemStack( i, 1, 2 ) ); - l.add( new ItemStack( i, 1, 3 ) ); + super.getCheckedSubBlocks( item, tabs, itemStacks ); + + itemStacks.add( new ItemStack( item, 1, 1 ) ); + itemStacks.add( new ItemStack( item, 1, 2 ) ); + itemStacks.add( new ItemStack( item, 1, 3 ) ); } @Override diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index ec6c514c..b99cc41e 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -4,11 +4,14 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -37,9 +40,10 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) + @SideOnly(Side.CLIENT) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - + // do nothing } @Override diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index 39f8e74b..f0f96b40 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -75,10 +75,11 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item i, CreativeTabs ct, List l) + public void getCheckedSubBlocks(Item item, CreativeTabs tabs, List itemStacks) { - super.getSubBlocks( i, ct, l ); - l.add( new ItemStack( i, 1, 1 ) ); + super.getCheckedSubBlocks( item, tabs, itemStacks ); + + itemStacks.add( new ItemStack( item, 1, 1 ) ); } @Override