Fix Recipe Provider not calling generate (#4078)

* Fix Recipe Provider not calling generate * Commit data generated files to repo
FabricMC · Sep 10, 2024 · a3dc8b6 · a3dc8b6
1 parent 0771530
commit a3dc8b6
Show file tree

Hide file tree

Showing 48 changed files with 779 additions and 2 deletions.
diff --git a/fabric-data-generation-api-v1/.gitignore b/fabric-data-generation-api-v1/.gitignore
@@ -1 +1 @@
-/src/testmod/generated
+/src/testmod/generated/.cache
diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/...pi-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
@@ -98,7 +98,7 @@ public CompletableFuture<?> run(DataWriter writer) {
 		return registriesFuture.thenCompose((wrapperLookup -> {
 			Set<Identifier> generatedRecipes = Sets.newHashSet();
 			List<CompletableFuture<?>> list = new ArrayList<>();
-			getRecipeGenerator(wrapperLookup, new RecipeExporter() {
+			RecipeGenerator recipeGenerator = getRecipeGenerator(wrapperLookup, new RecipeExporter() {
 				@Override
 				public void accept(Identifier recipeId, Recipe<?> recipe, @Nullable AdvancementEntry advancement) {
 					Identifier identifier = getRecipeIdentifier(recipeId);
@@ -134,6 +134,7 @@ public Advancement.Builder getAdvancementBuilder() {
 				public void addRootAdvancement() {
 				}
 			});
+			recipeGenerator.generate();
 			return CompletableFuture.allOf(list.toArray(CompletableFuture[]::new));
 		}));
 	}

diff --git a/...generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json b/...generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "fabric-data-gen-api-v1-testmod:block/block_that_drops_nothing"
+    }
+  }
+}
diff --git a/...ated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json b/...ated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "fabric-data-gen-api-v1-testmod:block/block_with_vanilla_loot_table"
+    }
+  }
+}
diff --git a/...stmod/generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json b/...stmod/generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "fabric-data-gen-api-v1-testmod:block/block_without_item"
+    }
+  }
+}
diff --git a/...generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json b/...generated/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "fabric-data-gen-api-v1-testmod:block/block_without_loot_table"
+    }
+  }
+}
diff --git a/...src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json b/...src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "fabric-data-gen-api-v1-testmod:block/simple_block"
+    }
+  }
+}
diff --git a/...ration-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/en_us.json b/...ration-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/en_us.json
@@ -0,0 +1,7 @@
+{
+  "attribute.name.armor": "Generic Armor",
+  "block.fabric-data-gen-api-v1-testmod.simple_block": "Simple Block",
+  "entity.minecraft.allay": "Allay",
+  "fabric-data-gen-api-v1-testmod.identifier_test": "Identifier Test",
+  "itemGroup.fabric-data-gen-api-v1-testmod.default": "Datagen Itemgroup"
+}
diff --git a/...ration-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/ja_jp.json b/...ration-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/ja_jp.json
@@ -0,0 +1,5 @@
+{
+  "block.fabric-data-gen-api-v1-testmod.simple_block": "シンプルブロック",
+  "fabric-data-gen-api-v1-testmod.simple_item_group": "データ生成項目",
+  "this.is.a.test": "こんにちは"
+}
diff --git a/...enerated/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json b/...enerated/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "fabric-data-gen-api-v1-testmod:block/block_that_drops_nothing"
+  }
+}
diff --git a/...ted/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json b/...ted/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "fabric-data-gen-api-v1-testmod:block/block_with_vanilla_loot_table"
+  }
+}
diff --git a/...tmod/generated/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json b/...tmod/generated/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "fabric-data-gen-api-v1-testmod:block/block_without_item"
+  }
+}
diff --git a/...enerated/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json b/...enerated/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "fabric-data-gen-api-v1-testmod:block/block_without_loot_table"
+  }
+}
diff --git a/...rc/testmod/generated/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json b/...rc/testmod/generated/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "fabric-data-gen-api-v1-testmod:block/simple_block"
+  }
+}
diff --git a/...src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/models/item/simple_block.json b/...src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/models/item/simple_block.json
@@ -0,0 +1,3 @@
+{
+  "parent": "fabric-data-gen-api-v1-testmod:block/simple_block"
+}
diff --git a/...data/fabric-data-gen-api-v1-testmod/advancement/recipes/building_blocks/simple_block.json b/...data/fabric-data-gen-api-v1-testmod/advancement/recipes/building_blocks/simple_block.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_log": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "#minecraft:acacia_logs"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "fabric-data-gen-api-v1-testmod:simple_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_log"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "fabric-data-gen-api-v1-testmod:simple_block"
+    ]
+  }
+}
diff --git a/...estmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/beacon.json b/...estmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/beacon.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_payment": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "#minecraft:beacon_payment_items"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:beacon"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_payment"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:beacon"
+    ]
+  }
+}
diff --git a/...stmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond.json b/...stmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond.json
@@ -0,0 +1,37 @@
+{
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:true"
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:stick"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:diamond"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_stick"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:diamond"
+    ]
+  }
+}
diff --git a/...generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_block.json b/...generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_block.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_pickaxe": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:diamond_pickaxe"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:diamond_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_pickaxe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:diamond_block"
+    ]
+  }
+}
diff --git a/...d/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_ore.json b/...d/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_ore.json
@@ -0,0 +1,41 @@
+{
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:registry_contains",
+      "registry": "minecraft:item",
+      "values": [
+        "minecraft:diamond_block"
+      ]
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_frame": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:item_frame"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:diamond_ore"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_frame"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:diamond_ore"
+    ]
+  }
+}
diff --git a/...stmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/emerald.json b/...stmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/emerald.json
@@ -0,0 +1,42 @@
+{
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:registry_contains",
+      "registry": "minecraft:worldgen/biome",
+      "values": [
+        "minecraft:plains",
+        "minecraft:badlands"
+      ]
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_frame": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:item_frame"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:emerald"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_frame"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:emerald"
+    ]
+  }
+}
diff --git a/...od/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_block.json b/...od/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_block.json
@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_pickaxe": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:golden_pickaxe"
+          }
+        ]
+      }
+    },
+    "has_shovel": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:golden_shovel"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:gold_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_pickaxe",
+      "has_shovel"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:gold_block"
+    ]
+  }
+}