Empty flasks can now be refilled (#976)
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.
(cherry picked from commit 4c614df
)
This commit is contained in:
parent
f3f1dfb08a
commit
78093631c5
3 changed files with 69 additions and 14 deletions
169
src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
Normal file
169
src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
Normal file
|
@ -0,0 +1,169 @@
|
|||
package WayofTime.bloodmagic.item;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
|
||||
import WayofTime.bloodmagic.client.IMeshProvider;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.SoundEvents;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.potion.PotionUtils;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.api.Constants;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class ItemPotionFlask extends Item implements IMeshProvider
|
||||
{
|
||||
public ItemPotionFlask()
|
||||
{
|
||||
setUnlocalizedName(Constants.Mod.MODID + ".potionFlask");
|
||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
||||
setMaxStackSize(1);
|
||||
setMaxDamage(8);
|
||||
setNoRepair();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving)
|
||||
{
|
||||
EntityPlayer player = entityLiving instanceof EntityPlayer ? (EntityPlayer) entityLiving : null;
|
||||
|
||||
int remainingUses = stack.getMaxDamage() - stack.getItemDamage();
|
||||
if (remainingUses <= 0)
|
||||
{
|
||||
NBTHelper.checkNBT(stack);
|
||||
stack.getTagCompound().setBoolean("empty", true);
|
||||
return stack;
|
||||
}
|
||||
|
||||
if (player == null || !player.capabilities.isCreativeMode)
|
||||
{
|
||||
stack.setItemDamage(stack.getItemDamage() + 1);
|
||||
}
|
||||
|
||||
if (!world.isRemote)
|
||||
{
|
||||
for (PotionEffect potioneffect : PotionUtils.getEffectsFromStack(stack))
|
||||
{
|
||||
entityLiving.addPotionEffect(new PotionEffect(potioneffect));
|
||||
}
|
||||
}
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxItemUseDuration(ItemStack stack)
|
||||
{
|
||||
return 32;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumAction getItemUseAction(ItemStack stack)
|
||||
{
|
||||
return EnumAction.DRINK;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
|
||||
{
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
int remainingUses = stack.getMaxDamage() - stack.getItemDamage();
|
||||
if (remainingUses > 0 || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("empty"))
|
||||
return EnumActionResult.PASS;
|
||||
|
||||
RayTraceResult trace = rayTrace(world, player, true);
|
||||
|
||||
if (trace.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(trace.getBlockPos()).getMaterial() == Material.WATER)
|
||||
{
|
||||
world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.NEUTRAL, 1.0F, 1.0F);
|
||||
player.setHeldItem(hand, new ItemStack(this));
|
||||
return EnumActionResult.SUCCESS;
|
||||
}
|
||||
|
||||
return super.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
|
||||
{
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
int remainingUses = stack.getMaxDamage() - stack.getItemDamage();
|
||||
if (remainingUses <= 0)
|
||||
{
|
||||
NBTHelper.checkNBT(stack);
|
||||
stack.getTagCompound().setBoolean("empty", true);
|
||||
return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
|
||||
}
|
||||
player.setActiveHand(hand);
|
||||
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
|
||||
{
|
||||
PotionUtils.addPotionTooltip(stack, tooltip, 1.0F);
|
||||
tooltip.add("");
|
||||
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.potion.uses", stack.getMaxDamage() - stack.getItemDamage()));
|
||||
}
|
||||
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems)
|
||||
// {
|
||||
// for (PotionType potiontype : PotionType.REGISTRY)
|
||||
// {
|
||||
// subItems.add(PotionUtils.addPotionToItemStack(new ItemStack(itemIn), potiontype));
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public ItemMeshDefinition getMeshDefinition()
|
||||
{
|
||||
return new ItemMeshDefinition()
|
||||
{
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack)
|
||||
{
|
||||
boolean full = true;
|
||||
if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty"))
|
||||
full = false;
|
||||
return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false"));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public ResourceLocation getCustomLocation()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getVariants()
|
||||
{
|
||||
return Lists.newArrayList("full=true", "full=false");
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue