Fix Fluorite Dehydrator recipe.

Add Tooltip to 8k/32k Volumetric Flasks to show max capacity.

3 files changed, 37 insertions, 120 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index fda7760607..10dea8a7bf 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -6,8 +6,10 @@ import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -22,7 +24,7 @@ public class GeneralTooltipEventHandler {
 	@SubscribeEvent
 	public void onItemTooltip(ItemTooltipEvent event){
 
-		
+
 		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
 			return;
 		}
@@ -68,8 +70,16 @@ public class GeneralTooltipEventHandler {
 				event.toolTip.add(EnumChatFormatting.GOLD+"Capacity: "+EnumChatFormatting.AQUA+"128000L");
 			}
 		}
-		
-		
+
+		// Custom Flasks
+
+		if (GregtechItemList.VOLUMETRIC_FLASK_8k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_8k.getItem()) {		
+			event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(8000)+"L");
+		}
+		if (GregtechItemList.VOLUMETRIC_FLASK_32k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_32k.getItem()) {	
+			event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(32000)+"L");
+		}
+
 
 		if (CORE.ConfigSwitches.enableAnimatedTurbines) {
 			boolean shift = false;					
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c8b65bfd37..3d0e6aebfd 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1290,30 +1290,6 @@ public class RECIPES_GREGTECH {
 				2 * 20, 
 				500); // EU
 
-		// CaF2 + H2SO4 → CaSO4(solid) + 2 HF
-		FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000);
-		if (aGregtechHydro == null) {
-			aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000);
-		}
-
-		CORE.RA.addDehydratorRecipe(
-				new ItemStack[] { 
-						CI.getNumberedAdvancedCircuit(5),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),							
-				},
-				FluidUtils.getFluidStack("sulfuricacid", 56 * 144),
-				aGregtechHydro, // Fluid output (slot 2)
-				new ItemStack[] {
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
-				}, 
-				new int[] { 10000, 100, 100, 300, 200 },
-				10 * 60 * 20, 
-				230); // EU
-
 
 		CORE.RA.addDehydratorRecipe(
 				new ItemStack[] {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
index 85f239c12e..b285d41652 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
@@ -21,6 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeGen_Fluorite extends RecipeGen_Base {
 
@@ -194,99 +195,29 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
 			Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust");
 		}
 		
-		AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>();
-		for (MaterialStack r : material.getComposites()){
-			if (r != null){
-				componentMap.put(new Pair<Integer, Material>(r.getPartsPerOneHundred(), r.getStackMaterial()));
-			}
-		}
-		
-		//Process Dust
-		if (componentMap.size() > 1 && componentMap.size() <= 9){
-			Logger.MATERIALS("[Issue][Electrolyzer] "+material.getLocalizedName()+" is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead.");
-
-			ItemStack mInternalOutputs[] = new ItemStack[9];
-			int mChances[] = new int[9];
-			int mCellCount = 0;
-
-			int mTotalCount = 0;
-
-			int mCounter = 0;
-			for (Pair<Integer, Material> f : componentMap){
-				if (f.getValue().getState() != MaterialState.SOLID && f.getValue().getState() != MaterialState.ORE){
-					Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding "+f.getKey()+" cells of "+f.getValue().getLocalizedName()+".");
-					mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
-					mCellCount += f.getKey();
-					mTotalCount += f.getKey();
-					Logger.MATERIALS("[Dehydrator] In total, adding "+mCellCount+" cells for "+material.getLocalizedName()+" processing.");
-				}
-				else {
-					Logger.MATERIALS("[Dehydrator] Found Solid Component, adding "+f.getKey()+" dusts of "+f.getValue().getLocalizedName()+".");
-					mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
-					mTotalCount += f.getKey();
-				}
-			}				
-
-			//Build Output Array
-			for (int g=0;g<mInternalOutputs.length;g++){
-				Logger.MATERIALS("[Dehydrator] Is output["+g+"] valid with a chance? "+(mInternalOutputs[g] != null ? 10000 : 0));
-				mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
-			}
-
-			ItemStack emptyCell = null;
-			if (mCellCount > 0){
-				emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount);
-				Logger.MATERIALS("[Dehydrator] Recipe now requires "+mCellCount+" empty cells as input.");
-			}
-
-			ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
-			if (mainDust != null){
-				Logger.MATERIALS("[Dehydrator] Recipe now requires "+material.smallestStackSizeWhenProcessing+"x "+mainDust.getDisplayName()+" as input.");					
-			}
-			else {
-				mainDust = material.getDust(mTotalCount);
-				Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative.");	
-				if (mainDust != null){
-					Logger.MATERIALS("[Dehydrator] Recipe now requires "+mTotalCount+"x "+mainDust.getDisplayName()+" as input.");					
-				}
-				else {
-					Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting.");					
-				}
-			}
-
-			for (int j=0;j<mInternalOutputs.length;j++){
-				if (mInternalOutputs[j] == null){
-					mInternalOutputs[j] = GT_Values.NI;
-					Logger.MATERIALS("[Dehydrator] Set slot "+j+"  to null.");
-				}
-				else {
-					Logger.MATERIALS("[Dehydrator] Set slot "+j+" to "+mInternalOutputs[j].getDisplayName()+".");						
-				}
-			}
-
-			try{		
-
-
-				if (CORE.RA.addDehydratorRecipe(
-						new ItemStack[]{mainDust, emptyCell},
-						null,
-						null,
-						mInternalOutputs,
-						mChances,
-						(int) Math.max(material.getMass() * 8L, 1),
-						tVoltageMultiplier)){
-					Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "+matDust.getDisplayName());
-				}
-				else {
-					Logger.MATERIALS("[Dehydrator] Failed to generate Dehydrator recipe for "+matDust.getDisplayName());					
-				}
-			}
-			catch(Throwable t){
-				t.printStackTrace();
-			}
-
-
-		}
+		// CaF2 + H2SO4 → CaSO4(solid) + 2 HF
+		FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000);
+		if (aGregtechHydro == null) {
+			aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000);
+		}
+
+		CORE.RA.addDehydratorRecipe(
+				new ItemStack[] { 
+						CI.getNumberedAdvancedCircuit(5),
+						FLUORIDES.FLUORITE.getDust(37),							
+				},
+				FluidUtils.getFluidStack("sulfuricacid", 8000),
+				aGregtechHydro, // Fluid output (slot 2)
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
+				}, 
+				new int[] { 10000, 1000, 1000, 3000, 2000 },
+				10 * 60 * 20, 
+				240); // EU
 		
 	}