diff --git a/gradle.properties b/gradle.properties index b82df8c6..ebafccc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_version=1.3.x -minecraft_version=1.20 -forge_version=46.0.2 +minecraft_version=1.20.2 +forge_version=48.1.0 diff --git a/src/main/java/com/tterrag/registrate/providers/RegistrateAdvancementProvider.java b/src/main/java/com/tterrag/registrate/providers/RegistrateAdvancementProvider.java index 2e11ac59..02e7b726 100644 --- a/src/main/java/com/tterrag/registrate/providers/RegistrateAdvancementProvider.java +++ b/src/main/java/com/tterrag/registrate/providers/RegistrateAdvancementProvider.java @@ -1,12 +1,9 @@ package com.tterrag.registrate.providers; import com.google.common.collect.Lists; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.tterrag.registrate.AbstractRegistrate; import lombok.extern.log4j.Log4j2; - -import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.HolderLookup; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; @@ -25,9 +22,7 @@ import java.util.function.Consumer; @Log4j2 -public class RegistrateAdvancementProvider implements RegistrateProvider, Consumer { - - private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create(); +public class RegistrateAdvancementProvider implements RegistrateProvider, Consumer { private final AbstractRegistrate owner; private final PackOutput packOutput; @@ -74,23 +69,23 @@ public CompletableFuture run(CachedOutput cache) { } @Override - public void accept(@Nullable Advancement t) { + public void accept(@Nullable AdvancementHolder t) { CachedOutput cache = this.cache; if (cache == null) { throw new IllegalStateException("Cannot accept advancements outside of act"); } Objects.requireNonNull(t, "Cannot accept a null advancement"); Path path = this.packOutput.getOutputFolder(); - if (!seenAdvancements.add(t.getId())) { - throw new IllegalStateException("Duplicate advancement " + t.getId()); + if (!seenAdvancements.add(t.id())) { + throw new IllegalStateException("Duplicate advancement " + t.id()); } else { Path path1 = getPath(path, t); - advancementsToSave.add(DataProvider.saveStable(cache, t.deconstruct().serializeToJson(), path1)); + advancementsToSave.add(DataProvider.saveStable(cache, t.value().serializeToJson(), path1)); } } - private static Path getPath(Path pathIn, Advancement advancementIn) { - return pathIn.resolve("data/" + advancementIn.getId().getNamespace() + "/advancements/" + advancementIn.getId().getPath() + ".json"); + private static Path getPath(Path pathIn, AdvancementHolder advancementIn) { + return pathIn.resolve("data/" + advancementIn.id().getNamespace() + "/advancements/" + advancementIn.id().getPath() + ".json"); } public String getName() { diff --git a/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java b/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java index a6618cd1..0c2ff797 100644 --- a/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java +++ b/src/main/java/com/tterrag/registrate/providers/RegistrateRecipeProvider.java @@ -1,31 +1,22 @@ package com.tterrag.registrate.providers; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.function.Consumer; -import java.util.function.Supplier; - -import javax.annotation.CheckReturnValue; -import javax.annotation.Generated; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableMap; import com.google.gson.JsonObject; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.nullness.NonNullSupplier; - import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.critereon.EnterBlockTrigger; +import net.minecraft.advancements.AdvancementHolder; +import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.advancements.critereon.ItemPredicate; -import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.data.BlockFamily; import net.minecraft.data.CachedOutput; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; @@ -44,7 +35,14 @@ import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.registries.ForgeRegistries; -public class RegistrateRecipeProvider extends RecipeProvider implements RegistrateProvider, Consumer { +import javax.annotation.CheckReturnValue; +import javax.annotation.Generated; +import javax.annotation.Nullable; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +public class RegistrateRecipeProvider extends RecipeProvider implements RegistrateProvider, RecipeOutput { private final AbstractRegistrate owner; @@ -59,21 +57,26 @@ public LogicalSide getSide() { } @Nullable - private Consumer callback; + private RecipeOutput output; @Override public void accept(@Nullable FinishedRecipe t) { - if (callback == null) { + if (output == null) { throw new IllegalStateException("Cannot accept recipes outside of a call to registerRecipes"); } - callback.accept(t); + output.accept(t); } @Override - protected void buildRecipes(Consumer consumer) { - this.callback = consumer; + protected void buildRecipes(RecipeOutput output) { + this.output = output; owner.genData(ProviderType.RECIPE, this); - this.callback = null; + this.output = null; + } + + @Override + public Advancement.Builder advancement() { + return Advancement.Builder.recipeAdvancement().parent(RecipeBuilder.ROOT_RECIPE_ADVANCEMENT); } public ResourceLocation safeId(ResourceLocation id) { @@ -306,289 +309,264 @@ public void trapDoor(DataIngredient source, RecipeCategory /** Generated override to expose protected method: {@link RecipeProvider#saveAdvancement} */ @Override - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public CompletableFuture saveAdvancement(CachedOutput output, FinishedRecipe finishedRecipe, JsonObject advancementJson) { return super.saveAdvancement(output, finishedRecipe, advancementJson); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public CompletableFuture saveAdvancement(CachedOutput output, ResourceLocation advancementId, JsonObject advancementJson, FinishedRecipe finishedRecipe) { return super.saveAdvancement(output, advancementId, advancementJson, finishedRecipe); } /** Generated override to expose protected method: {@link RecipeProvider#buildAdvancement} */ @Override - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public CompletableFuture buildAdvancement(CachedOutput p_253674_, ResourceLocation p_254102_, Advancement.Builder p_253712_) { return super.buildAdvancement(p_253674_, p_254102_, p_253712_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public CompletableFuture buildAdvancement(CachedOutput p_253674_, AdvancementHolder p_297687_) { return super.buildAdvancement(p_253674_, p_297687_); } /** Generated override to expose protected method: {@link RecipeProvider#generateForEnabledBlockFamilies} */ - @Override - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public void generateForEnabledBlockFamilies(Consumer p_249188_, FeatureFlagSet p_251836_) { super.generateForEnabledBlockFamilies(p_249188_, p_251836_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void generateForEnabledBlockFamilies(RecipeOutput p_300618_, FeatureFlagSet p_251836_) { RecipeProvider.generateForEnabledBlockFamilies(p_300618_, p_251836_); } /** Generated override to expose protected method: {@link RecipeProvider#oreSmelting} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void oreSmelting(Consumer p_250654_, List p_250172_, RecipeCategory p_250588_, ItemLike p_251868_, float p_250789_, int p_252144_, String p_251687_) { RecipeProvider.oreSmelting(p_250654_, p_250172_, p_250588_, p_251868_, p_250789_, p_252144_, p_251687_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void oreSmelting(RecipeOutput p_300202_, List p_250172_, RecipeCategory p_250588_, ItemLike p_251868_, float p_250789_, int p_252144_, String p_251687_) { RecipeProvider.oreSmelting(p_300202_, p_250172_, p_250588_, p_251868_, p_250789_, p_252144_, p_251687_); } /** Generated override to expose protected method: {@link RecipeProvider#oreBlasting} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void oreBlasting(Consumer p_248775_, List p_251504_, RecipeCategory p_248846_, ItemLike p_249735_, float p_248783_, int p_250303_, String p_251984_) { RecipeProvider.oreBlasting(p_248775_, p_251504_, p_248846_, p_249735_, p_248783_, p_250303_, p_251984_); } - - /** Generated override to expose protected method: {@link RecipeProvider#oreCooking} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void oreCooking(Consumer p_250791_, RecipeSerializer p_251817_, List p_249619_, RecipeCategory p_251154_, ItemLike p_250066_, float p_251871_, int p_251316_, String p_251450_, String p_249236_) { RecipeProvider.oreCooking(p_250791_, p_251817_, p_249619_, p_251154_, p_250066_, p_251871_, p_251316_, p_251450_, p_249236_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void oreBlasting(RecipeOutput p_298528_, List p_251504_, RecipeCategory p_248846_, ItemLike p_249735_, float p_248783_, int p_250303_, String p_251984_) { RecipeProvider.oreBlasting(p_298528_, p_251504_, p_248846_, p_249735_, p_248783_, p_250303_, p_251984_); } /** Generated override to expose protected method: {@link RecipeProvider#netheriteSmithing} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void netheriteSmithing(Consumer p_251614_, Item p_250046_, RecipeCategory p_248986_, Item p_250389_) { RecipeProvider.netheriteSmithing(p_251614_, p_250046_, p_248986_, p_250389_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void netheriteSmithing(RecipeOutput p_298409_, Item p_250046_, RecipeCategory p_248986_, Item p_250389_) { RecipeProvider.netheriteSmithing(p_298409_, p_250046_, p_248986_, p_250389_); } /** Generated override to expose protected method: {@link RecipeProvider#trimSmithing} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void trimSmithing(Consumer p_285086_, Item p_285461_, ResourceLocation p_285044_) { RecipeProvider.trimSmithing(p_285086_, p_285461_, p_285044_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void trimSmithing(RecipeOutput p_297574_, Item p_285461_, ResourceLocation p_285044_) { RecipeProvider.trimSmithing(p_297574_, p_285461_, p_285044_); } /** Generated override to expose protected method: {@link RecipeProvider#twoByTwoPacker} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void twoByTwoPacker(Consumer p_248860_, RecipeCategory p_250881_, ItemLike p_252184_, ItemLike p_249710_) { RecipeProvider.twoByTwoPacker(p_248860_, p_250881_, p_252184_, p_249710_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void twoByTwoPacker(RecipeOutput p_297675_, RecipeCategory p_250881_, ItemLike p_252184_, ItemLike p_249710_) { RecipeProvider.twoByTwoPacker(p_297675_, p_250881_, p_252184_, p_249710_); } /** Generated override to expose protected method: {@link RecipeProvider#threeByThreePacker} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void threeByThreePacker(Consumer p_259036_, RecipeCategory p_259247_, ItemLike p_259376_, ItemLike p_259717_, String p_260308_) { RecipeProvider.threeByThreePacker(p_259036_, p_259247_, p_259376_, p_259717_, p_260308_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void threeByThreePacker(RecipeOutput p_298075_, RecipeCategory p_259247_, ItemLike p_259376_, ItemLike p_259717_, String p_260308_) { RecipeProvider.threeByThreePacker(p_298075_, p_259247_, p_259376_, p_259717_, p_260308_); } /** Generated override to expose protected method: {@link RecipeProvider#threeByThreePacker} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void threeByThreePacker(Consumer p_260012_, RecipeCategory p_259186_, ItemLike p_259360_, ItemLike p_259263_) { RecipeProvider.threeByThreePacker(p_260012_, p_259186_, p_259360_, p_259263_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void threeByThreePacker(RecipeOutput p_299853_, RecipeCategory p_259186_, ItemLike p_259360_, ItemLike p_259263_) { RecipeProvider.threeByThreePacker(p_299853_, p_259186_, p_259360_, p_259263_); } /** Generated override to expose protected method: {@link RecipeProvider#planksFromLog} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void planksFromLog(Consumer p_259712_, ItemLike p_259052_, TagKey p_259045_, int p_259471_) { RecipeProvider.planksFromLog(p_259712_, p_259052_, p_259045_, p_259471_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void planksFromLog(RecipeOutput p_298877_, ItemLike p_259052_, TagKey p_259045_, int p_259471_) { RecipeProvider.planksFromLog(p_298877_, p_259052_, p_259045_, p_259471_); } /** Generated override to expose protected method: {@link RecipeProvider#planksFromLogs} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void planksFromLogs(Consumer p_259910_, ItemLike p_259193_, TagKey p_259818_, int p_259807_) { RecipeProvider.planksFromLogs(p_259910_, p_259193_, p_259818_, p_259807_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void planksFromLogs(RecipeOutput p_298139_, ItemLike p_259193_, TagKey p_259818_, int p_259807_) { RecipeProvider.planksFromLogs(p_298139_, p_259193_, p_259818_, p_259807_); } /** Generated override to expose protected method: {@link RecipeProvider#woodFromLogs} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void woodFromLogs(Consumer p_126003_, ItemLike p_126004_, ItemLike p_126005_) { RecipeProvider.woodFromLogs(p_126003_, p_126004_, p_126005_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void woodFromLogs(RecipeOutput p_298359_, ItemLike p_126004_, ItemLike p_126005_) { RecipeProvider.woodFromLogs(p_298359_, p_126004_, p_126005_); } /** Generated override to expose protected method: {@link RecipeProvider#woodenBoat} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void woodenBoat(Consumer p_126022_, ItemLike p_126023_, ItemLike p_126024_) { RecipeProvider.woodenBoat(p_126022_, p_126023_, p_126024_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void woodenBoat(RecipeOutput p_300366_, ItemLike p_126023_, ItemLike p_126024_) { RecipeProvider.woodenBoat(p_300366_, p_126023_, p_126024_); } /** Generated override to expose protected method: {@link RecipeProvider#chestBoat} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void chestBoat(Consumer p_236372_, ItemLike p_236373_, ItemLike p_236374_) { RecipeProvider.chestBoat(p_236372_, p_236373_, p_236374_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void chestBoat(RecipeOutput p_300411_, ItemLike p_236373_, ItemLike p_236374_) { RecipeProvider.chestBoat(p_300411_, p_236373_, p_236374_); } /** Generated override to expose protected method: {@link RecipeProvider#buttonBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder buttonBuilder(ItemLike p_176659_, Ingredient p_176660_) { return RecipeProvider.buttonBuilder(p_176659_, p_176660_); } /** Generated override to expose protected method: {@link RecipeProvider#doorBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder doorBuilder(ItemLike p_176671_, Ingredient p_176672_) { return RecipeProvider.doorBuilder(p_176671_, p_176672_); } /** Generated override to expose protected method: {@link RecipeProvider#fenceBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder fenceBuilder(ItemLike p_176679_, Ingredient p_176680_) { return RecipeProvider.fenceBuilder(p_176679_, p_176680_); } /** Generated override to expose protected method: {@link RecipeProvider#fenceGateBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder fenceGateBuilder(ItemLike p_176685_, Ingredient p_176686_) { return RecipeProvider.fenceGateBuilder(p_176685_, p_176686_); } /** Generated override to expose protected method: {@link RecipeProvider#pressurePlate} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void pressurePlate(Consumer p_176691_, ItemLike p_176692_, ItemLike p_176693_) { RecipeProvider.pressurePlate(p_176691_, p_176692_, p_176693_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void pressurePlate(RecipeOutput p_299733_, ItemLike p_176692_, ItemLike p_176693_) { RecipeProvider.pressurePlate(p_299733_, p_176692_, p_176693_); } /** Generated override to expose protected method: {@link RecipeProvider#pressurePlateBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder pressurePlateBuilder(RecipeCategory p_251447_, ItemLike p_251989_, Ingredient p_249211_) { return RecipeProvider.pressurePlateBuilder(p_251447_, p_251989_, p_249211_); } /** Generated override to expose protected method: {@link RecipeProvider#slab} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void slab(Consumer p_248880_, RecipeCategory p_251848_, ItemLike p_249368_, ItemLike p_252133_) { RecipeProvider.slab(p_248880_, p_251848_, p_249368_, p_252133_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void slab(RecipeOutput p_300089_, RecipeCategory p_251848_, ItemLike p_249368_, ItemLike p_252133_) { RecipeProvider.slab(p_300089_, p_251848_, p_249368_, p_252133_); } /** Generated override to expose protected method: {@link RecipeProvider#slabBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder slabBuilder(RecipeCategory p_251707_, ItemLike p_251284_, Ingredient p_248824_) { return RecipeProvider.slabBuilder(p_251707_, p_251284_, p_248824_); } /** Generated override to expose protected method: {@link RecipeProvider#stairBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder stairBuilder(ItemLike p_176711_, Ingredient p_176712_) { return RecipeProvider.stairBuilder(p_176711_, p_176712_); } /** Generated override to expose protected method: {@link RecipeProvider#trapdoorBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder trapdoorBuilder(ItemLike p_176721_, Ingredient p_176722_) { return RecipeProvider.trapdoorBuilder(p_176721_, p_176722_); } /** Generated override to expose protected method: {@link RecipeProvider#signBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder signBuilder(ItemLike p_176727_, Ingredient p_176728_) { return RecipeProvider.signBuilder(p_176727_, p_176728_); } /** Generated override to expose protected method: {@link RecipeProvider#hangingSign} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void hangingSign(Consumer p_250663_, ItemLike p_252355_, ItemLike p_250437_) { RecipeProvider.hangingSign(p_250663_, p_252355_, p_250437_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void hangingSign(RecipeOutput p_300811_, ItemLike p_252355_, ItemLike p_250437_) { RecipeProvider.hangingSign(p_300811_, p_252355_, p_250437_); } /** Generated override to expose protected method: {@link RecipeProvider#colorBlockWithDye} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void colorBlockWithDye(Consumer p_289666_, List p_289675_, List p_289672_, String p_289641_) { RecipeProvider.colorBlockWithDye(p_289666_, p_289675_, p_289672_, p_289641_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void colorBlockWithDye(RecipeOutput p_297350_, List p_289675_, List p_289672_, String p_289641_) { RecipeProvider.colorBlockWithDye(p_297350_, p_289675_, p_289672_, p_289641_); } /** Generated override to expose protected method: {@link RecipeProvider#carpet} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void carpet(Consumer p_176717_, ItemLike p_176718_, ItemLike p_176719_) { RecipeProvider.carpet(p_176717_, p_176718_, p_176719_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void carpet(RecipeOutput p_298709_, ItemLike p_176718_, ItemLike p_176719_) { RecipeProvider.carpet(p_298709_, p_176718_, p_176719_); } /** Generated override to expose protected method: {@link RecipeProvider#bedFromPlanksAndWool} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void bedFromPlanksAndWool(Consumer p_126074_, ItemLike p_126075_, ItemLike p_126076_) { RecipeProvider.bedFromPlanksAndWool(p_126074_, p_126075_, p_126076_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void bedFromPlanksAndWool(RecipeOutput p_300515_, ItemLike p_126075_, ItemLike p_126076_) { RecipeProvider.bedFromPlanksAndWool(p_300515_, p_126075_, p_126076_); } /** Generated override to expose protected method: {@link RecipeProvider#banner} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void banner(Consumer p_126082_, ItemLike p_126083_, ItemLike p_126084_) { RecipeProvider.banner(p_126082_, p_126083_, p_126084_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void banner(RecipeOutput p_300693_, ItemLike p_126083_, ItemLike p_126084_) { RecipeProvider.banner(p_300693_, p_126083_, p_126084_); } /** Generated override to expose protected method: {@link RecipeProvider#stainedGlassFromGlassAndDye} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void stainedGlassFromGlassAndDye(Consumer p_126086_, ItemLike p_126087_, ItemLike p_126088_) { RecipeProvider.stainedGlassFromGlassAndDye(p_126086_, p_126087_, p_126088_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void stainedGlassFromGlassAndDye(RecipeOutput p_297360_, ItemLike p_126087_, ItemLike p_126088_) { RecipeProvider.stainedGlassFromGlassAndDye(p_297360_, p_126087_, p_126088_); } /** Generated override to expose protected method: {@link RecipeProvider#stainedGlassPaneFromStainedGlass} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void stainedGlassPaneFromStainedGlass(Consumer p_126090_, ItemLike p_126091_, ItemLike p_126092_) { RecipeProvider.stainedGlassPaneFromStainedGlass(p_126090_, p_126091_, p_126092_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void stainedGlassPaneFromStainedGlass(RecipeOutput p_300949_, ItemLike p_126091_, ItemLike p_126092_) { RecipeProvider.stainedGlassPaneFromStainedGlass(p_300949_, p_126091_, p_126092_); } /** Generated override to expose protected method: {@link RecipeProvider#stainedGlassPaneFromGlassPaneAndDye} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void stainedGlassPaneFromGlassPaneAndDye(Consumer p_126094_, ItemLike p_126095_, ItemLike p_126096_) { RecipeProvider.stainedGlassPaneFromGlassPaneAndDye(p_126094_, p_126095_, p_126096_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void stainedGlassPaneFromGlassPaneAndDye(RecipeOutput p_298776_, ItemLike p_126095_, ItemLike p_126096_) { RecipeProvider.stainedGlassPaneFromGlassPaneAndDye(p_298776_, p_126095_, p_126096_); } /** Generated override to expose protected method: {@link RecipeProvider#coloredTerracottaFromTerracottaAndDye} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void coloredTerracottaFromTerracottaAndDye(Consumer p_126098_, ItemLike p_126099_, ItemLike p_126100_) { RecipeProvider.coloredTerracottaFromTerracottaAndDye(p_126098_, p_126099_, p_126100_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void coloredTerracottaFromTerracottaAndDye(RecipeOutput p_297522_, ItemLike p_126099_, ItemLike p_126100_) { RecipeProvider.coloredTerracottaFromTerracottaAndDye(p_297522_, p_126099_, p_126100_); } /** Generated override to expose protected method: {@link RecipeProvider#concretePowder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void concretePowder(Consumer p_126102_, ItemLike p_126103_, ItemLike p_126104_) { RecipeProvider.concretePowder(p_126102_, p_126103_, p_126104_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void concretePowder(RecipeOutput p_300890_, ItemLike p_126103_, ItemLike p_126104_) { RecipeProvider.concretePowder(p_300890_, p_126103_, p_126104_); } /** Generated override to expose protected method: {@link RecipeProvider#candle} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void candle(Consumer p_176543_, ItemLike p_176544_, ItemLike p_176545_) { RecipeProvider.candle(p_176543_, p_176544_, p_176545_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void candle(RecipeOutput p_299296_, ItemLike p_176544_, ItemLike p_176545_) { RecipeProvider.candle(p_299296_, p_176544_, p_176545_); } /** Generated override to expose protected method: {@link RecipeProvider#wall} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void wall(Consumer p_251034_, RecipeCategory p_251148_, ItemLike p_250499_, ItemLike p_249970_) { RecipeProvider.wall(p_251034_, p_251148_, p_250499_, p_249970_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void wall(RecipeOutput p_298550_, RecipeCategory p_251148_, ItemLike p_250499_, ItemLike p_249970_) { RecipeProvider.wall(p_298550_, p_251148_, p_250499_, p_249970_); } /** Generated override to expose protected method: {@link RecipeProvider#wallBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder wallBuilder(RecipeCategory p_249083_, ItemLike p_250754_, Ingredient p_250311_) { return RecipeProvider.wallBuilder(p_249083_, p_250754_, p_250311_); } /** Generated override to expose protected method: {@link RecipeProvider#polished} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void polished(Consumer p_251348_, RecipeCategory p_248719_, ItemLike p_250032_, ItemLike p_250021_) { RecipeProvider.polished(p_251348_, p_248719_, p_250032_, p_250021_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void polished(RecipeOutput p_300055_, RecipeCategory p_248719_, ItemLike p_250032_, ItemLike p_250021_) { RecipeProvider.polished(p_300055_, p_248719_, p_250032_, p_250021_); } /** Generated override to expose protected method: {@link RecipeProvider#polishedBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static RecipeBuilder polishedBuilder(RecipeCategory p_249131_, ItemLike p_251242_, Ingredient p_251412_) { return RecipeProvider.polishedBuilder(p_249131_, p_251242_, p_251412_); } /** Generated override to expose protected method: {@link RecipeProvider#cut} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void cut(Consumer p_248712_, RecipeCategory p_252306_, ItemLike p_249686_, ItemLike p_251100_) { RecipeProvider.cut(p_248712_, p_252306_, p_249686_, p_251100_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void cut(RecipeOutput p_297773_, RecipeCategory p_252306_, ItemLike p_249686_, ItemLike p_251100_) { RecipeProvider.cut(p_297773_, p_252306_, p_249686_, p_251100_); } /** Generated override to expose protected method: {@link RecipeProvider#cutBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static ShapedRecipeBuilder cutBuilder(RecipeCategory p_250895_, ItemLike p_251147_, Ingredient p_251563_) { return RecipeProvider.cutBuilder(p_250895_, p_251147_, p_251563_); } /** Generated override to expose protected method: {@link RecipeProvider#chiseled} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void chiseled(Consumer p_250120_, RecipeCategory p_251604_, ItemLike p_251049_, ItemLike p_252267_) { RecipeProvider.chiseled(p_250120_, p_251604_, p_251049_, p_252267_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void chiseled(RecipeOutput p_301222_, RecipeCategory p_251604_, ItemLike p_251049_, ItemLike p_252267_) { RecipeProvider.chiseled(p_301222_, p_251604_, p_251049_, p_252267_); } /** Generated override to expose protected method: {@link RecipeProvider#mosaicBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void mosaicBuilder(Consumer p_249200_, RecipeCategory p_248788_, ItemLike p_251925_, ItemLike p_252242_) { RecipeProvider.mosaicBuilder(p_249200_, p_248788_, p_251925_, p_252242_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void mosaicBuilder(RecipeOutput p_298750_, RecipeCategory p_248788_, ItemLike p_251925_, ItemLike p_252242_) { RecipeProvider.mosaicBuilder(p_298750_, p_248788_, p_251925_, p_252242_); } /** Generated override to expose protected method: {@link RecipeProvider#chiseledBuilder} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static ShapedRecipeBuilder chiseledBuilder(RecipeCategory p_251755_, ItemLike p_249782_, Ingredient p_250087_) { return RecipeProvider.chiseledBuilder(p_251755_, p_249782_, p_250087_); } /** Generated override to expose protected method: {@link RecipeProvider#stonecutterResultFromBase} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void stonecutterResultFromBase(Consumer p_251589_, RecipeCategory p_248911_, ItemLike p_251265_, ItemLike p_250033_) { RecipeProvider.stonecutterResultFromBase(p_251589_, p_248911_, p_251265_, p_250033_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void stonecutterResultFromBase(RecipeOutput p_299266_, RecipeCategory p_250609_, ItemLike p_251254_, ItemLike p_249666_) { RecipeProvider.stonecutterResultFromBase(p_299266_, p_250609_, p_251254_, p_249666_); } /** Generated override to expose protected method: {@link RecipeProvider#stonecutterResultFromBase} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void stonecutterResultFromBase(Consumer p_249145_, RecipeCategory p_250609_, ItemLike p_251254_, ItemLike p_249666_, int p_251462_) { RecipeProvider.stonecutterResultFromBase(p_249145_, p_250609_, p_251254_, p_249666_, p_251462_); } - - /** Generated override to expose protected method: {@link RecipeProvider#smeltingResultFromBase} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void smeltingResultFromBase(Consumer p_176740_, ItemLike p_176741_, ItemLike p_176742_) { RecipeProvider.smeltingResultFromBase(p_176740_, p_176741_, p_176742_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void stonecutterResultFromBase(RecipeOutput p_300991_, RecipeCategory p_248911_, ItemLike p_251265_, ItemLike p_250033_, int p_301035_) { RecipeProvider.stonecutterResultFromBase(p_300991_, p_248911_, p_251265_, p_250033_, p_301035_); } /** Generated override to expose protected method: {@link RecipeProvider#nineBlockStorageRecipes} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void nineBlockStorageRecipes(Consumer p_249580_, RecipeCategory p_251203_, ItemLike p_251689_, RecipeCategory p_251376_, ItemLike p_248771_) { RecipeProvider.nineBlockStorageRecipes(p_249580_, p_251203_, p_251689_, p_251376_, p_248771_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void nineBlockStorageRecipes(RecipeOutput p_298715_, RecipeCategory p_251203_, ItemLike p_251689_, RecipeCategory p_251376_, ItemLike p_248771_) { RecipeProvider.nineBlockStorageRecipes(p_298715_, p_251203_, p_251689_, p_251376_, p_248771_); } /** Generated override to expose protected method: {@link RecipeProvider#nineBlockStorageRecipesWithCustomPacking} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void nineBlockStorageRecipesWithCustomPacking(Consumer p_250488_, RecipeCategory p_250885_, ItemLike p_251651_, RecipeCategory p_250874_, ItemLike p_248576_, String p_250171_, String p_249386_) { RecipeProvider.nineBlockStorageRecipesWithCustomPacking(p_250488_, p_250885_, p_251651_, p_250874_, p_248576_, p_250171_, p_249386_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void nineBlockStorageRecipesWithCustomPacking(RecipeOutput p_300453_, RecipeCategory p_250885_, ItemLike p_251651_, RecipeCategory p_250874_, ItemLike p_248576_, String p_250171_, String p_249386_) { RecipeProvider.nineBlockStorageRecipesWithCustomPacking(p_300453_, p_250885_, p_251651_, p_250874_, p_248576_, p_250171_, p_249386_); } /** Generated override to expose protected method: {@link RecipeProvider#nineBlockStorageRecipesRecipesWithCustomUnpacking} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void nineBlockStorageRecipesRecipesWithCustomUnpacking(Consumer p_250320_, RecipeCategory p_248979_, ItemLike p_249101_, RecipeCategory p_252036_, ItemLike p_250886_, String p_248768_, String p_250847_) { RecipeProvider.nineBlockStorageRecipesRecipesWithCustomUnpacking(p_250320_, p_248979_, p_249101_, p_252036_, p_250886_, p_248768_, p_250847_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void nineBlockStorageRecipesRecipesWithCustomUnpacking(RecipeOutput p_298590_, RecipeCategory p_248979_, ItemLike p_249101_, RecipeCategory p_252036_, ItemLike p_250886_, String p_248768_, String p_250847_) { RecipeProvider.nineBlockStorageRecipesRecipesWithCustomUnpacking(p_298590_, p_248979_, p_249101_, p_252036_, p_250886_, p_248768_, p_250847_); } /** Generated override to expose protected method: {@link RecipeProvider#copySmithingTemplate} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void copySmithingTemplate(Consumer p_267061_, ItemLike p_266974_, TagKey p_267283_) { RecipeProvider.copySmithingTemplate(p_267061_, p_266974_, p_267283_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void copySmithingTemplate(RecipeOutput p_299385_, ItemLike p_267133_, TagKey p_298808_) { RecipeProvider.copySmithingTemplate(p_299385_, p_267133_, p_298808_); } /** Generated override to expose protected method: {@link RecipeProvider#copySmithingTemplate} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void copySmithingTemplate(Consumer p_266734_, ItemLike p_267133_, ItemLike p_267023_) { RecipeProvider.copySmithingTemplate(p_266734_, p_267133_, p_267023_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void copySmithingTemplate(RecipeOutput p_300831_, ItemLike p_266974_, ItemLike p_298586_) { RecipeProvider.copySmithingTemplate(p_300831_, p_266974_, p_298586_); } /** Generated override to expose protected method: {@link RecipeProvider#cookRecipes} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void cookRecipes(Consumer p_126007_, String p_126008_, RecipeSerializer p_250529_, int p_126010_) { RecipeProvider.cookRecipes(p_126007_, p_126008_, p_250529_, p_126010_); } - - /** Generated override to expose protected method: {@link RecipeProvider#simpleCookingRecipe} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void simpleCookingRecipe(Consumer p_249398_, String p_249709_, RecipeSerializer p_251876_, int p_249258_, ItemLike p_250669_, ItemLike p_250224_, float p_252138_) { RecipeProvider.simpleCookingRecipe(p_249398_, p_249709_, p_251876_, p_249258_, p_250669_, p_250224_, p_252138_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void cookRecipes(RecipeOutput p_298337_, String p_126008_, RecipeSerializer p_250529_, int p_126010_) { RecipeProvider.cookRecipes(p_298337_, p_126008_, p_250529_, p_126010_); } /** Generated override to expose protected method: {@link RecipeProvider#waxRecipes} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void waxRecipes(Consumer p_176611_) { RecipeProvider.waxRecipes(p_176611_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void waxRecipes(RecipeOutput p_298400_) { RecipeProvider.waxRecipes(p_298400_); } /** Generated override to expose protected method: {@link RecipeProvider#generateRecipes} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static void generateRecipes(Consumer p_176581_, BlockFamily p_176582_) { RecipeProvider.generateRecipes(p_176581_, p_176582_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static void generateRecipes(RecipeOutput p_299904_, BlockFamily p_176582_) { RecipeProvider.generateRecipes(p_299904_, p_176582_); } /** Generated override to expose protected method: {@link RecipeProvider#getBaseBlock} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static Block getBaseBlock(BlockFamily p_176524_, BlockFamily.Variant p_176525_) { return RecipeProvider.getBaseBlock(p_176524_, p_176525_); } - /** Generated override to expose protected method: {@link RecipeProvider#insideOf} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static EnterBlockTrigger.TriggerInstance insideOf(Block p_125980_) { return RecipeProvider.insideOf(p_125980_); } - /** Generated override to expose protected method: {@link RecipeProvider#has} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static InventoryChangeTrigger.TriggerInstance has(MinMaxBounds.Ints p_176521_, ItemLike p_176522_) { return RecipeProvider.has(p_176521_, p_176522_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static Criterion has(ItemLike p_298497_) { return RecipeProvider.has(p_298497_); } /** Generated override to expose protected method: {@link RecipeProvider#has} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static InventoryChangeTrigger.TriggerInstance has(ItemLike p_125978_) { return RecipeProvider.has(p_125978_); } - - /** Generated override to expose protected method: {@link RecipeProvider#has} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static InventoryChangeTrigger.TriggerInstance has(TagKey p_206407_) { return RecipeProvider.has(p_206407_); } - - /** Generated override to expose protected method: {@link RecipeProvider#inventoryTrigger} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") - public static InventoryChangeTrigger.TriggerInstance inventoryTrigger(ItemPredicate... p_126012_) { return RecipeProvider.inventoryTrigger(p_126012_); } + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") + public static Criterion has(TagKey p_299059_) { return RecipeProvider.has(p_299059_); } /** Generated override to expose protected method: {@link RecipeProvider#getHasName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getHasName(ItemLike p_176603_) { return RecipeProvider.getHasName(p_176603_); } /** Generated override to expose protected method: {@link RecipeProvider#getItemName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getItemName(ItemLike p_176633_) { return RecipeProvider.getItemName(p_176633_); } /** Generated override to expose protected method: {@link RecipeProvider#getSimpleRecipeName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getSimpleRecipeName(ItemLike p_176645_) { return RecipeProvider.getSimpleRecipeName(p_176645_); } /** Generated override to expose protected method: {@link RecipeProvider#getConversionRecipeName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getConversionRecipeName(ItemLike p_176518_, ItemLike p_176519_) { return RecipeProvider.getConversionRecipeName(p_176518_, p_176519_); } /** Generated override to expose protected method: {@link RecipeProvider#getSmeltingRecipeName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getSmeltingRecipeName(ItemLike p_176657_) { return RecipeProvider.getSmeltingRecipeName(p_176657_); } /** Generated override to expose protected method: {@link RecipeProvider#getBlastingRecipeName} */ - @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Fri, 9 Jun 2023 04:03:23 GMT") + @Generated(value = "com.tterrag.registrate.test.meta.UpdateRecipeProvider", date = "Wed, 14 Feb 2024 10:56:14 GMT") public static String getBlastingRecipeName(ItemLike p_176669_) { return RecipeProvider.getBlastingRecipeName(p_176669_); } // GENERATED END diff --git a/src/main/java/com/tterrag/registrate/util/DataIngredient.java b/src/main/java/com/tterrag/registrate/util/DataIngredient.java index faef1375..8bbab90f 100644 --- a/src/main/java/com/tterrag/registrate/util/DataIngredient.java +++ b/src/main/java/com/tterrag/registrate/util/DataIngredient.java @@ -1,6 +1,8 @@ package com.tterrag.registrate.util; import java.util.Arrays; +import java.util.List; +import java.util.Optional; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Stream; @@ -11,8 +13,11 @@ import lombok.Getter; import lombok.experimental.Delegate; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -20,7 +25,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; -import net.minecraftforge.common.crafting.IIngredientSerializer; +import net.minecraftforge.common.crafting.ingredients.IIngredientSerializer; import net.minecraftforge.registries.ForgeRegistries; /** @@ -50,7 +55,7 @@ private interface Excludes { private final Ingredient parent; @Getter private final ResourceLocation id; - private final Function criteriaFactory; + private final Function> criteriaFactory; private DataIngredient(Ingredient parent, ItemLike item) { super(Stream.empty()); @@ -70,15 +75,15 @@ private DataIngredient(Ingredient parent, ResourceLocation id, ItemPredicate... super(Stream.empty()); this.parent = parent; this.id = id; - this.criteriaFactory = prov -> RegistrateRecipeProvider.inventoryTrigger(predicates); + this.criteriaFactory = prov -> CriteriaTriggers.INVENTORY_CHANGED.createCriterion(new InventoryChangeTrigger.TriggerInstance(Optional.empty(), MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.ANY, List.of(predicates))); } @Override - public IIngredientSerializer getSerializer() { + public IIngredientSerializer serializer() { throw new UnsupportedOperationException("DataIngredient should only be used for data generation!"); } - public InventoryChangeTrigger.TriggerInstance getCritereon(RegistrateRecipeProvider prov) { + public Criterion getCritereon(RegistrateRecipeProvider prov) { return criteriaFactory.apply(prov); } diff --git a/src/main/java/com/tterrag/registrate/util/entry/MenuEntry.java b/src/main/java/com/tterrag/registrate/util/entry/MenuEntry.java index be2fb4c8..798d26b8 100644 --- a/src/main/java/com/tterrag/registrate/util/entry/MenuEntry.java +++ b/src/main/java/com/tterrag/registrate/util/entry/MenuEntry.java @@ -12,7 +12,6 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuConstructor; import net.minecraft.world.inventory.MenuType; -import net.minecraftforge.network.NetworkHooks; import net.minecraftforge.registries.RegistryObject; public class MenuEntry extends RegistryEntry> { @@ -38,10 +37,10 @@ public void open(ServerPlayer player, Component displayName, Consumer extraData) { - NetworkHooks.openScreen(player, new SimpleMenuProvider(provider, displayName), extraData); + player.openMenu(new SimpleMenuProvider(provider, displayName), extraData); } }