diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 24e4d741e..d804a9da9 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.gui.SlotLocked; import javax.annotation.Nonnull; @@ -34,7 +35,7 @@ public class ContainerFlowerBag extends Container { for(i = 0; i < 2; ++i) for(j = 0; j < 8; ++j) { int k = j + i * 8; - addSlotToContainer(new SlotFlower(flowerBagInv, k, 17 + j * 18, 26 + i * 18, k)); + addSlotToContainer(new SlotItemHandler(flowerBagInv, k, 17 + j * 18, 26 + i * 18)); } for(i = 0; i < 3; ++i) @@ -42,9 +43,9 @@ public class ContainerFlowerBag extends Container { addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); for(i = 0; i < 9; ++i) { - /*if(player.inventory.currentItem == i) - addSlotToContainer(new SlotLocked(player.inventory, i, 8 + i * 18, 142)); - else*/ addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + if(playerInv.getStackInSlot(i) == flowerBagInv.bag) + addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); + else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index d56e63fb6..512b87d0b 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; @@ -49,10 +50,10 @@ public class GuiFlowerBag extends GuiContainer { List slotList = inventorySlots.inventorySlots; for(Slot slot : slotList) - if(slot instanceof SlotFlower) { - SlotFlower slotf = (SlotFlower) slot; + if(slot instanceof SlotItemHandler) { + SlotItemHandler slotf = (SlotItemHandler) slot; if(!slotf.getHasStack()) { - ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.color); + ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.getSlotIndex()); // index matches colors int x = guiLeft + slotf.xDisplayPosition; int y = guiTop + slotf.yDisplayPosition; RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java deleted file mode 100644 index 96cf3cdad..000000000 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * 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 the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 16, 2015, 7:20:05 PM (GMT)] - */ -package vazkii.botania.client.gui.bag; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import vazkii.botania.common.block.ModBlocks; - -public class SlotFlower extends SlotItemHandler { - - private final InventoryFlowerBag inv; - final int color; - - public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) { - super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); - this.color = color; - inv = p_i1824_1_; - } - - @Override - public boolean isItemValid(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.getItemDamage() == color; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 56abdf86e..953befc31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -74,7 +74,9 @@ public class ItemFlowerBag extends ItemMod { private final IItemHandler inv = new ItemStackHandler(16) { @Override public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { - if(toInsert != null && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower)) + if(toInsert != null + && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower) + && toInsert.getItemDamage() == slot) return super.insertItem(slot, toInsert, simulate); else return toInsert; } @@ -132,8 +134,6 @@ public class ItemFlowerBag extends ItemMod { ItemStack bag = event.getEntityPlayer().inventory.getStackInSlot(i); if(bag != null && bag.getItem() == this) { - event.setCanceled(true); - IItemHandler bagInv = bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); ItemStack result = bagInv.insertItem(color, entityStack, false); @@ -142,10 +142,10 @@ public class ItemFlowerBag extends ItemMod { event.getItem().setDead(); else { event.getItem().setEntityItemStack(result); - event.getItem().setDefaultPickupDelay(); } if(result != entityStack) { + event.setCanceled(true); if (!event.getItem().isSilent()) { event.getItem().worldObj.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F,