From 031ad11ebd1baa3ecec912fafe19479604686ade Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 26 Jul 2014 20:46:28 +0100 Subject: [PATCH] Added the Crafty Crate, it's pretty crafty. --- .../botania/common/block/BlockOpenCrate.java | 3 +- .../botania/common/block/ModBlocks.java | 2 + .../common/block/tile/TileCraftCrate.java | 102 ++++++++++++++++++ .../common/block/tile/TileOpenCrate.java | 8 +- .../botania/common/item/ItemManaResource.java | 8 +- .../vazkii/botania/common/item/ModItems.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + .../botania/common/lib/LibItemNames.java | 3 +- .../vazkii/botania/common/lib/LibOreDict.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + 10 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileCraftCrate.java diff --git a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java index f091992e9..dcfb09b19 100644 --- a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java +++ b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java @@ -27,6 +27,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -85,7 +86,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable { @Override public TileEntity createNewTileEntity(World world, int meta) { - return new TileOpenCrate(); + return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); } @Override diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 75b64eb6d..890b09918 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -81,6 +81,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileBifrost; +import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.block.tile.TileManaBeacon; @@ -367,6 +368,7 @@ public final class ModBlocks { registerTile(TileTurntable.class, LibBlockNames.TURNTABLE); registerTile(TileTinyPlanet.class, LibBlockNames.TINY_PLANET); registerTile(TileOpenCrate.class, LibBlockNames.OPEN_CRATE); + registerTile(TileCraftCrate.class, LibBlockNames.CRAFT_CRATE); registerTile(TileForestEye.class, LibBlockNames.FOREST_EYE); registerTile(TilePlatform.class, LibBlockNames.PLATFORM); registerTile(TileAlfPortal.class, LibBlockNames.ALF_PORTAL); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileCraftCrate.java b/MODSRC/vazkii/botania/common/block/tile/TileCraftCrate.java new file mode 100644 index 000000000..7603e0ba3 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -0,0 +1,102 @@ +/** + * 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 @ [Jul 26, 2014, 4:50:20 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import java.util.List; + +import vazkii.botania.common.item.ModItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; + +public class TileCraftCrate extends TileOpenCrate { + + @Override + public int getSizeInventory() { + return 10; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return i != 9; + } + + @Override + public void updateEntity() { + if(!worldObj.isRemote && craft() && canEject()) + ejectAll(); + } + + boolean craft() { + if(!isFull()) + return false; + + InventoryCrafting craft = new InventoryCrafting(new Container() { + @Override + public boolean canInteractWith(EntityPlayer p_75145_1_) { + return false; + } + }, 3, 3); + for(int i = 0; i < 9; i++) { + ItemStack stack = getStackInSlot(i); + if(stack == null) + return false; // Should never get here, but just in case. + + if(stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) + continue; + craft.setInventorySlotContents(i, stack.copy()); + } + + List recipes = CraftingManager.getInstance().getRecipeList(); + for(IRecipe recipe : recipes) + if(recipe.matches(craft, worldObj)) { + setInventorySlotContents(9, recipe.getCraftingResult(craft)); + + for(int i = 0; i < 9; i++) { + ItemStack stack = getStackInSlot(i); + if(stack == null) + continue; + + ItemStack container = stack.getItem().getContainerItem(stack); + setInventorySlotContents(i, container); + } + return true; + } + + return false; + } + + boolean isFull() { + for(int i = 0; i < 9; i++) + if(getStackInSlot(i) == null) + return false; + + return true; + } + + void ejectAll() { + for(int i = 0; i < getSizeInventory(); i++) { + ItemStack stack = getStackInSlot(i); + if(stack != null) + eject(stack, false); + setInventorySlotContents(i, null); + } + } +} diff --git a/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java index bd1478e74..13ffc0574 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -38,19 +38,19 @@ public class TileOpenCrate extends TileSimpleInventory { redstone = true; } - if(canRelease()) { + if(canEject()) { ItemStack stack = getStackInSlot(0); if(stack != null) - release(stack, redstone); + eject(stack, redstone); } } - public boolean canRelease() { + public boolean canEject() { Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); return blockBelow.isAir(worldObj, xCoord, yCoord - 1, zCoord); } - public void release(ItemStack stack, boolean redstone) { + public void eject(ItemStack stack, boolean redstone) { EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord - 0.5, zCoord + 0.5, stack); item.motionX = 0; item.motionY = 0; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 11fd953ae..2b8984393 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { - final int types = 11; + final int types = 12; IIcon[] icons; public ItemManaResource() { @@ -95,4 +95,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve int meta = stack.getItemDamage(); return meta == 7 || meta == 8 || meta == 9; } + + + @Override + public ItemStack getContainerItem(ItemStack itemStack) { + return itemStack.getItemDamage() == 11 ? itemStack.copy() : null; + } } diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 61c5d000a..b6d6d4456 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -233,5 +233,6 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(manaResource, 1, 8)); OreDictionary.registerOre(LibOreDict.DRAGONSTONE, new ItemStack(manaResource, 1, 9)); OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(manaResource, 1, 10)); + OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(manaResource, 1, 11)); } } diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 2897ea401..c97f00a33 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 TINY_PLANET = "tinyPlanetBlock"; public static final String ALCHEMY_CATALYST = "alchemyCatalyst"; public static final String OPEN_CRATE = "openCrate"; + public static final String CRAFT_CRATE = "craftCrate"; public static final String FOREST_EYE = "forestEye"; public static final String STORAGE = "storage"; public static final String FOREST_DRUM = "forestDrum"; diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 073fa31c5..60949bc28 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -120,6 +120,7 @@ public final class LibItemNames { "elementium", "pixieDust", "dragonstone", - "prismarineShard" + "prismarineShard", + "placeholder" }; } diff --git a/MODSRC/vazkii/botania/common/lib/LibOreDict.java b/MODSRC/vazkii/botania/common/lib/LibOreDict.java index ea94c7ee7..5d62cd108 100644 --- a/MODSRC/vazkii/botania/common/lib/LibOreDict.java +++ b/MODSRC/vazkii/botania/common/lib/LibOreDict.java @@ -30,6 +30,7 @@ public final class LibOreDict { public static final String PIXIE_DUST = "elvenPixieDust"; public static final String DRAGONSTONE = "elvenDragonstone"; public static final String PRISMARINE_SHARD = "shardPrismarine"; + public static final String PLACEHOLDER = "bPlaceholder"; public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index cd8f92199..e10902265 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -619,6 +619,7 @@ item.botania:laputaShard.name=Shard of Laputa item.botania:virus0.name=Necrodermal Virus item.botania:virus1.name=Nullodermal Virus item.botania:skyDirtRod.name=Rod of the Highlands +item.botania:placeholder.name=Placeholder # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition's Index - Pick which category you would like to study: