gt6 handheld fluid containers can now fill thaumcraft crucibles

GregTech6 · Sep 6, 2023 · 7d1a1ff · 7d1a1ff
1 parent 0e6c07d
commit 7d1a1ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/gregapi/tileentity/tank/TileEntityBase08FluidContainer.java b/src/main/java/gregapi/tileentity/tank/TileEntityBase08FluidContainer.java
@@ -54,6 +54,7 @@
 import net.minecraftforge.fluids.IFluidBlock;
 import net.minecraftforge.fluids.IFluidContainerItem;
 import squeek.applecore.api.food.FoodValues;
+import thaumcraft.common.tiles.TileCrucible;
 
 import java.util.List;
 
@@ -245,6 +246,7 @@ public boolean onItemUseFirst(MultiTileEntityItemInternal aItem, ItemStack aStac
 				}
 
 				TileEntity tTileEntity = WD.te(aWorld, aX, aY, aZ, F);
+
 				try {if (tTileEntity instanceof ICropTile) {
 					int tHydration = ((ICropTile)tTileEntity).getHydrationStorage();
 					int tDrained = Math.min((200-tHydration)/10, mFluid.amount);
@@ -255,6 +257,13 @@ public boolean onItemUseFirst(MultiTileEntityItemInternal aItem, ItemStack aStac
 					}
 					return T;
 				}} catch(Throwable e) {/**/}
+
+				try {if (tTileEntity instanceof TileCrucible) {
+					if (FL.water(mFluid) && FL.nonzero(aItem.drain(aStack, (int)FL.fill((TileCrucible)tTileEntity, SIDE_TOP, FL.Water.make(mFluid.amount), T), T))) {
+						UT.Sounds.send(aWorld, SFX.MC_LIQUID_WATER, 1.0F, 1.0F, aX, aY, aZ);
+					}
+					return T;
+				}} catch(Throwable e) {/**/}
 			}
 		}
 		return F;

diff --git a/src/main/java/gregtech/tileentity/tools/MultiTileEntityFluidTap.java b/src/main/java/gregtech/tileentity/tools/MultiTileEntityFluidTap.java
@@ -107,7 +107,7 @@ public boolean onBlockActivated3(EntityPlayer aPlayer, byte aSide, float aHitX,
 							OreDictMaterialStack tMaterial = OreDictMaterial.FLUID_MAP.get(aFluid.getFluid().getName());
 							aFluid = aFluid.copy();
 							aFluid.amount = Math.min(aFluid.amount, FL.lava(aFluid) ? 1000 : !FL.water(aFluid) && tMaterial != null && tMaterial.mAmount > 0 ? UT.Code.bindInt(tMaterial.mAmount) : 250);
-							if (((ITileEntityTapAccessible)tDelegator.mTileEntity).tapDrain(tDelegator.mSideOfTileEntity, UT.Code.bindInt(((ITileEntityTapFillable)tDelegator2.mTileEntity).tapFill(tDelegator2.mSideOfTileEntity, aFluid, T)), T) != null) {
+							if (FL.nonzero(((ITileEntityTapAccessible)tDelegator.mTileEntity).tapDrain(tDelegator.mSideOfTileEntity, UT.Code.bindInt(((ITileEntityTapFillable)tDelegator2.mTileEntity).tapFill(tDelegator2.mSideOfTileEntity, aFluid, T)), T))) {
 								UT.Sounds.send(SFX.IC_SPRAY, 1.0F, 2.0F, this);
 								UT.Sounds.send(SFX.MC_LIQUID_WATER, 1.0F, 1.0F, this);
 							}