Skip to content

Commit d0f5e0e

Browse files
authored
add OreRecipeHandler#processOre oreTypeMultiplier parameter (#2795)
1 parent 4fef8fb commit d0f5e0e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class OreRecipeHandler {
3131

3232
public static void register() {
3333
OrePrefix.ore.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
34-
OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
35-
OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
34+
OrePrefix.oreEndstone.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOreDouble);
35+
OrePrefix.oreNetherrack.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOreDouble);
3636
if (ConfigHolder.worldgen.allUniqueStoneTypes) {
3737
OrePrefix.oreGranite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
3838
OrePrefix.oreDiorite.addProcessingHandler(PropertyKey.ORE, OreRecipeHandler::processOre);
@@ -65,6 +65,14 @@ private static void processMetalSmelting(OrePrefix crushedPrefix, Material mater
6565
}
6666

6767
public static void processOre(OrePrefix orePrefix, Material material, OreProperty property) {
68+
processOre(orePrefix, material, property, 1);
69+
}
70+
71+
public static void processOreDouble(OrePrefix orePrefix, Material material, OreProperty property) {
72+
processOre(orePrefix, material, property, 2);
73+
}
74+
75+
public static void processOre(OrePrefix orePrefix, Material material, OreProperty property, int oreTypeMultiplier) {
6876
Material byproductMaterial = property.getOreByProduct(0, material);
6977
ItemStack byproductStack = OreDictUnifier.get(OrePrefix.gem, byproductMaterial);
7078
if (byproductStack.isEmpty()) byproductStack = OreDictUnifier.get(OrePrefix.dust, byproductMaterial);
@@ -80,7 +88,6 @@ public static void processOre(OrePrefix orePrefix, Material material, OrePropert
8088
} else {
8189
ingotStack = OreDictUnifier.get(OrePrefix.dust, smeltingMaterial);
8290
}
83-
int oreTypeMultiplier = orePrefix == OrePrefix.oreNetherrack || orePrefix == OrePrefix.oreEndstone ? 2 : 1;
8491
ingotStack.setCount(ingotStack.getCount() * property.getOreMultiplier() * oreTypeMultiplier);
8592
crushedStack.setCount(crushedStack.getCount() * property.getOreMultiplier());
8693

0 commit comments

Comments
 (0)