From 1722f9738b57db2958efd339a6bc490a643ac5c9 Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Fri, 19 May 2023 18:49:29 +0100
Subject: More recipe collision fixes (#2010)

* dont add the same recipe 300 times

* have custom vac freezer recipes in GT

* have custom vac freezer recipes in coremod
---
 .../java/gregtech/loaders/oreprocessing/ProcessingStick.java  | 11 -----------
 .../gregtech/loaders/postload/recipes/AssemblerRecipes.java   | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/gregtech/loaders')

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
index f1e4fd0cea..b4ccc6f523 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
@@ -1,6 +1,5 @@
 package gregtech.loaders.oreprocessing;
 
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
@@ -143,15 +142,5 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
                     .addTo(sHammerRecipes);
             }
         }
-        GT_Values.RA.stdBuilder()
-            .itemInputs(
-                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
-                GT_Utility.getIntegratedCircuit(2))
-            .itemOutputs(ItemList.FR_Stick.get(1L))
-            .fluidInputs(Materials.SeedOil.getFluid(50L))
-            .noFluidOutputs()
-            .duration(16 * TICKS)
-            .eut(8)
-            .addTo(sAssemblerRecipes);
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 9658a3c0dc..2cc059a964 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -39,6 +39,17 @@ public class AssemblerRecipes implements Runnable {
         Materials LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium;
         Materials LuVMat2 = BartWorks.isModLoaded() ? Materials.get("Rhodium-PlatedPalladium") : Materials.Chrome;
 
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
+                GT_Utility.getIntegratedCircuit(2))
+            .itemOutputs(ItemList.FR_Stick.get(1L))
+            .fluidInputs(Materials.SeedOil.getFluid(50L))
+            .noFluidOutputs()
+            .duration(16 * TICKS)
+            .eut(8)
+            .addTo(sAssemblerRecipes);
+
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
-- 
cgit