From ea1961a2e7099152260f2568b91146fb40268847 Mon Sep 17 00:00:00 2001 From: Dragon-Seeker Date: Mon, 13 Mar 2023 20:20:57 -0500 Subject: [PATCH] Fix Issues with Datagen - Recipe Override Range not including upper values - Use the Input Tag instead of the AF Gold Tag --- .../data/providers/AlloyForgeryRecipeProvider.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java b/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java index 8cbab1e..154f703 100644 --- a/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java +++ b/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java @@ -1,6 +1,5 @@ package wraith.alloyforgery.data.providers; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions; @@ -9,7 +8,6 @@ import net.minecraft.item.Items; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import wraith.alloyforgery.data.AlloyForgeryTags; import wraith.alloyforgery.data.builders.AlloyForgeryRecipeBuilder; import java.util.function.Consumer; @@ -121,8 +119,8 @@ public void generate(Consumer exporter) { public static AlloyForgeryRecipeBuilder createOverriddenRawBlockRecipe(String materialType, TagKey output, TagKey input, int inputAmount, int outputAmount, int overrideIndex, int overrideAmount, int fuelPerTick){ return AlloyForgeryRecipeBuilder.create(output, outputAmount) .input(input, inputAmount) - .criterion("has_raw_" + materialType + "_ore_block", conditionsFromTag(AlloyForgeryTags.Items.RAW_GOLD_ORE_BLOCKS)) - .overrideRange(overrideIndex, overrideAmount) + .criterion("has_raw_" + materialType + "_ore_block", conditionsFromTag(input)) + .overrideRange(overrideIndex, true, overrideAmount) .setFuelPerTick(fuelPerTick); } @@ -145,8 +143,8 @@ public static AlloyForgeryRecipeBuilder createExtremeRawBlockRecipe(String mater public static AlloyForgeryRecipeBuilder createRawBlockRecipe(String materialType, Item output, TagKey input){ return AlloyForgeryRecipeBuilder.create(output,3) .input(input, 2) - .criterion("has_raw_" + materialType + "_ore_block", conditionsFromTag(AlloyForgeryTags.Items.RAW_GOLD_ORE_BLOCKS)) - .overrideRange(2, 4) + .criterion("has_raw_" + materialType + "_ore_block", conditionsFromTag(input)) + .overrideRange(2, true, 4) .setFuelPerTick(45); }