From 080763e5695f1db4ec5d54d8fa58decff82b73be Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 4 May 2014 13:13:19 +0100 Subject: [PATCH] Added the Open Crate. --- .../botania/common/block/BlockLivingwood.java | 2 +- .../botania/common/block/BlockOpenCrate.java | 51 +++++++++++++++++ .../botania/common/block/ModBlocks.java | 6 +- .../common/block/tile/TileOpenCrate.java | 52 ++++++++++++++++++ .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/item/ItemManaGun.java | 1 - .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/blocks/openCrate0.png | Bin 0 -> 3310 bytes .../botania/textures/blocks/openCrate1.png | Bin 0 -> 3126 bytes 10 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/block/BlockOpenCrate.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java create mode 100644 resources/assets/botania/textures/blocks/openCrate0.png create mode 100644 resources/assets/botania/textures/blocks/openCrate1.png 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 0000000000000000000000000000000000000000..fdcf53052155d2a18773492439045cbe0ff5190a GIT binary patch literal 3310 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 literal 0 HcmV?d00001 diff --git a/resources/assets/botania/textures/blocks/openCrate1.png b/resources/assets/botania/textures/blocks/openCrate1.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2ae21159b93e29b707c9798cff8ec7702cf41e GIT binary patch literal 3126 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 literal 0 HcmV?d00001