tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #230 from thatsIch/checkedsubtype

Browse source 
added checked way to obain sub blocks
This commit is contained in:
Chris 2014-10-03 17:14:59 -07:00
parent 40206a8d3f 36e7b45821
commit a460917f6a
10 changed files with 69 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/appeng/block/AEBaseBlock.java
View file

@ -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<ItemStack> itemStacks)
{
super.getSubBlocks( item, tabs, itemStacks );
}
}

13
src/main/java/appeng/block/crafting/BlockCraftingMonitor.java
View file

@ -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<ItemStack> itemStacks)
{
l.add( new ItemStack( this, 1, 0 ) );
itemStacks.add( new ItemStack( this, 1, 0 ) );
}
}

14
src/main/java/appeng/block/crafting/BlockCraftingStorage.java
View file

@ -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<ItemStack> 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 ) );
}
}

9
src/main/java/appeng/block/crafting/BlockCraftingUnit.java
View file

@ -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<ItemStack> 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 ) );
}
}

8
src/main/java/appeng/block/misc/BlockPaint.java
View file

@ -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<ItemStack> itemStacks)
{
// nothing..
// do nothing
}
@Override

5
src/main/java/appeng/block/networking/BlockCableBus.java
View file

@ -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<ItemStack> itemStacks)
{
// do nothing
}
public void setupTile()

10
src/main/java/appeng/block/networking/BlockEnergyCell.java
View file

@ -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<ItemStack> 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

11
src/main/java/appeng/block/solids/BlockSkyStone.java
View file

@ -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<ItemStack> 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

8
src/main/java/appeng/block/spatial/BlockMatrixFrame.java
View file

@ -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<ItemStack> itemStacks)
{
// do nothing
}
@Override

7
src/main/java/appeng/block/storage/BlockSkyChest.java
View file

@ -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<ItemStack> 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