diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index baf2fffb5..e542fcced 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -85,6 +85,23 @@ public class BlockGiantChest extends BlockContainerBase{ return EnumRarity.epic; } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack){ + if(stack.getTagCompound() != null){ + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof TileEntityGiantChest){ + NBTTagList list = stack.getTagCompound().getTagList("Items", 10); + ItemStack[] slots = ((TileEntityGiantChest)tile).slots; + + for(int i = 0; i < list.tagCount(); i++){ + slots[i] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)); + } + } + } + + super.onBlockPlacedBy(world, x, y, z, entity, stack); + } + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune){ ArrayList drops = super.getDrops(world, x, y, z, metadata, fortune); @@ -119,23 +136,6 @@ public class BlockGiantChest extends BlockContainerBase{ return drops; } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack){ - if(stack.getTagCompound() != null){ - TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof TileEntityGiantChest){ - NBTTagList list = stack.getTagCompound().getTagList("Items", 10); - ItemStack[] slots = ((TileEntityGiantChest)tile).slots; - - for(int i = 0; i < list.tagCount(); i++){ - slots[i] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)); - } - } - } - - super.onBlockPlacedBy(world, x, y, z, entity, stack); - } - @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 9ec55d973..ecbc9fb24 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -46,13 +46,13 @@ public class BlockWildPlant extends BlockBushBase{ } @Override - public boolean shouldAddCreative(){ - return false; + public Class getItemBlock(){ + return TheItemBlock.class; } @Override - public Class getItemBlock(){ - return TheItemBlock.class; + public boolean shouldAddCreative(){ + return false; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java index b04bbbf37..3be223496 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java @@ -172,14 +172,14 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple } @Override - @SideOnly(Side.CLIENT) - public int getMaxEnergy(){ - return this.storage.getMaxEnergyStored(); + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); } @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); + @SideOnly(Side.CLIENT) + public int getMaxEnergy(){ + return this.storage.getMaxEnergyStored(); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java index a22fd207a..ff3f579db 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java @@ -95,14 +95,14 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyPro return this.storage.getEnergyStored(); } + @Override + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); + } + @Override @SideOnly(Side.CLIENT) public int getMaxEnergy(){ return this.storage.getMaxEnergyStored(); } - - @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java index b828af3cb..c7b65e96c 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java @@ -105,14 +105,14 @@ public class TileEntityHeatCollector extends TileEntityBase implements IEnergyPr return this.storage.getEnergyStored(); } + @Override + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); + } + @Override @SideOnly(Side.CLIENT) public int getMaxEnergy(){ return this.storage.getMaxEnergyStored(); } - - @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java index 19e7466ba..66ee85be2 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java @@ -102,14 +102,14 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I return this.storage.getEnergyStored(); } + @Override + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); + } + @Override @SideOnly(Side.CLIENT) public int getMaxEnergy(){ return this.storage.getMaxEnergyStored(); } - - @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java index 6a16e02ad..99ad0e1d6 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java @@ -131,14 +131,14 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr return this.storage.getEnergyStored(); } + @Override + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); + } + @Override @SideOnly(Side.CLIENT) public int getMaxEnergy(){ return this.storage.getMaxEnergyStored(); } - - @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityMiner.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityMiner.java index 19626d614..1099d6f2a 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityMiner.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityMiner.java @@ -192,14 +192,14 @@ public class TileEntityMiner extends TileEntityInventoryBase implements IEnergyR return this.storage.getEnergyStored(); } + @Override + public void setEnergy(int energy){ + this.storage.setEnergyStored(energy); + } + @Override @SideOnly(Side.CLIENT) public int getMaxEnergy(){ return this.storage.getMaxEnergyStored(); } - - @Override - public void setEnergy(int energy){ - this.storage.setEnergyStored(energy); - } }