From f3a698a3af1826ef6f5ac719d31334b930e0005e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 24 Nov 2019 16:14:12 +0000
Subject: + Added Concurrent Set objects to the API. + Added Flexible Pair
 objects to the API. + Added logging to ICO formation code. % Adjusted
 position of GUI elements in NEI for Chemical Plant recipes. % Adjusted the
 recipe for the Lava Filter. % Adjusted which fluids are returned when
 requesting tiered fluids from CI. This will inevitably adjust many recipes as
 a result. % Adjusted handling of the creative energy buffer. % Adjusted
 Achievement handler for Dev Mode. % Adjusted Tank Capacity on my Chemical
 Plants. $ Fixed Output buffer checks on multiblocks, Closes #574. $ Fixed LuV
 Super Bus recipes, Closes #575. (ULV super bus recipe is still broken for the
 time being) $ Attempted once more to fix Hot Water localization.

---
 src/Java/gtPlusPlus/core/recipe/common/CI.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/recipe/common')

diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 63477cda19..968a96135e 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -634,12 +634,22 @@ public class CI {
 	}
 
 	public static FluidStack getTieredFluid(int aTier, int aAmount, int aType) {
-		ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
+		// Weird Legacy handling
+		/*ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
 		FluidStack a = GT_Utility.getFluidForFilledItem(aCell, true);
 		if (a == null) {
 			a = aMaster[aType][aTier].getFluid(aAmount);
-		}
-		a.amount = aAmount;
+		}*/		
+		
+		// Modern Handling
+		FluidStack a = aMaster[aType][aTier].getFluid(aAmount);			
+		if (a == null) {
+			ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
+			if (aCell != null) {
+				a = GT_Utility.getFluidForFilledItem(aCell, true);
+				a.amount = aAmount;
+			}
+		}		
 		return a;
 	}
 	
-- 
cgit