aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-10-20 04:22:18 +0900
committerGitHub <noreply@github.com>2023-10-19 21:22:18 +0200
commitaa43d552b3e21114762caf9dbf71442a8382a487 (patch)
treee26e09f053c4be5f7ec94a19e4bc6505ceb624cf /src/main/java/gregtech/api/util
parent059e99f0fef97b8799e317097555c60030ced994 (diff)
downloadGT5-Unofficial-aa43d552b3e21114762caf9dbf71442a8382a487.tar.gz
GT5-Unofficial-aa43d552b3e21114762caf9dbf71442a8382a487.tar.bz2
GT5-Unofficial-aa43d552b3e21114762caf9dbf71442a8382a487.zip
Fix fluid canner recipes not using correct empty container (#2337)
* Fix fluid canner recipes not using correct empty container * Restore lava bucket fix * Remove now obsolete glass bottle handling + Javadoc
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index b61ec8336f..d72b3a3940 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1849,13 +1849,6 @@ public class GT_Utility {
public static ItemStack fillFluidContainer(FluidStack aFluid, ItemStack aStack, boolean aRemoveFluidDirectly,
boolean aCheckIFluidContainerItems) {
if (isStackInvalid(aStack) || aFluid == null) return null;
- if (GT_ModHandler.isWater(aFluid) && ItemList.Bottle_Empty.isStackEqual(aStack)) {
- if (aFluid.amount >= 250) {
- if (aRemoveFluidDirectly) aFluid.amount -= 250;
- return new ItemStack(Items.potionitem, 1, 0);
- }
- return null;
- }
if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem
&& ((IFluidContainerItem) aStack.getItem()).getFluid(aStack) == null
&& ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) <= aFluid.amount) {
@@ -1962,8 +1955,10 @@ public class GT_Utility {
}
/**
- * Get general container item, not only fluid container but also non-consumable item.
- * {@link #getContainerForFilledItem} works better for fluid container.
+ * This is NOT meant for fluid manipulation! It's for getting item container, which is generally used for
+ * crafting recipes. While it also works for many of the fluid containers, some don't.
+ * <p>
+ * Use {@link #getContainerForFilledItem} for getting empty fluid container.
*/
public static ItemStack getContainerItem(ItemStack aStack, boolean aCheckIFluidContainerItems) {
if (isStackInvalid(aStack)) return null;