Update Fabric Resource conditions for compat recipes

Fixes #142
wisp-forest · Jul 18, 2024 · bccd8d5 · bccd8d5
1 parent fcad410
commit bccd8d5
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 18 deletions.
diff --git a/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java b/src/main/java/wraith/alloyforgery/data/providers/AlloyForgeryRecipeProvider.java
@@ -2,11 +2,12 @@
 
 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.ResourceConditions;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags;
-import net.fabricmc.fabric.impl.resource.conditions.conditions.TagsPopulatedResourceCondition;
 import net.minecraft.data.server.recipe.RecipeExporter;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
@@ -391,7 +392,7 @@ public static AlloyForgeryRecipeBuilder createRawBlockRecipe(String criterionNam
 
  /**
  * Used to export recipes with an ordered list of tag priorities
- * @see TagsPopulatedResourceCondition
+ * @see ResourceConditions#tagsPopulated(net.minecraft.registry.RegistryKey, TagKey[])
  * @param builder the recipe builder you are wrapping
  * @param name the name for the advancement, the recipe, and the recipe file name
  * @param input the item tag for valid recipe inputs
@@ -401,7 +402,7 @@ public static AlloyForgeryRecipeBuilder createRawBlockRecipe(String criterionNam
  public void exportWithTagConditions(AFRBuilderMethod builder, String name, TagKey<Item> input, TagKey<Item> output, Identifier... priorities) {
  builder.build(name, output, input)
  .addPriorityOutput(priorities)
- .offerTo(this.withConditions(this.exporter, new TagsPopulatedResourceCondition(output, input)), "compat/forge_" + name);
+ .offerTo(this.withConditions(this.exporter, ResourceConditions.tagsPopulated(RegistryKeys.ITEM, output, input)), "compat/forge_" + name);
  }
 
  public interface AFRBuilderMethod {

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_ingots.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_ingots.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ingots/copper",
  "c:ingots/zinc",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ores/copper",
  "c:ores/zinc",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_raw_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/brass_from_raw_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:raw_materials/copper",
  "c:raw_materials/zinc",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_ingots.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_ingots.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ingots/tin",
  "c:ingots/copper",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:tin_ores",
  "c:ores/copper",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_raw_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/bronze_from_raw_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:raw_materials/tin",
  "c:raw_materials/copper",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_ingots.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_ingots.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ingots/gold",
  "c:ingots/silver",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ores/gold",
  "c:ores/silver",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_raw_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/electrum_from_raw_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:raw_materials/gold",
  "c:raw_materials/silver",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_ingots.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_ingots.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ingots/iron",
  "c:ingots/nickel",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ores/iron",
  "c:ores/nickel",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_raw_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/invar_from_raw_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:raw_materials/iron",
  "c:raw_materials/nickel",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_ingots.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_ingots.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:coal",
  "c:ingots/iron",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:ores/coal",
  "c:ores/iron",

diff --git a/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_raw_ores.json b/src/main/resources/data/alloy_forgery/recipes/compat/alloys/steel_from_raw_ores.json
@@ -1,7 +1,8 @@
 {
  "fabric:load_conditions": [
  {
- "condition": "fabric:item_tags_populated",
+ "condition": "fabric:tags_populated",
+ "registry": "minecraft:item",
  "values": [
  "c:coal",
  "c:raw_materials/iron",