Skip to content

add OreRecipeHandler#processOre oreTypeMultiplier parameter #2795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TechLord22 merged 2 commits into from
May 17, 2025
Merged

add OreRecipeHandler#processOre oreTypeMultiplier parameter #2795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0e8e77
add OreRecipeHandler#processOre oreTypeMultiplier parameter
TechLord22 May 17, 2025
173ad96
add OreRecipeHandler#processOreDouble
TechLord22 May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/main/java/gregtech/loaders/recipe/handlers/OreRecipeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ 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, 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);
Expand Down Expand Up @@ -65,6 +65,14 @@ private static void processMetalSmelting(OrePrefix crushedPrefix, Material mater
}

public static void processOre(OrePrefix orePrefix, Material material, OreProperty property) {
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) {
Material byproductMaterial = property.getOreByProduct(0, material);
ItemStack byproductStack = OreDictUnifier.get(OrePrefix.gem, byproductMaterial);
if (byproductStack.isEmpty()) byproductStack = OreDictUnifier.get(OrePrefix.dust, byproductMaterial);
Expand All @@ -80,7 +88,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());

Expand Down
Loading