Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-21 23:13:28 +01:00
Code Issues Projects Releases Wiki Activity

make water bowl not spill when you're standing

Browse source 
Closes #794
This commit is contained in:
Ellpeck 2017-06-16 22:38:09 +02:00
parent 1bae941349
commit 5cb59dbd83
1 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java
View file

@ -25,6 +25,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.*; import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
@ -122,20 +123,48 @@ public class ItemWaterBowl extends ItemBase{
public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected){ public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected){
if(!world.isRemote){ if(!world.isRemote){
if(ConfigBoolValues.WATER_BOWL_LOSS.isEnabled()){ if(ConfigBoolValues.WATER_BOWL_LOSS.isEnabled()){
if(!entity.isSneaking()){ if(world.getTotalWorldTime()%10 == 0 && world.rand.nextFloat() >= 0.5F){
if(world.getTotalWorldTime()%10 == 0 && world.rand.nextFloat() >= 0.8F){ int lastX = 0;
if(entity instanceof EntityPlayer){ int lastY = 0;
EntityPlayer player = (EntityPlayer)entity;
if(this.tryPlaceContainedLiquid(player, world, player.getPosition(), true)){ if(stack.hasTagCompound()){
player.inventory.setInventorySlotContents(itemSlot, new ItemStack(Items.BOWL)); NBTTagCompound compound = stack.getTagCompound();
lastX = compound.getInteger("lastX");
lastY = compound.getInteger("lastY");
}
boolean change = false;
if((lastX != 0 && lastX != (int)entity.posX) || (lastY != 0 && lastY != (int)entity.posY)){
if(!entity.isSneaking()){
if(entity instanceof EntityPlayer){
EntityPlayer player = (EntityPlayer)entity;
if(this.tryPlaceContainedLiquid(player, world, player.getPosition(), true)){
player.inventory.setInventorySlotContents(itemSlot, new ItemStack(Items.BOWL));
}
} }
} }
change = true;
}
if(change || lastX == 0 || lastY == 0){
if(!stack.hasTagCompound()){
stack.setTagCompound(new NBTTagCompound());
}
NBTTagCompound compound = stack.getTagCompound();
compound.setInteger("lastX", (int)entity.posX);
compound.setInteger("lastY", (int)entity.posY);
} }
} }
} }
} }
} }
@Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged){
return !ItemStack.areItemsEqual(oldStack, newStack);
}
public boolean tryPlaceContainedLiquid(EntityPlayer player, World world, BlockPos pos, boolean finite){ public boolean tryPlaceContainedLiquid(EntityPlayer player, World world, BlockPos pos, boolean finite){
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
Material material = state.getMaterial(); Material material = state.getMaterial();