etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved Flower Basket support 

Fixed a few possible NPEs
This commit is contained in:
GirafiStudios 2017-10-15 16:34:06 +02:00
parent 107285e234
commit 39595d0c74
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/biomesoplenty/common/item/ItemFlowerBasket.java
View File

@ -8,6 +8,8 @@
package biomesoplenty.common.item;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.block.BlockBOPMushroom;
import biomesoplenty.common.handler.GuiHandler;
import biomesoplenty.common.inventory.InventoryFlowerBasket;
import biomesoplenty.common.util.NBTUtil;
@ -16,9 +18,8 @@ import net.minecraft.block.Block;
import net.minecraft.block.IGrowable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.init.Items;
import net.minecraft.item.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
@ -78,7 +79,7 @@ public class ItemFlowerBasket extends Item
player.openGui(BiomesOPlenty.instance, GuiHandler.FLOWER_BASKET_ID, world, 0, 0, 0);
}
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
}
@Nonnull
@ -117,7 +118,7 @@ public class ItemFlowerBasket extends Item
{
NBTTagCompound compound = stack.getTagCompound();
if (compound.hasKey("BasketOpen"))
if (compound != null && compound.hasKey("BasketOpen"))
{
return compound.getBoolean("BasketOpen");
}
@ -142,15 +143,20 @@ public class ItemFlowerBasket extends Item
{
NBTTagCompound compound = stack.getTagCompound();
//Ensure the basket is closed
if (compound != null)
{
compound.setBoolean("BasketOpen", false);
}
}
}
public static boolean isStackSuitableForBasket(@Nonnull ItemStack stack)
{
Item item = stack.getItem();
Block block = Block.getBlockFromItem(item);
return !(item instanceof ItemFlowerBasket) && (block instanceof IPlantable || block instanceof IGrowable || block instanceof IShearable);
return !(item instanceof ItemFlowerBasket) && (block instanceof IPlantable || block instanceof IGrowable || block instanceof IShearable || block instanceof BlockBOPMushroom
|| item instanceof ItemSeedFood || item instanceof ItemSeeds || item == Items.REEDS || item == Items.APPLE || item == Items.MELON || item == Items.BEETROOT || item == Items.WHEAT || item == Items.CHORUS_FRUIT
|| item == BOPItems.berries || item == BOPItems.pear || item == BOPItems.peach || item == BOPItems.persimmon || item == BOPItems.pinecone || item == BOPItems.turnip);
}
}