diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java index 725987f3e..adacf640e 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java @@ -38,7 +38,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { IIcon[] icons; public BlockLivingwood() { - super( Material.wood); + super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); setBlockName(LibBlockNames.LIVING_WOOD); diff --git a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java new file mode 100644 index 000000000..e407cb499 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java @@ -0,0 +1,51 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 4, 2014, 12:29:56 PM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileOpenCrate; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockOpenCrate extends BlockModContainer { + + IIcon iconBottom; + + public BlockOpenCrate() { + super(Material.wood); + setHardness(2.0F); + setStepSound(soundTypeWood); + setBlockName(LibBlockNames.OPEN_CRATE); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); + iconBottom = IconHelper.forBlock(par1IconRegister, this, 1); + } + + @Override + public IIcon getIcon(int side, int meta) { + return side == 0 ? iconBottom : blockIcon; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileOpenCrate(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 614e8110d..a9e74943d 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -40,6 +40,7 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.block.tile.TileManaDetector; import vazkii.botania.common.block.tile.TileManaVoid; +import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -73,6 +74,7 @@ public final class ModBlocks { public static Block turntable; public static Block tinyPlanet; public static Block alchemyCatalyst; + public static Block openCrate; public static void init() { flower = new BlockModFlower(); @@ -94,7 +96,8 @@ public final class ModBlocks { turntable = new BlockTurntable(); tinyPlanet = new BlockTinyPlanet(); alchemyCatalyst = new BlockAlchemyCatalyst(); - + openCrate = new BlockOpenCrate(); + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); @@ -119,6 +122,7 @@ public final class ModBlocks { GameRegistry.registerTileEntity(TileEnchanter.class, LibBlockNames.ENCHANTER); GameRegistry.registerTileEntity(TileTurntable.class, LibBlockNames.TURNTABLE); GameRegistry.registerTileEntity(TileTinyPlanet.class, LibBlockNames.TINY_PLANET); + GameRegistry.registerTileEntity(TileOpenCrate.class, LibBlockNames.OPEN_CRATE); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java new file mode 100644 index 000000000..e72ff1991 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -0,0 +1,52 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 4, 2014, 12:51:05 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +public class TileOpenCrate extends TileSimpleInventory { + + @Override + public int getSizeInventory() { + return 1; + } + + @Override + public String getInventoryName() { + return LibBlockNames.OPEN_CRATE; + } + + @Override + public void updateEntity() { + Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); + if(blockBelow.isAir(worldObj, xCoord, yCoord - 1, zCoord)) { + ItemStack stack = getStackInSlot(0); + if(stack != null) { + EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord - 0.5, zCoord + 0.5, stack); + item.motionX = 0; + item.motionY = 0; + item.motionZ = 0; + setInventorySlotContents(0, null); + if(!worldObj.isRemote) + worldObj.spawnEntityInWorld(item); + } + } + } + + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 91b12eff4..3be7bd926 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -65,6 +65,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); + addBlock(ModBlocks.openCrate); addBlock(ModBlocks.altar); addBlock(ModBlocks.runeAltar); addBlock(ModBlocks.pylon); diff --git a/MODSRC/vazkii/botania/common/item/ItemManaGun.java b/MODSRC/vazkii/botania/common/item/ItemManaGun.java index 3552bf717..40e99c8b1 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaGun.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaGun.java @@ -34,7 +34,6 @@ import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import cpw.mods.fml.relauncher.Side; public class ItemManaGun extends ItemMod { diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 0aef8d160..741e72547 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -34,6 +34,7 @@ public final class LibBlockNames { public static final String TURNTABLE = LibResources.PREFIX_MOD + "turntable"; public static final String TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanetBlock"; public static final String ALCHEMY_CATALYST = LibResources.PREFIX_MOD + "alchemyCatalyst"; + public static final String OPEN_CRATE = LibResources.PREFIX_MOD + "openCrate"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 6cde57b82..c30e07533 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -126,6 +126,7 @@ tile.botania:enchanter.name=Mana Enchanter tile.botania:turntable.name=Spreader Turntable tile.botania:tinyPlanetBlock.name=Tiny Planet tile.botania:alchemyCatalyst.name=Alchemy Catalyst +tile.botania:openCrate.name=Open Crate # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/openCrate0.png b/resources/assets/botania/textures/blocks/openCrate0.png new file mode 100644 index 000000000..fdcf53052 Binary files /dev/null and b/resources/assets/botania/textures/blocks/openCrate0.png differ diff --git a/resources/assets/botania/textures/blocks/openCrate1.png b/resources/assets/botania/textures/blocks/openCrate1.png new file mode 100644 index 000000000..9e2ae2115 Binary files /dev/null and b/resources/assets/botania/textures/blocks/openCrate1.png differ