From 7e8858c80cf457d2f9d00b67e23cbbabec7a3a0a Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 19 Dec 2023 12:21:10 +0100 Subject: [PATCH] Rebuild Datapack --- .../bclib/advancements/recipes/brewing/tag_cauldron.json | 7 +++---- .../data/bclib/advancements/recipes/combat/tag_shield.json | 7 +++---- .../advancements/recipes/decorations/tag_shulker_box.json | 7 +++---- .../advancements/recipes/decorations/tag_smith_table.json | 7 +++---- .../advancements/recipes/decorations/tag_stonecutter.json | 7 +++---- .../data/bclib/advancements/recipes/misc/tag_bucket.json | 7 +++---- .../bclib/advancements/recipes/redstone/tag_hopper.json | 7 +++---- .../bclib/advancements/recipes/redstone/tag_piston.json | 7 +++---- .../data/bclib/advancements/recipes/tools/tag_compass.json | 7 +++---- .../advancements/recipes/transportation/tag_minecart.json | 7 +++---- .../advancements/recipes/transportation/tag_rail.json | 7 +++---- src/main/generated/data/bclib/recipes/tag_bucket.json | 3 +-- src/main/generated/data/bclib/recipes/tag_cauldron.json | 3 +-- src/main/generated/data/bclib/recipes/tag_compass.json | 3 +-- src/main/generated/data/bclib/recipes/tag_hopper.json | 3 +-- src/main/generated/data/bclib/recipes/tag_minecart.json | 3 +-- src/main/generated/data/bclib/recipes/tag_piston.json | 3 +-- src/main/generated/data/bclib/recipes/tag_rail.json | 3 +-- src/main/generated/data/bclib/recipes/tag_shield.json | 3 +-- src/main/generated/data/bclib/recipes/tag_shulker_box.json | 3 +-- src/main/generated/data/bclib/recipes/tag_smith_table.json | 3 +-- src/main/generated/data/bclib/recipes/tag_stonecutter.json | 3 +-- src/main/generated/data/c/tags/blocks/plant.json | 2 +- .../org/betterx/bclib/recipes/CraftingRecipeBuilder.java | 3 ++- 24 files changed, 47 insertions(+), 68 deletions(-) diff --git a/src/main/generated/data/bclib/advancements/recipes/brewing/tag_cauldron.json b/src/main/generated/data/bclib/advancements/recipes/brewing/tag_cauldron.json index fcc7b1c0..579e6ee0 100644 --- a/src/main/generated/data/bclib/advancements/recipes/brewing/tag_cauldron.json +++ b/src/main/generated/data/bclib/advancements/recipes/brewing/tag_cauldron.json @@ -20,14 +20,13 @@ }, "requirements": [ [ - "has_tag_c_iron_ingots", - "has_the_recipe" + "has_the_recipe", + "has_tag_c_iron_ingots" ] ], "rewards": { "recipes": [ "bclib:tag_cauldron" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/combat/tag_shield.json b/src/main/generated/data/bclib/advancements/recipes/combat/tag_shield.json index f8fe6b8b..3fb65ca3 100644 --- a/src/main/generated/data/bclib/advancements/recipes/combat/tag_shield.json +++ b/src/main/generated/data/bclib/advancements/recipes/combat/tag_shield.json @@ -30,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_iron_ingots", - "has_tag_minecraft_planks", - "has_the_recipe" + "has_tag_minecraft_planks" ] ], "rewards": { "recipes": [ "bclib:tag_shield" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_shulker_box.json b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_shulker_box.json index bcb1c3ae..cd92adef 100644 --- a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_shulker_box.json +++ b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_shulker_box.json @@ -32,15 +32,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_chest", - "has_shulker_shell", - "has_the_recipe" + "has_shulker_shell" ] ], "rewards": { "recipes": [ "bclib:tag_shulker_box" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_smith_table.json b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_smith_table.json index b55b9497..92854f64 100644 --- a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_smith_table.json +++ b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_smith_table.json @@ -30,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_iron_ingots", - "has_tag_minecraft_planks", - "has_the_recipe" + "has_tag_minecraft_planks" ] ], "rewards": { "recipes": [ "bclib:tag_smith_table" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_stonecutter.json b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_stonecutter.json index 40a82957..748ce19c 100644 --- a/src/main/generated/data/bclib/advancements/recipes/decorations/tag_stonecutter.json +++ b/src/main/generated/data/bclib/advancements/recipes/decorations/tag_stonecutter.json @@ -32,15 +32,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_stone", - "has_tag_c_iron_ingots", - "has_the_recipe" + "has_tag_c_iron_ingots" ] ], "rewards": { "recipes": [ "bclib:tag_stonecutter" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/misc/tag_bucket.json b/src/main/generated/data/bclib/advancements/recipes/misc/tag_bucket.json index c412a5d7..752ea632 100644 --- a/src/main/generated/data/bclib/advancements/recipes/misc/tag_bucket.json +++ b/src/main/generated/data/bclib/advancements/recipes/misc/tag_bucket.json @@ -20,14 +20,13 @@ }, "requirements": [ [ - "has_tag_c_iron_ingots", - "has_the_recipe" + "has_the_recipe", + "has_tag_c_iron_ingots" ] ], "rewards": { "recipes": [ "bclib:tag_bucket" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/redstone/tag_hopper.json b/src/main/generated/data/bclib/advancements/recipes/redstone/tag_hopper.json index 07513ffa..b5c5d810 100644 --- a/src/main/generated/data/bclib/advancements/recipes/redstone/tag_hopper.json +++ b/src/main/generated/data/bclib/advancements/recipes/redstone/tag_hopper.json @@ -30,15 +30,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_chest", - "has_tag_c_iron_ingots", - "has_the_recipe" + "has_tag_c_iron_ingots" ] ], "rewards": { "recipes": [ "bclib:tag_hopper" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/redstone/tag_piston.json b/src/main/generated/data/bclib/advancements/recipes/redstone/tag_piston.json index 9a4f6a78..37657198 100644 --- a/src/main/generated/data/bclib/advancements/recipes/redstone/tag_piston.json +++ b/src/main/generated/data/bclib/advancements/recipes/redstone/tag_piston.json @@ -54,17 +54,16 @@ }, "requirements": [ [ + "has_the_recipe", "has_cobblestone", "has_tag_c_iron_ingots", "has_redstone", - "has_tag_minecraft_planks", - "has_the_recipe" + "has_tag_minecraft_planks" ] ], "rewards": { "recipes": [ "bclib:tag_piston" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/tools/tag_compass.json b/src/main/generated/data/bclib/advancements/recipes/tools/tag_compass.json index 00003230..245198c3 100644 --- a/src/main/generated/data/bclib/advancements/recipes/tools/tag_compass.json +++ b/src/main/generated/data/bclib/advancements/recipes/tools/tag_compass.json @@ -32,15 +32,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_iron_ingots", - "has_redstone", - "has_the_recipe" + "has_redstone" ] ], "rewards": { "recipes": [ "bclib:tag_compass" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/transportation/tag_minecart.json b/src/main/generated/data/bclib/advancements/recipes/transportation/tag_minecart.json index bc6b2fe3..12fdbdeb 100644 --- a/src/main/generated/data/bclib/advancements/recipes/transportation/tag_minecart.json +++ b/src/main/generated/data/bclib/advancements/recipes/transportation/tag_minecart.json @@ -20,14 +20,13 @@ }, "requirements": [ [ - "has_tag_c_iron_ingots", - "has_the_recipe" + "has_the_recipe", + "has_tag_c_iron_ingots" ] ], "rewards": { "recipes": [ "bclib:tag_minecart" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/advancements/recipes/transportation/tag_rail.json b/src/main/generated/data/bclib/advancements/recipes/transportation/tag_rail.json index 129aab2e..2611fa01 100644 --- a/src/main/generated/data/bclib/advancements/recipes/transportation/tag_rail.json +++ b/src/main/generated/data/bclib/advancements/recipes/transportation/tag_rail.json @@ -32,15 +32,14 @@ }, "requirements": [ [ + "has_the_recipe", "has_tag_c_iron_ingots", - "has_stick", - "has_the_recipe" + "has_stick" ] ], "rewards": { "recipes": [ "bclib:tag_rail" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_bucket.json b/src/main/generated/data/bclib/recipes/tag_bucket.json index a6db4718..ae1ef099 100644 --- a/src/main/generated/data/bclib/recipes/tag_bucket.json +++ b/src/main/generated/data/bclib/recipes/tag_bucket.json @@ -12,6 +12,5 @@ ], "result": { "item": "minecraft:bucket" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_cauldron.json b/src/main/generated/data/bclib/recipes/tag_cauldron.json index 51515c72..684a7f3e 100644 --- a/src/main/generated/data/bclib/recipes/tag_cauldron.json +++ b/src/main/generated/data/bclib/recipes/tag_cauldron.json @@ -13,6 +13,5 @@ ], "result": { "item": "minecraft:cauldron" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_compass.json b/src/main/generated/data/bclib/recipes/tag_compass.json index 81374c62..7561db5d 100644 --- a/src/main/generated/data/bclib/recipes/tag_compass.json +++ b/src/main/generated/data/bclib/recipes/tag_compass.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:compass" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_hopper.json b/src/main/generated/data/bclib/recipes/tag_hopper.json index 8f180ea3..c81ef39f 100644 --- a/src/main/generated/data/bclib/recipes/tag_hopper.json +++ b/src/main/generated/data/bclib/recipes/tag_hopper.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:hopper" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_minecart.json b/src/main/generated/data/bclib/recipes/tag_minecart.json index fbc841db..3de55e06 100644 --- a/src/main/generated/data/bclib/recipes/tag_minecart.json +++ b/src/main/generated/data/bclib/recipes/tag_minecart.json @@ -12,6 +12,5 @@ ], "result": { "item": "minecraft:minecart" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_piston.json b/src/main/generated/data/bclib/recipes/tag_piston.json index 1b0da91a..2a4a5fe8 100644 --- a/src/main/generated/data/bclib/recipes/tag_piston.json +++ b/src/main/generated/data/bclib/recipes/tag_piston.json @@ -22,6 +22,5 @@ ], "result": { "item": "minecraft:piston" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_rail.json b/src/main/generated/data/bclib/recipes/tag_rail.json index 42ce70e2..f16ffef2 100644 --- a/src/main/generated/data/bclib/recipes/tag_rail.json +++ b/src/main/generated/data/bclib/recipes/tag_rail.json @@ -17,6 +17,5 @@ "result": { "count": 16, "item": "minecraft:rail" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_shield.json b/src/main/generated/data/bclib/recipes/tag_shield.json index de5987d1..93a5aed4 100644 --- a/src/main/generated/data/bclib/recipes/tag_shield.json +++ b/src/main/generated/data/bclib/recipes/tag_shield.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:shield" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_shulker_box.json b/src/main/generated/data/bclib/recipes/tag_shulker_box.json index 3bc78df7..dc960e96 100644 --- a/src/main/generated/data/bclib/recipes/tag_shulker_box.json +++ b/src/main/generated/data/bclib/recipes/tag_shulker_box.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:shulker_box" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_smith_table.json b/src/main/generated/data/bclib/recipes/tag_smith_table.json index 57885956..5f27bff2 100644 --- a/src/main/generated/data/bclib/recipes/tag_smith_table.json +++ b/src/main/generated/data/bclib/recipes/tag_smith_table.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:smithing_table" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/bclib/recipes/tag_stonecutter.json b/src/main/generated/data/bclib/recipes/tag_stonecutter.json index d77da183..1bed255d 100644 --- a/src/main/generated/data/bclib/recipes/tag_stonecutter.json +++ b/src/main/generated/data/bclib/recipes/tag_stonecutter.json @@ -15,6 +15,5 @@ ], "result": { "item": "minecraft:stonecutter" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/blocks/plant.json b/src/main/generated/data/c/tags/blocks/plant.json index f6442a55..c61ec5e3 100644 --- a/src/main/generated/data/c/tags/blocks/plant.json +++ b/src/main/generated/data/c/tags/blocks/plant.json @@ -20,7 +20,6 @@ "minecraft:dandelion", "minecraft:fern", "minecraft:flowering_azalea", - "minecraft:grass", "minecraft:large_fern", "minecraft:lilac", "minecraft:lily_of_the_valley", @@ -39,6 +38,7 @@ "minecraft:pumpkin_stem", "minecraft:red_tulip", "minecraft:rose_bush", + "minecraft:short_grass", "minecraft:small_dripleaf", "minecraft:spore_blossom", "minecraft:sugar_cane", diff --git a/src/main/java/org/betterx/bclib/recipes/CraftingRecipeBuilder.java b/src/main/java/org/betterx/bclib/recipes/CraftingRecipeBuilder.java index f02935d6..a423a4c9 100644 --- a/src/main/java/org/betterx/bclib/recipes/CraftingRecipeBuilder.java +++ b/src/main/java/org/betterx/bclib/recipes/CraftingRecipeBuilder.java @@ -111,7 +111,7 @@ public class CraftingRecipeBuilder extends AbstractBaseRecipeBuilder criterion) { this.unlocks.put(name, criterion); @@ -148,6 +148,7 @@ public class CraftingRecipeBuilder extends AbstractBaseRecipeBuilder> item : unlocks.entrySet()) { builder.unlockedBy(item.getKey(), item.getValue()); }