Update to 1.14.2

This commit is contained in:
LexManos authored and cpw committed 2019-06-07 16:50:47 -04:00
1 parent d3e8804dbf
commit a7df63e1a1
1010 files changed
+15254 -19520

No files matched your search

@@ -21,21 +21,21 @@ package net.minecraftforge.fluids;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.block.DispenserBlock;
import net.minecraft.dispenser.DefaultDispenseItemBehavior;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
import net.minecraft.tileentity.DispenserTileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
/**
* Fills or drains a fluid container item using a Dispenser.
*/
public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
public class DispenseFluidContainer extends DefaultDispenseItemBehavior
{
private static final DispenseFluidContainer INSTANCE = new DispenseFluidContainer();
@@ -46,7 +46,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
private DispenseFluidContainer() {}
private final BehaviorDefaultDispenseItem dispenseBehavior = new BehaviorDefaultDispenseItem();
private final DefaultDispenseItemBehavior dispenseBehavior = new DefaultDispenseItemBehavior();
@Override
@Nonnull
@@ -69,7 +69,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
private ItemStack fillContainer(@Nonnull IBlockSource source, @Nonnull ItemStack stack)
{
World world = source.getWorld();
EnumFacing dispenserFacing = source.getBlockState().get(BlockDispenser.FACING);
Direction dispenserFacing = source.getBlockState().get(DispenserBlock.FACING);
BlockPos blockpos = source.getBlockPos().offset(dispenserFacing);
FluidActionResult actionResult = FluidUtil.tryPickUpFluid(stack, null, world, blockpos, dispenserFacing.getOpposite());
@@ -84,7 +84,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
{
return resultStack;
}
else if (((TileEntityDispenser)source.getBlockTileEntity()).addItemStack(resultStack) < 0)
else if (((DispenserTileEntity)source.getBlockTileEntity()).addItemStack(resultStack) < 0)
{
this.dispenseBehavior.dispense(source, resultStack);
}
@@ -109,9 +109,9 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
}
FluidStack fluidStack = fluidHandler.drain(Fluid.BUCKET_VOLUME, false);
EnumFacing dispenserFacing = source.getBlockState().get(BlockDispenser.FACING);
Direction dispenserFacing = source.getBlockState().get(DispenserBlock.FACING);
BlockPos blockpos = source.getBlockPos().offset(dispenserFacing);
FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.getWorld(), blockpos, stack, fluidStack) : FluidActionResult.FAILURE;
FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.getWorld(), Hand.MAIN_HAND, blockpos, stack, fluidStack) : FluidActionResult.FAILURE;
if (result.isSuccess())
{
@@ -121,7 +121,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
{
return drainedStack;
}
else if (!drainedStack.isEmpty() && ((TileEntityDispenser)source.getBlockTileEntity()).addItemStack(drainedStack) < 0)
else if (!drainedStack.isEmpty() && ((DispenserTileEntity)source.getBlockTileEntity()).addItemStack(drainedStack) < 0)
{
this.dispenseBehavior.dispense(source, drainedStack);
}
@@ -21,22 +21,22 @@ package net.minecraftforge.fluids;
import javax.annotation.Nullable;
import net.minecraft.particles.ParticleTypes;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Locale;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Particles;
import net.minecraft.init.SoundEvents;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Rarity;
/**
* Minecraft Forge Fluid Implementation
@@ -122,7 +122,7 @@ public class Fluid
*
* Used primarily in tool tips.
*/
protected EnumRarity rarity = EnumRarity.COMMON;
protected Rarity rarity = Rarity.COMMON;
/**
* If there is a Block implementation of the Fluid, the Block is linked here.
@@ -216,7 +216,7 @@ public class Fluid
return this;
}
public Fluid setRarity(EnumRarity rarity)
public Fluid setRarity(Rarity rarity)
{
this.rarity = rarity;
return this;
@@ -264,7 +264,7 @@ public class Fluid
* Determines if this fluid should vaporize in dimensions where water vaporizes when placed.
* To preserve the intentions of vanilla, fluids that can turn lava into obsidian should vaporize.
* This prevents players from making the nether safe with a single bucket.
* Based on {@link net.minecraft.item.ItemBucket#tryPlaceContainedLiquid(EntityPlayer, World, BlockPos)}
* Based on {@link net.minecraft.item.BucketItem#tryPlaceContainedLiquid(PlayerEntity, World, BlockPos)}
*
* @param fluidStack The fluidStack is trying to be placed.
* @return true if this fluid should vaporize in dimensions where water vaporizes when placed.
@@ -277,22 +277,22 @@ public class Fluid
}
/**
* Called instead of placing the fluid block if {@link WorldProvider#doesWaterVaporize()} and {@link #doesVaporize(FluidStack)} are true.
* Called instead of placing the fluid block if {@link net.minecraft.world.dimension.Dimension#doesWaterVaporize()} and {@link #doesVaporize(FluidStack)} are true.
* Override this to make your explosive liquid blow up instead of the default smoke, etc.
* Based on {@link net.minecraft.item.ItemBucket#tryPlaceContainedLiquid(EntityPlayer, World, BlockPos)}
* Based on {@link net.minecraft.item.BucketItem#tryPlaceContainedLiquid(PlayerEntity, World, BlockPos)}
*
* @param player Player who tried to place the fluid. May be null for blocks like dispensers.
* @param worldIn World to vaporize the fluid in.
* @param pos The position in the world the fluid block was going to be placed.
* @param fluidStack The fluidStack that was going to be placed.
*/
public void vaporize(@Nullable EntityPlayer player, World worldIn, BlockPos pos, FluidStack fluidStack)
public void vaporize(@Nullable PlayerEntity player, World worldIn, BlockPos pos, FluidStack fluidStack)
{
worldIn.playSound(player, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F);
for (int l = 0; l < 8; ++l)
{
worldIn.addOptionalParticle(Particles.LARGE_SMOKE, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D);
worldIn.addOptionalParticle(ParticleTypes.LARGE_SMOKE, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D);
}
}
@@ -347,7 +347,7 @@ public class Fluid
return this.isGaseous;
}
public EnumRarity getRarity()
public Rarity getRarity()
{
return rarity;
}
@@ -413,7 +413,7 @@ public class Fluid
public int getTemperature(FluidStack stack){ return getTemperature(); }
public int getViscosity(FluidStack stack){ return getViscosity(); }
public boolean isGaseous(FluidStack stack){ return isGaseous(); }
public EnumRarity getRarity(FluidStack stack){ return getRarity(); }
public Rarity getRarity(FluidStack stack){ return getRarity(); }
public int getColor(FluidStack stack){ return getColor(); }
public ResourceLocation getStill(FluidStack stack) { return getStill(); }
public ResourceLocation getFlowing(FluidStack stack) { return getFlowing(); }
@@ -426,7 +426,7 @@ public class Fluid
public int getTemperature(World world, BlockPos pos){ return getTemperature(); }
public int getViscosity(World world, BlockPos pos){ return getViscosity(); }
public boolean isGaseous(World world, BlockPos pos){ return isGaseous(); }
public EnumRarity getRarity(World world, BlockPos pos){ return getRarity(); }
public Rarity getRarity(World world, BlockPos pos){ return getRarity(); }
public int getColor(World world, BlockPos pos){ return getColor(); }
public ResourceLocation getStill(World world, BlockPos pos) { return getStill(); }
public ResourceLocation getFlowing(World world, BlockPos pos) { return getFlowing(); }
@@ -20,7 +20,7 @@
package net.minecraftforge.fluids;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.registries.IRegistryDelegate;
@@ -42,7 +42,7 @@ public class FluidStack
private static final Logger LOGGER = LogManager.getLogger();
public int amount;
public NBTTagCompound tag;
public CompoundNBT tag;
private IRegistryDelegate<Fluid> fluidDelegate;
public FluidStack(Fluid fluid, int amount)
@@ -61,13 +61,13 @@ public class FluidStack
this.amount = amount;
}
public FluidStack(Fluid fluid, int amount, NBTTagCompound nbt)
public FluidStack(Fluid fluid, int amount, CompoundNBT nbt)
{
this(fluid, amount);
if (nbt != null)
{
tag = (NBTTagCompound) nbt.copy();
tag = (CompoundNBT) nbt.copy();
}
}
@@ -81,7 +81,7 @@ public class FluidStack
* will return as null.
*/
@Nullable
public static FluidStack loadFluidStackFromNBT(NBTTagCompound nbt)
public static FluidStack loadFluidStackFromNBT(CompoundNBT nbt)
{
if (nbt == null)
{
@@ -106,14 +106,14 @@ public class FluidStack
return stack;*/
}
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
public CompoundNBT writeToNBT(CompoundNBT nbt)
{
// TODO fluids bt.setString("FluidName", FluidRegistry.getFluidName(getFluid()));
nbt.setInt("Amount", amount);
nbt.putInt("Amount", amount);
if (tag != null)
{
nbt.setTag("Tag", tag);
nbt.func_218657_a("Tag", tag);
}
return nbt;
}
@@ -21,7 +21,7 @@ package net.minecraftforge.fluids;
import javax.annotation.Nullable;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper;
import net.minecraftforge.fluids.capability.IFluidHandler;
@@ -56,9 +56,9 @@ public class FluidTank implements IFluidTank, IFluidHandler
this(new FluidStack(fluid, amount), capacity);
}
public FluidTank readFromNBT(NBTTagCompound nbt)
public FluidTank readFromNBT(CompoundNBT nbt)
{
if (!nbt.hasKey("Empty"))
if (!nbt.contains("Empty"))
{
FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
setFluid(fluid);
@@ -70,7 +70,7 @@ public class FluidTank implements IFluidTank, IFluidHandler
return this;
}
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
public CompoundNBT writeToNBT(CompoundNBT nbt)
{
if (fluid != null)
{
@@ -78,7 +78,7 @@ public class FluidTank implements IFluidTank, IFluidHandler
}
else
{
nbt.setString("Empty", "");
nbt.putString("Empty", "");
}
return nbt;
}
@@ -24,29 +24,26 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.IBucketPickupHandler;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemBucket;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.fluids.capability.wrappers.BlockWrapper;
import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
@@ -70,7 +67,7 @@ public class FluidUtil
* @param side The side of the block to interact with. May be null.
* @return true if the interaction succeeded and updated the item held by the player, false otherwise.
*/
public static boolean interactWithFluidHandler(@Nonnull EntityPlayer player, @Nonnull EnumHand hand, @Nonnull World world, @Nonnull BlockPos pos, @Nullable EnumFacing side)
public static boolean interactWithFluidHandler(@Nonnull PlayerEntity player, @Nonnull Hand hand, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Direction side)
{
Preconditions.checkNotNull(world);
Preconditions.checkNotNull(pos);
@@ -89,7 +86,7 @@ public class FluidUtil
* @param handler The fluid handler.
* @return true if the interaction succeeded and updated the item held by the player, false otherwise.
*/
public static boolean interactWithFluidHandler(@Nonnull EntityPlayer player, @Nonnull EnumHand hand, @Nonnull IFluidHandler handler)
public static boolean interactWithFluidHandler(@Nonnull PlayerEntity player, @Nonnull Hand hand, @Nonnull IFluidHandler handler)
{
Preconditions.checkNotNull(player);
Preconditions.checkNotNull(hand);
@@ -132,7 +129,7 @@ public class FluidUtil
* @return a {@link FluidActionResult} holding the filled container if successful.
*/
@Nonnull
public static FluidActionResult tryFillContainer(@Nonnull ItemStack container, IFluidHandler fluidSource, int maxAmount, @Nullable EntityPlayer player, boolean doFill)
public static FluidActionResult tryFillContainer(@Nonnull ItemStack container, IFluidHandler fluidSource, int maxAmount, @Nullable PlayerEntity player, boolean doFill)
{
ItemStack containerCopy = ItemHandlerHelper.copyStackWithSize(container, 1); // do not modify the input
return getFluidHandler(containerCopy)
@@ -176,7 +173,7 @@ public class FluidUtil
* NOTE If the container is consumable, the empty container will be null on success.
*/
@Nonnull
public static FluidActionResult tryEmptyContainer(@Nonnull ItemStack container, IFluidHandler fluidDestination, int maxAmount, @Nullable EntityPlayer player, boolean doDrain)
public static FluidActionResult tryEmptyContainer(@Nonnull ItemStack container, IFluidHandler fluidDestination, int maxAmount, @Nullable PlayerEntity player, boolean doDrain)
{
ItemStack containerCopy = ItemHandlerHelper.copyStackWithSize(container, 1); // do not modify the input
return getFluidHandler(containerCopy)
@@ -228,7 +225,7 @@ public class FluidUtil
* @return a {@link FluidActionResult} holding the result and the resulting container. The resulting container is empty on failure.
*/
@Nonnull
public static FluidActionResult tryFillContainerAndStow(@Nonnull ItemStack container, IFluidHandler fluidSource, IItemHandler inventory, int maxAmount, @Nullable EntityPlayer player, boolean doFill)
public static FluidActionResult tryFillContainerAndStow(@Nonnull ItemStack container, IFluidHandler fluidSource, IItemHandler inventory, int maxAmount, @Nullable PlayerEntity player, boolean doFill)
{
if (container.isEmpty())
{
@@ -296,7 +293,7 @@ public class FluidUtil
* @return a {@link FluidActionResult} holding the result and the resulting container. The resulting container is empty on failure.
*/
@Nonnull
public static FluidActionResult tryEmptyContainerAndStow(@Nonnull ItemStack container, IFluidHandler fluidDestination, IItemHandler inventory, int maxAmount, @Nullable EntityPlayer player, boolean doDrain)
public static FluidActionResult tryEmptyContainerAndStow(@Nonnull ItemStack container, IFluidHandler fluidDestination, IItemHandler inventory, int maxAmount, @Nullable PlayerEntity player, boolean doDrain)
{
if (container.isEmpty())
{
@@ -456,9 +453,9 @@ public class FluidUtil
/**
* Helper method to get an IFluidHandler for at a block position.
*/
public static LazyOptional<IFluidHandler> getFluidHandler(World world, BlockPos blockPos, @Nullable EnumFacing side)
public static LazyOptional<IFluidHandler> getFluidHandler(World world, BlockPos blockPos, @Nullable Direction side)
{
IBlockState state = world.getBlockState(blockPos);
BlockState state = world.getBlockState(blockPos);
Block block = state.getBlock();
if (block.hasTileEntity(state))
@@ -493,14 +490,14 @@ public class FluidUtil
* @return a {@link FluidActionResult} holding the result and the resulting container.
*/
@Nonnull
public static FluidActionResult tryPickUpFluid(@Nonnull ItemStack emptyContainer, @Nullable EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side)
public static FluidActionResult tryPickUpFluid(@Nonnull ItemStack emptyContainer, @Nullable PlayerEntity playerIn, World worldIn, BlockPos pos, Direction side)
{
if (emptyContainer.isEmpty() || worldIn == null || pos == null)
{
return FluidActionResult.FAILURE;
}
IBlockState state = worldIn.getBlockState(pos);
BlockState state = worldIn.getBlockState(pos);
Block block = state.getBlock();
/* TODO fluid blocks?
@@ -521,17 +518,18 @@ public class FluidUtil
*
* @param player Player who places the fluid. May be null for blocks like dispensers.
* @param world World to place the fluid in
* @param hand
* @param pos The position in the world to place the fluid block
* @param container The fluid container holding the fluidStack to place
* @param resource The fluidStack to place
* @return the container's ItemStack with the remaining amount of fluid if the placement was successful, null otherwise
*/
@Nonnull
public static FluidActionResult tryPlaceFluid(@Nullable EntityPlayer player, World world, BlockPos pos, @Nonnull ItemStack container, FluidStack resource)
public static FluidActionResult tryPlaceFluid(@Nullable PlayerEntity player, World world, Hand hand, BlockPos pos, @Nonnull ItemStack container, FluidStack resource)
{
ItemStack containerCopy = ItemHandlerHelper.copyStackWithSize(container, 1); // do not modify the input
return getFluidHandler(containerCopy)
.filter(handler -> tryPlaceFluid(player, world, pos, handler, resource))
.filter(handler -> tryPlaceFluid(player, world, hand, pos, handler, resource))
.map(IFluidHandlerItem::getContainer)
.map(FluidActionResult::new)
.orElse(FluidActionResult.FAILURE);
@@ -547,12 +545,13 @@ public class FluidUtil
*
* @param player Player who places the fluid. May be null for blocks like dispensers.
* @param world World to place the fluid in
* @param hand
* @param pos The position in the world to place the fluid block
* @param fluidSource The fluid source holding the fluidStack to place
* @param resource The fluidStack to place.
* @return true if the placement was successful, false otherwise
*/
public static boolean tryPlaceFluid(@Nullable EntityPlayer player, World world, BlockPos pos, IFluidHandler fluidSource, FluidStack resource)
public static boolean tryPlaceFluid(@Nullable PlayerEntity player, World world, Hand hand, BlockPos pos, IFluidHandler fluidSource, FluidStack resource)
{
if (world == null || resource == null || pos == null)
{
@@ -570,10 +569,10 @@ public class FluidUtil
return false;
}
BlockItemUseContext context = new BlockItemUseContext(world, player, ItemStack.EMPTY, pos, EnumFacing.UP, 0, 0, 0); //TODO: This neds proper context...
BlockItemUseContext context = new BlockItemUseContext(new ItemUseContext(player, hand, new BlockRayTraceResult(Vec3d.ZERO, Direction.UP, pos, false))); //TODO: This neds proper context...
// check that we can place the fluid at the destination
IBlockState destBlockState = world.getBlockState(pos);
BlockState destBlockState = world.getBlockState(pos);
Material destMaterial = destBlockState.getMaterial();
boolean isDestNonSolid = !destMaterial.isSolid();
boolean isDestReplaceable = destBlockState.isReplaceable(context);
@@ -642,7 +641,7 @@ public class FluidUtil
{
if (!world.isRemote)
{
IBlockState destBlockState = world.getBlockState(pos);
BlockState destBlockState = world.getBlockState(pos);
Material destMaterial = destBlockState.getMaterial();
boolean isDestNonSolid = !destMaterial.isSolid();
boolean isDestReplaceable = false; //TODO: Needs BlockItemUseContext destBlockState.getBlock().isReplaceable(world, pos);
@@ -19,22 +19,25 @@
package net.minecraftforge.fluids;
import net.minecraft.block.BlockDispenser;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.block.DispenserBlock;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.stats.StatList;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.stats.Stats;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceContext;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.RayTraceContext.FluidMode;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.util.text.translation.LanguageMap;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -48,6 +51,8 @@ import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.Item.Properties;
/**
* A universal bucket that can hold any liquid
*/
@@ -81,7 +86,7 @@ public class UniversalBucket extends Item
this.setCreativeTab(CreativeTabs.MISC);
*/
BlockDispenser.registerDispenseBehavior(this, DispenseFluidContainer.getInstance());
DispenserBlock.registerDispenseBehavior(this, DispenseFluidContainer.getInstance());
}
@Override
@@ -143,51 +148,52 @@ public class UniversalBucket extends Item
// TODO this is not reliable on the server
if (LanguageMap.getInstance().exists(unloc + "." + fluidStack.getFluid().getName()))
{
return new TextComponentTranslation(unloc + "." + fluidStack.getFluid().getName());
return new TranslationTextComponent(unloc + "." + fluidStack.getFluid().getName());
}
return new TextComponentTranslation(unloc + ".name", fluidStack.getLocalizedName());
return new TranslationTextComponent(unloc + ".name", fluidStack.getLocalizedName());
}
@Override
@Nonnull
public ActionResult<ItemStack> onItemRightClick(@Nonnull World world, @Nonnull EntityPlayer player, @Nonnull EnumHand hand)
public ActionResult<ItemStack> onItemRightClick(@Nonnull World world, @Nonnull PlayerEntity player, @Nonnull Hand hand)
{
ItemStack itemstack = player.getHeldItem(hand);
FluidStack fluidStack = getFluid(itemstack);
// empty bucket shouldn't exist, do nothing since it should be handled by the bucket event
if (fluidStack == null)
{
return new ActionResult<ItemStack>(EnumActionResult.PASS, itemstack);
return new ActionResult<ItemStack>(ActionResultType.PASS, itemstack);
}
// clicked on a block?
RayTraceResult mop = this.rayTrace(world, player, false);
RayTraceResult rt = func_219968_a(world, player, FluidMode.NONE);
ActionResult<ItemStack> ret = ForgeEventFactory.onBucketUse(player, world, itemstack, mop);
ActionResult<ItemStack> ret = ForgeEventFactory.onBucketUse(player, world, itemstack, rt);
if (ret != null) return ret;
if(mop == null || mop.type != RayTraceResult.Type.BLOCK)
if(rt == null || rt.func_216346_c() != RayTraceResult.Type.BLOCK)
{
return new ActionResult<ItemStack>(EnumActionResult.PASS, itemstack);
return new ActionResult<ItemStack>(ActionResultType.PASS, itemstack);
}
BlockPos clickPos = mop.getBlockPos();
BlockRayTraceResult brt = (BlockRayTraceResult) rt;
BlockPos clickPos = brt.func_216350_a();
// can we place liquid there?
if (world.isBlockModifiable(player, clickPos))
{
// the block adjacent to the side we clicked on
BlockPos targetPos = clickPos.offset(mop.sideHit);
BlockPos targetPos = clickPos.offset(brt.func_216354_b());
// can the player place there?
if (player.canPlayerEdit(targetPos, mop.sideHit, itemstack))
if (player.canPlayerEdit(targetPos, brt.func_216354_b(), itemstack))
{
// try placing liquid
FluidActionResult result = FluidUtil.tryPlaceFluid(player, world, targetPos, itemstack, fluidStack);
FluidActionResult result = FluidUtil.tryPlaceFluid(player, world, hand, targetPos, itemstack, fluidStack);
if (result.isSuccess() && !player.abilities.isCreativeMode)
{
// success!
player.addStat(StatList.ITEM_USED.get(this));
player.addStat(Stats.ITEM_USED.get(this));
itemstack.shrink(1);
ItemStack drained = result.getResult();
@@ -196,20 +202,20 @@ public class UniversalBucket extends Item
// check whether we replace the item or add the empty one to the inventory
if (itemstack.isEmpty())
{
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, emptyStack);
return new ActionResult<ItemStack>(ActionResultType.SUCCESS, emptyStack);
}
else
{
// add empty bucket to player inventory
ItemHandlerHelper.giveItemToPlayer(player, emptyStack);
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, itemstack);
return new ActionResult<ItemStack>(ActionResultType.SUCCESS, itemstack);
}
}
}
}
// couldn't place liquid there2
return new ActionResult<ItemStack>(EnumActionResult.FAIL, itemstack);
return new ActionResult<ItemStack>(ActionResultType.FAIL, itemstack);
}
@SubscribeEvent(priority = EventPriority.LOW) // low priority so other mods can handle their stuff first
@@ -232,18 +238,18 @@ public class UniversalBucket extends Item
// needs to target a block
RayTraceResult target = event.getTarget();
if (target == null || target.type != RayTraceResult.Type.BLOCK)
if (target == null || target.func_216346_c() != RayTraceResult.Type.BLOCK)
{
return;
}
World world = event.getWorld();
BlockPos pos = target.getBlockPos();
BlockPos pos = ((BlockRayTraceResult) target).func_216350_a();
ItemStack singleBucket = emptyBucket.copy();
singleBucket.setCount(1);
FluidActionResult filledResult = FluidUtil.tryPickUpFluid(singleBucket, event.getEntityPlayer(), world, pos, target.sideHit);
FluidActionResult filledResult = FluidUtil.tryPickUpFluid(singleBucket, event.getEntityPlayer(), world, pos, ((BlockRayTraceResult) target).func_216354_b());
if (filledResult.isSuccess())
{
event.setResult(net.minecraftforge.eventbus.api.Event.Result.ALLOW);
@@ -289,7 +295,7 @@ public class UniversalBucket extends Item
}
@Override
public ICapabilityProvider initCapabilities(@Nonnull ItemStack stack, NBTTagCompound nbt)
public ICapabilityProvider initCapabilities(@Nonnull ItemStack stack, CompoundNBT nbt)
{
return new FluidBucketWrapper(stack);
}
@@ -19,11 +19,11 @@
package net.minecraftforge.fluids.capability;
import net.minecraft.init.Items;
import net.minecraft.item.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.INBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.INBT;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -49,11 +49,11 @@ public class CapabilityFluidHandler
private static class DefaultFluidHandlerStorage<T extends IFluidHandler> implements Capability.IStorage<T> {
@Override
public INBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side)
public INBT writeNBT(Capability<T> capability, T instance, Direction side)
{
if (!(instance instanceof IFluidTank))
throw new RuntimeException("IFluidHandler instance does not implement IFluidTank");
NBTTagCompound nbt = new NBTTagCompound();
CompoundNBT nbt = new CompoundNBT();
IFluidTank tank = (IFluidTank) instance;
FluidStack fluid = tank.getFluid();
if (fluid != null)
@@ -62,18 +62,18 @@ public class CapabilityFluidHandler
}
else
{
nbt.setString("Empty", "");
nbt.putString("Empty", "");
}
nbt.setInt("Capacity", tank.getCapacity());
nbt.putInt("Capacity", tank.getCapacity());
return nbt;
}
@Override
public void readNBT(Capability<T> capability, T instance, EnumFacing side, INBTBase nbt)
public void readNBT(Capability<T> capability, T instance, Direction side, INBT nbt)
{
if (!(instance instanceof FluidTank))
throw new RuntimeException("IFluidHandler instance is not instance of FluidTank");
NBTTagCompound tags = (NBTTagCompound) nbt;
CompoundNBT tags = (CompoundNBT) nbt;
FluidTank tank = (FluidTank) instance;
tank.setCapacity(tags.getInt("Capacity"));
tank.readFromNBT(tags);
@@ -21,7 +21,7 @@ package net.minecraftforge.fluids.capability;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
@@ -47,7 +47,7 @@ public class ItemFluidContainer extends Item
}
@Override
public ICapabilityProvider initCapabilities(@Nonnull ItemStack stack, @Nullable NBTTagCompound nbt)
public ICapabilityProvider initCapabilities(@Nonnull ItemStack stack, @Nullable CompoundNBT nbt)
{
return new FluidHandlerItemStack(stack, capacity);
}
@@ -19,10 +19,10 @@
package net.minecraftforge.fluids.capability;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.Fluid;
@@ -43,14 +43,14 @@ public class TileFluidHandler extends TileEntity
}
@Override
public void read(NBTTagCompound tag)
public void read(CompoundNBT tag)
{
super.read(tag);
tank.readFromNBT(tag);
}
@Override
public NBTTagCompound write(NBTTagCompound tag)
public CompoundNBT write(CompoundNBT tag)
{
tag = super.write(tag);
tank.writeToNBT(tag);
@@ -59,7 +59,7 @@ public class TileFluidHandler extends TileEntity
@Override
@Nonnull
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing)
{
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
return holder.cast();
@@ -23,8 +23,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
@@ -46,7 +46,7 @@ import net.minecraftforge.fluids.capability.IFluidTankProperties;
public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProvider
{
public static final String FLUID_NBT_KEY = "Fluid";
private final LazyOptional<IFluidHandlerItem> holder = LazyOptional.of(() -> this);
@Nonnull
@@ -73,8 +73,8 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv
@Nullable
public FluidStack getFluid()
{
NBTTagCompound tagCompound = container.getTag();
if (tagCompound == null || !tagCompound.hasKey(FLUID_NBT_KEY))
CompoundNBT tagCompound = container.getTag();
if (tagCompound == null || !tagCompound.contains(FLUID_NBT_KEY))
{
return null;
}
@@ -85,12 +85,12 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv
{
if (!container.hasTag())
{
container.setTag(new NBTTagCompound());
container.setTag(new CompoundNBT());
}
NBTTagCompound fluidTag = new NBTTagCompound();
CompoundNBT fluidTag = new CompoundNBT();
fluid.writeToNBT(fluidTag);
container.getTag().setTag(FLUID_NBT_KEY, fluidTag);
container.getTag().func_218657_a(FLUID_NBT_KEY, fluidTag);
}
@Override
@@ -200,12 +200,12 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv
*/
protected void setContainerToEmpty()
{
container.getTag().removeTag(FLUID_NBT_KEY);
container.getTag().remove(FLUID_NBT_KEY);
}
@Override
@Nonnull
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing)
{
return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
}
@@ -23,8 +23,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
@@ -43,7 +43,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabilityProvider
{
public static final String FLUID_NBT_KEY = "Fluid";
private final LazyOptional<IFluidHandlerItem> holder = LazyOptional.of(() -> this);
@Nonnull
@@ -70,8 +70,8 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili
@Nullable
public FluidStack getFluid()
{
NBTTagCompound tagCompound = container.getTag();
if (tagCompound == null || !tagCompound.hasKey(FLUID_NBT_KEY))
CompoundNBT tagCompound = container.getTag();
if (tagCompound == null || !tagCompound.contains(FLUID_NBT_KEY))
{
return null;
}
@@ -82,12 +82,12 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili
{
if (!container.hasTag())
{
container.setTag(new NBTTagCompound());
container.setTag(new CompoundNBT());
}
NBTTagCompound fluidTag = new NBTTagCompound();
CompoundNBT fluidTag = new CompoundNBT();
fluid.writeToNBT(fluidTag);
container.getTag().setTag(FLUID_NBT_KEY, fluidTag);
container.getTag().func_218657_a(FLUID_NBT_KEY, fluidTag);
}
@Override
@@ -177,12 +177,12 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili
*/
protected void setContainerToEmpty()
{
container.getTag().removeTag(FLUID_NBT_KEY);
container.getTag().remove(FLUID_NBT_KEY);
}
@Override
@Nonnull
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing)
{
return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
}
@@ -24,6 +24,8 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
@@ -22,11 +22,11 @@ package net.minecraftforge.fluids.capability.wrappers;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.init.Items;
import net.minecraft.item.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBucketMilk;
import net.minecraft.item.MilkBucketItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -116,7 +116,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
@Override
public int fill(FluidStack resource, boolean doFill)
{
if (container.getCount() != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME || container.getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource))
if (container.getCount() != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME || container.getItem() instanceof MilkBucketItem || getFluid() != null || !canFillFluidType(resource))
{
return 0;
}
@@ -175,7 +175,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
@Override
@Nonnull
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing)
{
return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
}