From eff844b6e222b578bc0baadbe84f94912cb819f7 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:17:34 +0000
Subject: Add Multiblock Forge Hammer. Add base for Multiblock Molecular
 Transformer.

---
 .../xmod/gregtech/recipes/GregtechRecipeAdder.java  | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index be4d6a8f7d..7a84940b6f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1843,7 +1843,26 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
     }
 
 
-
+    public boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt, int aAmps) {
+    	if ((aInput == null) || (aOutput == null)) {
+    		return false;
+    	}        
+    	GTPP_Recipe aRecipe = new GTPP_Recipe(
+    			false,
+    			new ItemStack[] {aInput},
+    			new ItemStack[] {aOutput},
+    			null,
+    			new int[] {10000},
+    			new FluidStack[] {},
+    			new FluidStack[] {},
+    			aDuration,
+    			aEUt,
+    			aAmps);	
+
+    	int aSize = GTPP_Recipe_Map.sMolecularTransformerRecipes.mRecipeList.size();
+    	GTPP_Recipe_Map.sMolecularTransformerRecipes.add(aRecipe);
+    	return GTPP_Recipe_Map.sMolecularTransformerRecipes.mRecipeList.size() > aSize;
+}
 
 
 
-- 
cgit 


From 8a2686340889660ec82cebcc659a10dce82ac339 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:39:34 +0000
Subject: Fix Auto-Generated ABS recipes sometimes containing two circuits. Fix
 Fluid Extraction recipes for Ingots/Nuggets being generated wrong. Greatly
 improve generation of Fluid Extraction recipes. Removed useless Fluid
 Extractor code which is no longer used. Initial work on the Elemental
 Duplicator.

---
 .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 32 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/recipes')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 7a84940b6f..c7e652023b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.xmod.gregtech.recipes;
 
 import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.api.enums.GT_Values.RA;
 import static gtPlusPlus.core.lib.CORE.GTNH;
 
 import java.lang.reflect.InvocationTargetException;
@@ -1283,12 +1284,39 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 
 	@Override
 	public boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu) {
-		return MaterialGenerator.addFluidExtractionRecipe(GT_Values.NI, input, output, aTime, aEu);
+		
+		boolean aRecipe = RA.addFluidSmelterRecipe(
+				GT_Utility.copyAmount(1, input),
+				null,
+				output,
+				10000,
+				aTime,
+				aEu, 
+				false);
+		if (aRecipe) {
+			Logger.INFO("Added Fluid Extractor Recipe: " 
+					+ input.getDisplayName() + " and obtain " 
+					+ output.amount+"mb of "+output.getLocalizedName()
+					+". Time: "+aTime+", Voltage: "
+					+aEu);
+		}
+		return aRecipe;
+		
+		//return MaterialGenerator.addFluidExtractionRecipe(GT_Values.NI, input, output, aTime, aEu);
 	}
 
 	@Override
 	public boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
-		return MaterialGenerator.addFluidExtractionRecipe(aEmpty, aRemains, aFluid, aDuration, aEU);
+		boolean aRecipe = RA.addFluidSmelterRecipe(
+				GT_Utility.copyAmount(1, aEmpty),
+				aRemains,
+				aFluid,
+				10000,
+				aDuration,
+				aEU, 
+				false);
+		return aRecipe;
+		//return MaterialGenerator.addFluidExtractionRecipe(aEmpty, aRemains, aFluid, aDuration, aEU);
 	}
 
 	@Override
-- 
cgit