upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2961 Capability data is not preserved by fluid handler interactions (#2976)

Browse Source
This commit is contained in:
mezz authored and LexManos committed 2016-06-13 20:01:28 -07:00
1 parent dd09da27b5
commit 9cd2c697e5
6 files changed
+14 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fluids/FluidUtil.java
+2 -6
View File
@@ -170,9 +170,7 @@ public class FluidUtil
ItemStack filledReal = tryFillContainer(container, fluidSource, maxAmount, player, true);
if (filledReal != null)
{
container.setItem(filledReal.getItem());
container.setTagCompound(filledReal.getTagCompound());
container.setItemDamage(filledReal.getItemDamage());
container.deserializeNBT(filledReal.serializeNBT());
return true;
}
}
@@ -243,9 +241,7 @@ public class FluidUtil
}
else
{
container.setItem(emptiedReal.getItem());
container.setTagCompound(emptiedReal.getTagCompound());
container.setItemDamage(emptiedReal.getItemDamage());
container.deserializeNBT(emptiedReal.serializeNBT());
}
return true;
}
src/main/java/net/minecraftforge/fluids/UniversalBucket.java
+3 -7
View File
@@ -280,8 +280,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
{
if (doFill)
{
container.setItem(Items.WATER_BUCKET);
container.setTagCompound(null);
container.deserializeNBT(new ItemStack(Items.WATER_BUCKET).serializeNBT());
}
return getCapacity();
}
@@ -289,8 +288,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
{
if (doFill)
{
container.setItem(Items.LAVA_BUCKET);
container.setTagCompound(null);
container.deserializeNBT(new ItemStack(Items.LAVA_BUCKET).serializeNBT());
}
return getCapacity();
}
@@ -318,9 +316,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem
{
if(getEmpty() != null)
{
container.setItem(getEmpty().getItem());
container.setTagCompound(getEmpty().getTagCompound());
container.setItemDamage(getEmpty().getItemDamage());
container.deserializeNBT(getEmpty().serializeNBT());
}
else {
container.stackSize = 0;
src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java
+1 -3
View File
@@ -221,9 +221,7 @@ public class FluidHandlerItemStack implements IFluidHandler, ICapabilityProvider
protected void setContainerToEmpty()
{
super.setContainerToEmpty();
container.setItem(emptyContainer.getItem());
container.setTagCompound(emptyContainer.getTagCompound());
container.setItemDamage(emptyContainer.getItemDamage());
container.deserializeNBT(emptyContainer.serializeNBT());
}
}
}
src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java
+1 -3
View File
@@ -198,9 +198,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandler, ICapabilityPr
protected void setContainerToEmpty()
{
super.setContainerToEmpty();
container.setItem(emptyContainer.getItem());
container.setTagCompound(emptyContainer.getTagCompound());
container.setItemDamage(emptyContainer.getItemDamage());
container.deserializeNBT(emptyContainer.serializeNBT());
}
}
}
src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java
+5 -15
View File
@@ -69,34 +69,24 @@ public class FluidBucketWrapper implements IFluidHandler, ICapabilityProvider
protected void setFluid(Fluid fluid) {
if (fluid == null)
{
container.setItem(Items.BUCKET);
container.setTagCompound(null);
container.setItemDamage(0);
container.deserializeNBT(new ItemStack(Items.BUCKET).serializeNBT());
}
else if (fluid == FluidRegistry.WATER)
{
container.setItem(Items.WATER_BUCKET);
container.setTagCompound(null);
container.setItemDamage(0);
container.deserializeNBT(new ItemStack(Items.WATER_BUCKET).serializeNBT());
}
else if (fluid == FluidRegistry.LAVA)
{
container.setItem(Items.LAVA_BUCKET);
container.setTagCompound(null);
container.setItemDamage(0);
container.deserializeNBT(new ItemStack(Items.LAVA_BUCKET).serializeNBT());
}
else if (fluid.getName().equals("milk"))
{
container.setItem(Items.MILK_BUCKET);
container.setTagCompound(null);
container.setItemDamage(0);
container.deserializeNBT(new ItemStack(Items.MILK_BUCKET).serializeNBT());
}
else if (FluidRegistry.isUniversalBucketEnabled() && FluidRegistry.getBucketFluids().contains(fluid))
{
ItemStack filledBucket = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
container.setItem(filledBucket.getItem());
container.setTagCompound(filledBucket.getTagCompound());
container.setItemDamage(filledBucket.getItemDamage());
container.deserializeNBT(filledBucket.serializeNBT());
}
}
src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidContainerRegistryWrapper.java
+2 -10
View File
@@ -28,14 +28,6 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
this.container = container;
}
private void updateContainer(ItemStack newContainerData)
{
container.setItem(newContainerData.getItem());
container.setTagCompound(newContainerData.getTagCompound());
container.setItemDamage(newContainerData.getItemDamage());
container.stackSize = newContainerData.stackSize;
}
@Override
public IFluidTankProperties[] getTankProperties()
{
@@ -62,7 +54,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
if (doFill)
{
updateContainer(result);
container.deserializeNBT(result.serializeNBT());
}
FluidStack newContained = FluidContainerRegistry.getFluidForFilledItem(result);
@@ -113,7 +105,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
{
emptyContainer.stackSize = 0;
}
updateContainer(emptyContainer);
container.deserializeNBT(emptyContainer.serializeNBT());
}
return contained;
}