Skip to content

(Attempt to) Fix ore block macerator recipes being unified wrong by Almost Unified #5391

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

Open
screret wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

(Attempt to) Fix ore block macerator recipes being unified wrong by Almost Unified #5391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.neoforged.neoforge.common.crafting.IntersectionIngredient;

import it.unimi.dsi.fastutil.objects.ObjectIntPair;
import org.jetbrains.annotations.NotNull;
Expand All @@ -27,7 +29,6 @@

import static com.gregtechceu.gtceu.api.GTValues.*;
import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.*;
import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags.HIGH_SIFTER_OUTPUT;
import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*;
Expand Down Expand Up @@ -77,7 +78,12 @@ private static void processOre(@NotNull RecipeOutput provider, @NotNull TagPrefi
return;
}

var inputStack = ChemicalHelper.get(orePrefix, material);
// we assume the tag prefix is a properly defined ore tag prefix here
Ingredient input = IntersectionIngredient.of(
Ingredient.of(ChemicalHelper.getTag(orePrefix, material)),
// Hardcoded index to the "ores_in_ground/<stone type>" parent tag.
// Not a great solution by any means, but it'll do for now
Ingredient.of(orePrefix.getItemParentTags().get(0)));

Material byproductMaterial = property.getOreByProduct(0, material);
ItemStack byproductStack = ChemicalHelper.get(gem, byproductMaterial);
Expand Down Expand Up @@ -107,7 +113,7 @@ private static void processOre(@NotNull RecipeOutput provider, @NotNull TagPrefi
int crushedCount = property.getOreMultiplier() * oreTypeMultiplier;
GTRecipeBuilder builder = FORGE_HAMMER_RECIPES
.recipeBuilder("hammer_" + prefixString + material.getName() + "_ore_to_crushed_ore")
.inputItems(inputStack)
.inputItems(input)
.EUt(16)
.duration(10)
.category(GTRecipeCategories.ORE_FORGING);
Expand All @@ -120,7 +126,7 @@ private static void processOre(@NotNull RecipeOutput provider, @NotNull TagPrefi

builder = MACERATOR_RECIPES
.recipeBuilder("macerate_" + prefixString + material.getName() + "_ore_to_crushed_ore")
.inputItems(inputStack)
.inputItems(input)
.outputItems(crushedStack.copyWithCount(crushedCount * 2))
.chancedOutput(byproductStack, 1400)
.EUt(2)
Expand All @@ -141,11 +147,11 @@ private static void processOre(@NotNull RecipeOutput provider, @NotNull TagPrefi
if (!ingotStack.isEmpty() && doesMaterialUseNormalFurnace(smeltingMaterial) && !orePrefix.isIgnored(material)) {
float xp = Math.round(((1 + oreTypeMultiplier * 0.5f) * 0.5f - 0.05f) * 10f) / 10f;
VanillaRecipeHelper.addSmeltingRecipe(provider,
"smelt_" + prefixString + material.getName() + "_ore_to_ingot", inputStack,
ingotStack, xp);
"smelt_" + prefixString + material.getName() + "_ore_to_ingot",
input, ingotStack, xp);
VanillaRecipeHelper.addBlastingRecipe(provider,
"smelt_" + prefixString + material.getName() + "_ore_to_ingot", inputStack,
ingotStack, xp);
"smelt_" + prefixString + material.getName() + "_ore_to_ingot",
input, ingotStack, xp);
}
}

Expand Down
Loading