Fixed milk buckets that have been filled from a barrel/large vessel m…

…issing their NBT data.
Deadrik · Dec 19, 2015 · 726183c · 726183c
1 parent 2de25a6
commit 726183c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Common/com/bioxx/tfc/Blocks/Devices/BlockBarrel.java b/src/Common/com/bioxx/tfc/Blocks/Devices/BlockBarrel.java
@@ -40,6 +40,7 @@
 import com.bioxx.tfc.Entities.EntityBarrel;
 import com.bioxx.tfc.Items.ItemBlocks.ItemBarrels;
 import com.bioxx.tfc.Items.ItemBlocks.ItemLargeVessel;
+import com.bioxx.tfc.Items.Tools.ItemCustomBucketMilk;
 import com.bioxx.tfc.TileEntities.TEBarrel;
 import com.bioxx.tfc.api.TFCBlocks;
 import com.bioxx.tfc.api.TFCItems;
@@ -385,6 +386,11 @@ else if(FluidContainerRegistry.isEmptyContainer(equippedItem) || equippedItem.ge
 					return false;
 				}
 
+				if (is.getItem() == TFCItems.woodenBucketMilk)
+				{
+					ItemCustomBucketMilk.createTag(is, 20f);
+				}
+
 				equippedItem.stackSize--;
 
 				if (equippedItem.stackSize == 0)

diff --git a/src/Common/com/bioxx/tfc/TileEntities/TEBarrel.java b/src/Common/com/bioxx/tfc/TileEntities/TEBarrel.java
@@ -23,6 +23,7 @@
 import com.bioxx.tfc.Core.TFC_Core;
 import com.bioxx.tfc.Core.TFC_Time;
 import com.bioxx.tfc.Food.ItemFoodTFC;
+import com.bioxx.tfc.Items.Tools.ItemCustomBucketMilk;
 import com.bioxx.tfc.api.*;
 import com.bioxx.tfc.api.Constant.Global;
 import com.bioxx.tfc.api.Crafting.*;
@@ -750,7 +751,12 @@ else if(mode == MODE_OUT)
 				}
 				else if(FluidContainerRegistry.isEmptyContainer(container))
 				{
-					this.setInventorySlotContents(0, this.removeLiquid(getInputStack()));
+					ItemStack fullContainer = this.removeLiquid(getInputStack());
+					if (fullContainer.getItem() == TFCItems.woodenBucketMilk)
+					{
+						ItemCustomBucketMilk.createTag(fullContainer, 20f);
+					}
+					this.setInventorySlotContents(0, fullContainer);
 				}
 			}
 		}