From b0e8e7780a75326180ed58d26aeee4a5f8403312 Mon Sep 17 00:00:00 2001
From: Tech22 <37029404+techlord22@users.noreply.github.com>
Date: Sat, 17 May 2025 12:49:01 -0400
Subject: [PATCH 1/2] add OreRecipeHandler#processOre oreTypeMultiplier
 parameter

---
 .../loaders/recipe/handlers/OreRecipeHandler.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
index c31486610f2..cb35659b816 100644
--- a/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
@@ -31,8 +31,10 @@ public class OreRecipeHandler {
 
     public static void register() {
         OrePrefix.ore.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
-        OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
-        OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
+        OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE,
+                ((prefix, material, property) -> processOre(prefix, material, property, 2)));
+        OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE,
+                ((prefix, material, property) -> processOre(prefix, material, property, 2)));
         if (ConfigHolder.worldgen.allUniqueStoneTypes) {
             OrePrefix.oreGranite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
             OrePrefix.oreDiorite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
@@ -65,6 +67,10 @@ private static void processMetalSmelting(OrePrefix crushedPrefix, Material mater
     }
 
     public static void processOre(OrePrefix orePrefix, Material material, OreProperty property) {
+        processOre(OrePrefix.ore, material, property, 1);
+    }
+
+    public static void processOre(OrePrefix orePrefix, Material material, OreProperty property, int oreTypeMultiplier) {
         Material byproductMaterial = property.getOreByProduct(0, material);
         ItemStack byproductStack = OreDictUnifier.get(OrePrefix.gem, byproductMaterial);
         if (byproductStack.isEmpty()) byproductStack = OreDictUnifier.get(OrePrefix.dust, byproductMaterial);
@@ -80,7 +86,6 @@ public static void processOre(OrePrefix orePrefix, Material material, OrePropert
         } else {
             ingotStack = OreDictUnifier.get(OrePrefix.dust, smeltingMaterial);
         }
-        int oreTypeMultiplier = orePrefix == OrePrefix.oreNetherrack || orePrefix == OrePrefix.oreEndstone ? 2 : 1;
         ingotStack.setCount(ingotStack.getCount() * property.getOreMultiplier() * oreTypeMultiplier);
         crushedStack.setCount(crushedStack.getCount() * property.getOreMultiplier());
 

From 173ad96ae2b287a6a99b5a561a6745ba5038b15a Mon Sep 17 00:00:00 2001
From: Tech22 <37029404+techlord22@users.noreply.github.com>
Date: Sat, 17 May 2025 17:22:36 -0400
Subject: [PATCH 2/2] add OreRecipeHandler#processOreDouble

---
 .../loaders/recipe/handlers/OreRecipeHandler.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
index cb35659b816..39db751beae 100644
--- a/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
+++ b/src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
@@ -31,10 +31,8 @@ public class OreRecipeHandler {
 
     public static void register() {
         OrePrefix.ore.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
-        OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE,
-                ((prefix, material, property) -> processOre(prefix, material, property, 2)));
-        OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE,
-                ((prefix, material, property) -> processOre(prefix, material, property, 2)));
+        OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOreDouble);
+        OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOreDouble);
         if (ConfigHolder.worldgen.allUniqueStoneTypes) {
             OrePrefix.oreGranite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
             OrePrefix.oreDiorite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
@@ -67,7 +65,11 @@ private static void processMetalSmelting(OrePrefix crushedPrefix, Material mater
     }
 
     public static void processOre(OrePrefix orePrefix, Material material, OreProperty property) {
-        processOre(OrePrefix.ore, material, property, 1);
+        processOre(orePrefix, material, property, 1);
+    }
+
+    public static void processOreDouble(OrePrefix orePrefix, Material material, OreProperty property) {
+        processOre(orePrefix, material, property, 2);
     }
 
     public static void processOre(OrePrefix orePrefix, Material material, OreProperty property, int oreTypeMultiplier) {