diff --git a/common/src/generated/resources/data/adorn/recipe/black_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_bench_from_dyeing.json index 43db40780..21e52f045 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:benches", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_chair_from_dyeing.json index a8780543b..c63c0dc0a 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:chairs", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_coffee_table_from_dyeing.json index 99a5df71a..aaa1ee201 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_drawer_from_dyeing.json index a0c365801..1da1817ba 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:drawers", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_kitchen_counter_from_dyeing.json index 4bd947dd3..1eca08076 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_kitchen_cupboard_from_dyeing.json index 0981d582d..1a2f026e4 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_kitchen_sink_from_dyeing.json index 4fbe433af..457118037 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_planks.json b/common/src/generated/resources/data/adorn/recipe/black_planks.json index 9de3b0270..ac14d49b4 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/black_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:planks", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_platform_from_dyeing.json index a6d3f536a..756a56149 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_post_from_dyeing.json index 7a7a81adc..02b8961a7 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_shelf_from_dyeing.json index 4d09c8693..bd47af94c 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_step_from_dyeing.json index ca6ecb90e..d3ce83267 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_table_from_dyeing.json index a23f3d3f9..75cb526c1 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#adorn:tables", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_button.json b/common/src/generated/resources/data/adorn/recipe/black_wood_button.json index d9cc009bd..319f54417 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:black_planks" - } + "adorn:black_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_button_from_dyeing.json index 32b625410..5fd412e9d 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/black_wood_fence.json index 12c7b75e4..3e1bfb0d1 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:black_planks" - } + "#": "minecraft:stick", + "W": "adorn:black_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_from_dyeing.json index 08dea6f40..d405c93bd 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate.json index 40720a777..bb5bc6dc2 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:black_planks" - } + "#": "minecraft:stick", + "W": "adorn:black_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate_from_dyeing.json index cb58c9d02..6a26fcd70 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate.json index 4e91cdb89..fa5c3ea50 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:black_planks" - } + "#": "adorn:black_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate_from_dyeing.json index 35f5f8cb3..650fc5f18 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/black_wood_slab.json index 944d1b02e..56cf70df3 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:black_planks" - } + "#": "adorn:black_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_slab_from_dyeing.json index e66a6493b..bb93bd43e 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/black_wood_stairs.json index 36d6e64c1..2276f8ac7 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:black_planks" - } + "#": "adorn:black_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/black_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/black_wood_stairs_from_dyeing.json index 2dbc7e2db..efc435006 100644 --- a/common/src/generated/resources/data/adorn/recipe/black_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/black_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/black" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/black" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_bench_from_dyeing.json index 40772a384..59675684f 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:benches", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_chair_from_dyeing.json index 0c72c81e9..12e31f1db 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:chairs", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_coffee_table_from_dyeing.json index 88fbe78af..3ef58ced1 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_drawer_from_dyeing.json index b0cba8c0c..e93c9e5a8 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:drawers", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_counter_from_dyeing.json index 5b73aa663..ceb9b66c2 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_cupboard_from_dyeing.json index 559893943..085386dc9 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_sink_from_dyeing.json index 301944440..bbb33acc7 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_planks.json b/common/src/generated/resources/data/adorn/recipe/blue_planks.json index faa993b4d..f588f5f01 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:planks", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_platform_from_dyeing.json index 81a9da5e1..3f30a8c47 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_post_from_dyeing.json index a9ae09fc0..01b900d4c 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_shelf_from_dyeing.json index 47d2779a2..fa86565a5 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_step_from_dyeing.json index b3a52a892..849dbeaa2 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_table_from_dyeing.json index c9b6ae48f..2ac2cec35 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#adorn:tables", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_button.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_button.json index 7f97b9c92..7b8253d0a 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:blue_planks" - } + "adorn:blue_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_button_from_dyeing.json index fb36dd35e..1a76a9f06 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence.json index daa8bf41d..07120d306 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:blue_planks" - } + "#": "minecraft:stick", + "W": "adorn:blue_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_from_dyeing.json index d2078a771..05e066759 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate.json index 475e3ae35..76bf47683 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:blue_planks" - } + "#": "minecraft:stick", + "W": "adorn:blue_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate_from_dyeing.json index 44ee6e20a..8d166011e 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate.json index accbff304..2bda7c4dc 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:blue_planks" - } + "#": "adorn:blue_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate_from_dyeing.json index 1dd488879..691573abc 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_slab.json index ab64f7e02..2e293c4be 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:blue_planks" - } + "#": "adorn:blue_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_slab_from_dyeing.json index 144f16df0..6ba802bbb 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs.json index 4c95d1aaf..a120bff23 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:blue_planks" - } + "#": "adorn:blue_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs_from_dyeing.json index b06ffe195..a9595ad76 100644 --- a/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/blue_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/blue" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_bench_from_dyeing.json index c064ce131..904e7d0ba 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:benches", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_chair_from_dyeing.json index 6a33243cf..f67713fef 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:chairs", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_coffee_table_from_dyeing.json index 50fcd6db1..eb2c2bd2c 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_drawer_from_dyeing.json index a226fa2b4..117d9ada9 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:drawers", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_counter_from_dyeing.json index 994636fea..4ef77af7a 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_cupboard_from_dyeing.json index 810ea94de..1b2c4973e 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_sink_from_dyeing.json index 9207b3d31..dffb0ce7c 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_planks.json b/common/src/generated/resources/data/adorn/recipe/brown_planks.json index 916f72118..a39b19c15 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:planks", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_platform_from_dyeing.json index e031c3337..804ec5dbf 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_post_from_dyeing.json index fa1b5ba12..b2bdc1427 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_shelf_from_dyeing.json index ce6f8d28e..277b091c0 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_step_from_dyeing.json index 1f08fc62a..a4be60f25 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_table_from_dyeing.json index 26166fa9f..4245a51d2 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#adorn:tables", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_button.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_button.json index 6580f2afc..04f77212a 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:brown_planks" - } + "adorn:brown_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_button_from_dyeing.json index 43429d8b1..cd1314daf 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence.json index 933043e68..71e7a0ccc 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:brown_planks" - } + "#": "minecraft:stick", + "W": "adorn:brown_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_from_dyeing.json index ef5d95e61..048d43301 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate.json index 667547d17..5048508c8 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:brown_planks" - } + "#": "minecraft:stick", + "W": "adorn:brown_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate_from_dyeing.json index d511b5c88..542a377f3 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate.json index b191f632b..d00205d6f 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:brown_planks" - } + "#": "adorn:brown_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate_from_dyeing.json index d47e20498..00633bd0a 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_slab.json index 519518fac..d77008258 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:brown_planks" - } + "#": "adorn:brown_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_slab_from_dyeing.json index 31216ec5b..fe75efab0 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs.json index 28951b04f..fba9ae37b 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:brown_planks" - } + "#": "adorn:brown_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs_from_dyeing.json index ec2842684..2d1a105d6 100644 --- a/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/brown_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/brown" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/brown" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_bench_from_dyeing.json index 55fc87a6c..1fe028aaa 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:benches", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_chair_from_dyeing.json index 8ed73c1e6..1786246d8 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:chairs", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_coffee_table_from_dyeing.json index 6903d206d..b47dee5a2 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_drawer_from_dyeing.json index 6d5e21c3b..eefeee173 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:drawers", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_counter_from_dyeing.json index f2f21dd0b..15325aeb4 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_cupboard_from_dyeing.json index 10f2ae9cf..2ae5feec6 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_sink_from_dyeing.json index ef4d5140c..1e42f3c5f 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_planks.json b/common/src/generated/resources/data/adorn/recipe/cyan_planks.json index 7e88ea6ce..b8b9ed88a 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:planks", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_platform_from_dyeing.json index ef8a24380..bfe0e45b1 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_post_from_dyeing.json index f7336c1ab..4ae5144d5 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_shelf_from_dyeing.json index 771e5aabb..ece5e017b 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_step_from_dyeing.json index cc459c5ae..d0d499551 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_table_from_dyeing.json index b328e42f2..dd7119a9d 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#adorn:tables", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_button.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_button.json index fb7647818..60893b565 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:cyan_planks" - } + "adorn:cyan_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_button_from_dyeing.json index 00c51ca36..c266b114e 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence.json index 5734a34c3..4aeff47cd 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:cyan_planks" - } + "#": "minecraft:stick", + "W": "adorn:cyan_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_from_dyeing.json index 07c0ae706..244b68bc9 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate.json index 9702a22ad..8adcafbd0 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:cyan_planks" - } + "#": "minecraft:stick", + "W": "adorn:cyan_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate_from_dyeing.json index 59ce1858f..08f92c23b 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate.json index e0d02528c..ea3ff7ea8 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:cyan_planks" - } + "#": "adorn:cyan_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate_from_dyeing.json index 598f38911..37327cbdb 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab.json index 8543887d3..bb63e2b37 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:cyan_planks" - } + "#": "adorn:cyan_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab_from_dyeing.json index 52c5698e7..cd525971a 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs.json index 037398fe0..b3abfd5a9 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:cyan_planks" - } + "#": "adorn:cyan_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs_from_dyeing.json index 9c26afba8..31191910b 100644 --- a/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/cyan_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/cyan" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/cyan" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_bench_from_dyeing.json index ecbbe2b58..586b8376a 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:benches", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_chair_from_dyeing.json index f9edf7e4f..c77f9c622 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:chairs", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_coffee_table_from_dyeing.json index f4d3af38a..cfdc5b37f 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_drawer_from_dyeing.json index 14df522e6..1ec99dcee 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:drawers", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_counter_from_dyeing.json index 240edfd1e..f6864f7c6 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_cupboard_from_dyeing.json index e5560a081..84164d489 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_sink_from_dyeing.json index 6eb91f160..87467f8a6 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_planks.json b/common/src/generated/resources/data/adorn/recipe/gray_planks.json index 4cc78b214..fb3b2c2e8 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:planks", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_platform_from_dyeing.json index 44ea123ac..5ee283315 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_post_from_dyeing.json index 7e3c53e70..e27d48797 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_shelf_from_dyeing.json index 62e841000..22ff4b9d5 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_step_from_dyeing.json index e8060aef7..a0cb650ff 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_table_from_dyeing.json index 6bccdc04a..839470969 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#adorn:tables", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_button.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_button.json index c73cd9589..de2fd61a2 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:gray_planks" - } + "adorn:gray_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_button_from_dyeing.json index 48f614621..9e3138d9f 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence.json index 2c00c1dbb..766cd1562 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:gray_planks" - } + "#": "minecraft:stick", + "W": "adorn:gray_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_from_dyeing.json index 125c8931d..45040d3bf 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate.json index e98aa50b1..462f845f2 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:gray_planks" - } + "#": "minecraft:stick", + "W": "adorn:gray_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate_from_dyeing.json index 20f5d2c7b..ea425eac6 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate.json index bdc080635..2ede2ee4c 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:gray_planks" - } + "#": "adorn:gray_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate_from_dyeing.json index 7e4d245d0..b5f7c7049 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_slab.json index f73ac9637..93cc77e36 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:gray_planks" - } + "#": "adorn:gray_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_slab_from_dyeing.json index 2b5bb3070..431cbb9f9 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs.json index 41660c544..a37817a48 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:gray_planks" - } + "#": "adorn:gray_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs_from_dyeing.json index 1c1c7945e..c2883fd2e 100644 --- a/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/gray_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/gray" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_bench_from_dyeing.json index 4445e45ca..511433b2c 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:benches", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_chair_from_dyeing.json index 1ec14c7cb..a7ba7ae17 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:chairs", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_coffee_table_from_dyeing.json index b42f40a54..49379c493 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_drawer_from_dyeing.json index 87ca4cad7..75e48ae9b 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:drawers", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_kitchen_counter_from_dyeing.json index 5ada9f3ef..b3852d227 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_kitchen_cupboard_from_dyeing.json index aa30faaac..ecdd97af7 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_kitchen_sink_from_dyeing.json index cc7487d9d..990f27759 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_planks.json b/common/src/generated/resources/data/adorn/recipe/green_planks.json index 27bfb89c2..49505dfff 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/green_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:planks", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_platform_from_dyeing.json index 5caf038d9..08b3a9b3a 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_post_from_dyeing.json index 690d9fb42..dcef5dd46 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_shelf_from_dyeing.json index db0615209..2fbce636b 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_step_from_dyeing.json index 11c06555f..e113f9b47 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_table_from_dyeing.json index 22125e30a..5f5b31856 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#adorn:tables", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_button.json b/common/src/generated/resources/data/adorn/recipe/green_wood_button.json index 579c3e808..fb0ba728f 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:green_planks" - } + "adorn:green_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_button_from_dyeing.json index db25ba17e..b1cfa5dc0 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/green_wood_fence.json index 5543410b5..e2d613f04 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:green_planks" - } + "#": "minecraft:stick", + "W": "adorn:green_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_from_dyeing.json index de123fea0..dc4ac3ad2 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate.json index 3d33b63e7..02050fbdc 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:green_planks" - } + "#": "minecraft:stick", + "W": "adorn:green_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate_from_dyeing.json index ca29410ee..1efff9e8a 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate.json index 28d718632..e7fbc8ef2 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:green_planks" - } + "#": "adorn:green_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate_from_dyeing.json index a2d8bb00c..00b2c862b 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/green_wood_slab.json index 2f2d60920..f851043be 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:green_planks" - } + "#": "adorn:green_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_slab_from_dyeing.json index 83b784668..5274ccf30 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/green_wood_stairs.json index 85cd2ef30..87d3d404b 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:green_planks" - } + "#": "adorn:green_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/green_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/green_wood_stairs_from_dyeing.json index e3a58a49a..45c0814ad 100644 --- a/common/src/generated/resources/data/adorn/recipe/green_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/green_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/green" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/green" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_bench_from_dyeing.json index e4be5fdc2..ea9646d35 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:benches", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_chair_from_dyeing.json index 514d51eb9..8f7bb1627 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:chairs", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_coffee_table_from_dyeing.json index f40260145..c8f2a9bdc 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_drawer_from_dyeing.json index 8b33bca91..eeef6e9d5 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:drawers", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_counter_from_dyeing.json index 80986fe83..4b40fe2bc 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_cupboard_from_dyeing.json index 48e149d51..6b9e64aa2 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_sink_from_dyeing.json index d1bc9220e..87e2bfda1 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_planks.json b/common/src/generated/resources/data/adorn/recipe/light_blue_planks.json index 1b95e9cd8..aa1ad7f74 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:planks", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_platform_from_dyeing.json index e227295d3..292a3917f 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_post_from_dyeing.json index 68a5b0a9d..c8c9b8c14 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_shelf_from_dyeing.json index 7cfee6c39..8265c9d2f 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_step_from_dyeing.json index b9bb041e7..21ba48faf 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_table_from_dyeing.json index a3db48e7f..7f552cc85 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#adorn:tables", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button.json index 5a172ff11..884447f85 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:light_blue_planks" - } + "adorn:light_blue_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button_from_dyeing.json index c40447b97..abca94625 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence.json index 472c1fcae..653a6a1e3 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:light_blue_planks" - } + "#": "minecraft:stick", + "W": "adorn:light_blue_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_from_dyeing.json index 1a5216cb1..97d8f84c3 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate.json index c8cd44793..649c72200 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:light_blue_planks" - } + "#": "minecraft:stick", + "W": "adorn:light_blue_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate_from_dyeing.json index d050b11b3..a8312b037 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate.json index 32cf90221..7d592b1c1 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:light_blue_planks" - } + "#": "adorn:light_blue_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate_from_dyeing.json index 348188c77..cf14b3be9 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab.json index 2a4662a39..215b4db5e 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:light_blue_planks" - } + "#": "adorn:light_blue_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab_from_dyeing.json index 90e74766c..dea1aaf88 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs.json index f2c405f5a..e890af22b 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:light_blue_planks" - } + "#": "adorn:light_blue_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs_from_dyeing.json index 82a764c8b..5c0c7ddc1 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_blue_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/light_blue" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/light_blue" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_bench_from_dyeing.json index 2e6a18c5a..5d6aeefb9 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:benches", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_chair_from_dyeing.json index 7fa3c1e5c..5444ff604 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:chairs", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_coffee_table_from_dyeing.json index f05baf51a..bfd2cef13 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_drawer_from_dyeing.json index 202d4c7ef..63d3b2b24 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:drawers", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_counter_from_dyeing.json index 1c1839bf6..5bee9ab24 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_cupboard_from_dyeing.json index fc6320910..a96a7ede6 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_sink_from_dyeing.json index b791cea98..4af7973ab 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_planks.json b/common/src/generated/resources/data/adorn/recipe/light_gray_planks.json index 18b615a1c..e363f38fc 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:planks", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_platform_from_dyeing.json index c460c64c9..71c545d8d 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_post_from_dyeing.json index 36510a714..d157cf8b0 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_shelf_from_dyeing.json index 032c30133..12bcf74a3 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_step_from_dyeing.json index 7040134c8..34155e5d7 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_table_from_dyeing.json index d792b336f..a65e6b709 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#adorn:tables", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button.json index c3184fec7..3c0859f2e 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:light_gray_planks" - } + "adorn:light_gray_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button_from_dyeing.json index d7a16f966..d3642844f 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence.json index 37bf8b221..9541d25c8 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:light_gray_planks" - } + "#": "minecraft:stick", + "W": "adorn:light_gray_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_from_dyeing.json index 9f74eb5ac..780fec6af 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate.json index 6c3709552..ea6bc30ed 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:light_gray_planks" - } + "#": "minecraft:stick", + "W": "adorn:light_gray_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate_from_dyeing.json index 4693d86ec..59f26c9b7 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate.json index 8d731cdc6..d51bfeaf9 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:light_gray_planks" - } + "#": "adorn:light_gray_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate_from_dyeing.json index af251d9e0..edb5cfb83 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab.json index cd1a18ed6..cfef8e6dc 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:light_gray_planks" - } + "#": "adorn:light_gray_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab_from_dyeing.json index 4c822eaf6..c1baacac2 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs.json index 654f51457..1d0e7ed1a 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:light_gray_planks" - } + "#": "adorn:light_gray_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs_from_dyeing.json index 2946f62af..5e865e95b 100644 --- a/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/light_gray_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/light_gray" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/light_gray" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_bench_from_dyeing.json index b7bb3495d..920013e0e 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:benches", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_chair_from_dyeing.json index 14783e5d6..69ec69173 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:chairs", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_coffee_table_from_dyeing.json index 5eaf585c8..805c23e87 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_drawer_from_dyeing.json index eb73657d0..76327805e 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:drawers", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_counter_from_dyeing.json index bd0d06463..63bff2ecb 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_cupboard_from_dyeing.json index f191ce8af..873cbb170 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_sink_from_dyeing.json index 3a3e9b514..9a4baa249 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_planks.json b/common/src/generated/resources/data/adorn/recipe/lime_planks.json index b3ecf6562..ab9da0581 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:planks", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_platform_from_dyeing.json index ce8a7c676..6b8836b9b 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_post_from_dyeing.json index 6b55bd88a..ed3567cf6 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_shelf_from_dyeing.json index e1a2b9d5a..64b71c988 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_step_from_dyeing.json index 63ab722b3..5dc581b98 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_table_from_dyeing.json index 9a9bb8640..f3160102f 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#adorn:tables", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_button.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_button.json index 948c3fe72..5621c4b95 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:lime_planks" - } + "adorn:lime_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_button_from_dyeing.json index 7c81ad12e..369442e54 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence.json index 191091a6c..d0729eb3e 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:lime_planks" - } + "#": "minecraft:stick", + "W": "adorn:lime_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_from_dyeing.json index 68ff035f7..3734aa473 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate.json index 598359099..9f12cd798 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:lime_planks" - } + "#": "minecraft:stick", + "W": "adorn:lime_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate_from_dyeing.json index 3fc96b815..b771072cb 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate.json index d526a44f9..6701af727 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:lime_planks" - } + "#": "adorn:lime_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate_from_dyeing.json index 1b025e796..daf513c21 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_slab.json index 421189947..87432edef 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:lime_planks" - } + "#": "adorn:lime_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_slab_from_dyeing.json index c86bebf6a..34d0e297a 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs.json index a0dc9bef7..332a5c3a9 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:lime_planks" - } + "#": "adorn:lime_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs_from_dyeing.json index a5aabaeee..80feb4868 100644 --- a/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/lime_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/lime" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/lime" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_bench_from_dyeing.json index 6a17285c0..ed7f2cd77 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:benches", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_chair_from_dyeing.json index 55ad3bd37..055a7aad4 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:chairs", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_coffee_table_from_dyeing.json index 6e7aa9b81..ee9097491 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_drawer_from_dyeing.json index 913759149..4a786a129 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:drawers", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_counter_from_dyeing.json index b02fe120a..842338f38 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_cupboard_from_dyeing.json index ebed237e6..12fa7e08d 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_sink_from_dyeing.json index a38695057..45170d71a 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_planks.json b/common/src/generated/resources/data/adorn/recipe/magenta_planks.json index e577c13c9..b74582432 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:planks", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_platform_from_dyeing.json index 6d94c5429..9daeafa1b 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_post_from_dyeing.json index 41c4acbe1..322c06de8 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_shelf_from_dyeing.json index 32597eb9c..b21cee422 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_step_from_dyeing.json index 02f1ad15f..3669cd109 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_table_from_dyeing.json index 917de0f7e..d285c71a5 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#adorn:tables", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_button.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_button.json index bccbd3569..79fdf0c38 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:magenta_planks" - } + "adorn:magenta_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_button_from_dyeing.json index a210d4204..36c50189b 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence.json index 13bb2fcdc..8c479aa2d 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:magenta_planks" - } + "#": "minecraft:stick", + "W": "adorn:magenta_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_from_dyeing.json index 2fc364117..b2429f88b 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate.json index 8d258de38..dd8a22974 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:magenta_planks" - } + "#": "minecraft:stick", + "W": "adorn:magenta_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate_from_dyeing.json index 24c5a2e8d..f9b3ecb24 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate.json index d649636a3..4b3928c15 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:magenta_planks" - } + "#": "adorn:magenta_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate_from_dyeing.json index 5cb865b7a..95ec022bd 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab.json index 82581dae9..69dcd009d 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:magenta_planks" - } + "#": "adorn:magenta_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab_from_dyeing.json index 1924ce86e..b02755d5a 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs.json index e44bab85a..43bd040f6 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:magenta_planks" - } + "#": "adorn:magenta_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs_from_dyeing.json index 0f1ed5238..26b54e1d1 100644 --- a/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/magenta_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/magenta" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/magenta" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_bench_from_dyeing.json index 07fb9ab5c..fa1e739da 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:benches", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_chair_from_dyeing.json index 395ab334c..3beb6ce4b 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:chairs", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_coffee_table_from_dyeing.json index 8505ad169..5f53c0441 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_drawer_from_dyeing.json index a8c326803..1ab0d2228 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:drawers", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_counter_from_dyeing.json index ea7ad0b19..461208373 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_cupboard_from_dyeing.json index 7073ba23f..aca28f9bb 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_sink_from_dyeing.json index e959dfd88..2ef5a9166 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_planks.json b/common/src/generated/resources/data/adorn/recipe/orange_planks.json index 1b0fabc58..e544c019d 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:planks", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_platform_from_dyeing.json index 0b109f976..18ddd2a4d 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_post_from_dyeing.json index a1e0f23d1..71bb4c741 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_shelf_from_dyeing.json index d0d4d8091..12eca1773 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_step_from_dyeing.json index ed31c3dfe..2b1890269 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_table_from_dyeing.json index c42ceacbf..c837da65a 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#adorn:tables", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_button.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_button.json index 964f0fbcb..08a9767f6 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:orange_planks" - } + "adorn:orange_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_button_from_dyeing.json index ad41bbe73..9f916af1d 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence.json index ad00c04a1..a1a2f12c5 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:orange_planks" - } + "#": "minecraft:stick", + "W": "adorn:orange_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_from_dyeing.json index ffc697d4f..1b580303e 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate.json index 9c2121b37..1b9d3e4d9 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:orange_planks" - } + "#": "minecraft:stick", + "W": "adorn:orange_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate_from_dyeing.json index b8c0af37e..738a0e4a6 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate.json index b95ddb66f..b5b60be47 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:orange_planks" - } + "#": "adorn:orange_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate_from_dyeing.json index a3203eb13..ff0f946a2 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_slab.json index ad53ba317..07b263b90 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:orange_planks" - } + "#": "adorn:orange_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_slab_from_dyeing.json index 389876df2..3ac234d85 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs.json index 3f9d97d92..bfb96eed4 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:orange_planks" - } + "#": "adorn:orange_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs_from_dyeing.json index d75740c87..62d142f12 100644 --- a/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/orange_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/orange" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/orange" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_bench_from_dyeing.json index efd192158..0190f7cb2 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:benches", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_chair_from_dyeing.json index de3297f16..8a08bf058 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:chairs", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_coffee_table_from_dyeing.json index 348aadb7e..aa9f77960 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_drawer_from_dyeing.json index b45e419b1..7985c001a 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:drawers", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_counter_from_dyeing.json index ec9ff2bb5..dd0dab825 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_cupboard_from_dyeing.json index 32248d580..ef7c0682c 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_sink_from_dyeing.json index 5a46de275..5d5b1d973 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_planks.json b/common/src/generated/resources/data/adorn/recipe/pink_planks.json index 7537aa7e1..ab7fa13d1 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:planks", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_platform_from_dyeing.json index 5c7ec5768..6bbdf4c47 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_post_from_dyeing.json index 3cb2abaa4..d17236c76 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_shelf_from_dyeing.json index 1b01d2a18..11ffb7ed5 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_step_from_dyeing.json index e4ce6630b..cb6652422 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_table_from_dyeing.json index 5fc4cf74e..440240b11 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#adorn:tables", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_button.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_button.json index 57c53ad9c..48137ed0d 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:pink_planks" - } + "adorn:pink_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_button_from_dyeing.json index b11693187..f37103494 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence.json index 0b748b5b4..c13885cf9 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:pink_planks" - } + "#": "minecraft:stick", + "W": "adorn:pink_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_from_dyeing.json index 292c020ed..6830dcbab 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate.json index f9f50c6ba..d9a8429a1 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:pink_planks" - } + "#": "minecraft:stick", + "W": "adorn:pink_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate_from_dyeing.json index a73130b23..9e7ab53b4 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate.json index 917912399..0c3ca73c1 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:pink_planks" - } + "#": "adorn:pink_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate_from_dyeing.json index 883ea75ca..3adfa71bf 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_slab.json index e3b844cde..b81049af1 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:pink_planks" - } + "#": "adorn:pink_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_slab_from_dyeing.json index ac8a3caae..b80ad23e3 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs.json index 80728c2e9..8fe53d543 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:pink_planks" - } + "#": "adorn:pink_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs_from_dyeing.json index b8339011e..af5ca0536 100644 --- a/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/pink_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/pink" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/pink" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_bench_from_dyeing.json index 27cba150c..a8fff354c 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:benches", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_chair_from_dyeing.json index 6cb13f077..4f2af2edb 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:chairs", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_coffee_table_from_dyeing.json index ec2226261..9a0ce001d 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_drawer_from_dyeing.json index f09408495..e36c8718e 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:drawers", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_counter_from_dyeing.json index 50dd04ee0..25644d3be 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_cupboard_from_dyeing.json index 41274a9bc..44705cf46 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_sink_from_dyeing.json index 9a5a7210c..a7f8c4691 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_planks.json b/common/src/generated/resources/data/adorn/recipe/purple_planks.json index 9768664a2..7b1a7ead4 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:planks", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_platform_from_dyeing.json index a1067c782..89508e945 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_post_from_dyeing.json index 24c8f2121..946e64ea5 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_shelf_from_dyeing.json index c78855b30..a8d09d7da 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_step_from_dyeing.json index 060a97d4a..790b8091f 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_table_from_dyeing.json index f39fc0871..f2a97e915 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#adorn:tables", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_button.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_button.json index 35e9dbce0..d09c7d33f 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:purple_planks" - } + "adorn:purple_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_button_from_dyeing.json index 7e47c42ff..c478c8d73 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence.json index 50b27981c..fd91d18aa 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:purple_planks" - } + "#": "minecraft:stick", + "W": "adorn:purple_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_from_dyeing.json index edbe82e03..5ee93a14e 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate.json index 4b843df05..0040c0e9a 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:purple_planks" - } + "#": "minecraft:stick", + "W": "adorn:purple_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate_from_dyeing.json index 79ff6ee13..3d0294e54 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate.json index 4299c6e82..bbd87cc98 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:purple_planks" - } + "#": "adorn:purple_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate_from_dyeing.json index 31507ea81..c58e22160 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_slab.json index 44ea5bb16..6c69a9cc3 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:purple_planks" - } + "#": "adorn:purple_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_slab_from_dyeing.json index df671192b..6975101a6 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs.json index 13ecb020e..e8a8bc0e5 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:purple_planks" - } + "#": "adorn:purple_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs_from_dyeing.json index c2255c5af..a401e8ef1 100644 --- a/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/purple_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/purple" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/purple" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_bench_from_dyeing.json index eee4d8f50..f4e14d0f6 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:benches", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_chair_from_dyeing.json index 55bbcb269..3a53ee740 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:chairs", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_coffee_table_from_dyeing.json index f0eb3d423..da93a3aea 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_drawer_from_dyeing.json index ae242a53e..7867cb807 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:drawers", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_kitchen_counter_from_dyeing.json index 8f07a976e..ae2660541 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_kitchen_cupboard_from_dyeing.json index 3058f686b..46f68c922 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_kitchen_sink_from_dyeing.json index db6e93bc5..c46b72b60 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_planks.json b/common/src/generated/resources/data/adorn/recipe/red_planks.json index bdfd54f60..169225fad 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/red_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:planks", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_platform_from_dyeing.json index 0d01b5f9f..5954d7c56 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_post_from_dyeing.json index a6b6b862d..f157e6c3f 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_shelf_from_dyeing.json index 353a4a34e..bab412cab 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_step_from_dyeing.json index ced73ee21..4a990e6e2 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_table_from_dyeing.json index 6d5ffd28c..a0eb3e992 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#adorn:tables", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_button.json b/common/src/generated/resources/data/adorn/recipe/red_wood_button.json index a47e7decb..3ffbe34d3 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:red_planks" - } + "adorn:red_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_button_from_dyeing.json index 104f1e0ff..2dde08ba6 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/red_wood_fence.json index e5b8af2f3..0f8b0c96c 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:red_planks" - } + "#": "minecraft:stick", + "W": "adorn:red_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_from_dyeing.json index b549421fd..0f5173c9c 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate.json index 45cff4ae5..a914242e5 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:red_planks" - } + "#": "minecraft:stick", + "W": "adorn:red_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate_from_dyeing.json index a80437f1a..4e9a9cb95 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate.json index 5f7f66e6e..3c4d1f88e 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:red_planks" - } + "#": "adorn:red_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate_from_dyeing.json index 800092a36..cb068dc35 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/red_wood_slab.json index 9551115c2..b5ca6dff0 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:red_planks" - } + "#": "adorn:red_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_slab_from_dyeing.json index 4880fcbfa..a151184b5 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/red_wood_stairs.json index eba8d21cb..7cf75ccaa 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:red_planks" - } + "#": "adorn:red_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/red_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/red_wood_stairs_from_dyeing.json index 074763cbc..1ffde6fd4 100644 --- a/common/src/generated/resources/data/adorn/recipe/red_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/red_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/red" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/red" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_bench_from_dyeing.json index 3ecd3a2a0..c1cc7bee0 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:benches", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_chair_from_dyeing.json index 64d6809c4..be7c79be6 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:chairs", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_coffee_table_from_dyeing.json index 957875ef7..b00bc4e5c 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_drawer_from_dyeing.json index 25201d5e2..9d7f20539 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:drawers", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_kitchen_counter_from_dyeing.json index ae764d450..0e9fd8f84 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_kitchen_cupboard_from_dyeing.json index 544335d63..e09c51891 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_kitchen_sink_from_dyeing.json index 8b849d65d..5df4251d8 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_planks.json b/common/src/generated/resources/data/adorn/recipe/white_planks.json index 9149eb286..ac7f8580f 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/white_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:planks", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_platform_from_dyeing.json index 4c0eecfe3..12992539b 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_post_from_dyeing.json index e0ff5710f..47871017a 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_shelf_from_dyeing.json index 7430644b6..21d0291c5 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_step_from_dyeing.json index b41681eae..7091a3915 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_table_from_dyeing.json index 77ea995a7..c882abc54 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#adorn:tables", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_button.json b/common/src/generated/resources/data/adorn/recipe/white_wood_button.json index 407e6f572..bb6b8fa1a 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:white_planks" - } + "adorn:white_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_button_from_dyeing.json index ca5db2457..7b064d109 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/white_wood_fence.json index 03145d81f..99619e95d 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:white_planks" - } + "#": "minecraft:stick", + "W": "adorn:white_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_from_dyeing.json index a0849c7d8..d348cd3ac 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate.json index 437b2e80a..c9c6a6bb2 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:white_planks" - } + "#": "minecraft:stick", + "W": "adorn:white_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate_from_dyeing.json index aee992cc1..d95919cb4 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate.json index 767ea0273..6ce34c9ce 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:white_planks" - } + "#": "adorn:white_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate_from_dyeing.json index 13701ea68..0c6f0c13d 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/white_wood_slab.json index 68cac5e6b..4e2db7f8d 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:white_planks" - } + "#": "adorn:white_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_slab_from_dyeing.json index fb6c6e45c..6cdd58495 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/white_wood_stairs.json index eca6f483c..0e758d708 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:white_planks" - } + "#": "adorn:white_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/white_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/white_wood_stairs_from_dyeing.json index 2df6ff445..2e118d370 100644 --- a/common/src/generated/resources/data/adorn/recipe/white_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/white_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/white" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/white" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_bench_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_bench_from_dyeing.json index 83a091346..198843ae1 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_bench_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_bench_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:bench", "key": { - "#": { - "tag": "adorn:benches" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:benches", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_chair_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_chair_from_dyeing.json index 3239c7058..fe8dbb4ca 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_chair_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_chair_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:chair", "key": { - "#": { - "tag": "adorn:chairs" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:chairs", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_coffee_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_coffee_table_from_dyeing.json index 79c49c615..effb63c89 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_coffee_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_coffee_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:coffee_table", "key": { - "#": { - "tag": "adorn:coffee_tables" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:coffee_tables", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_drawer_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_drawer_from_dyeing.json index daa6b04fc..b6ec9a4e1 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_drawer_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_drawer_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:drawer", "key": { - "#": { - "tag": "adorn:drawers" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:drawers", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_counter_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_counter_from_dyeing.json index 3d76bbbee..3cfd71c19 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_counter_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_counter_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_counter", "key": { - "#": { - "tag": "adorn:kitchen_counters" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:kitchen_counters", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_cupboard_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_cupboard_from_dyeing.json index 7d137beeb..1e7515678 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_cupboard_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_cupboard_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_cupboard", "key": { - "#": { - "tag": "adorn:kitchen_cupboards" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:kitchen_cupboards", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_sink_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_sink_from_dyeing.json index 2ab82ac16..0718d7ecb 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_sink_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_kitchen_sink_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:kitchen_sink", "key": { - "#": { - "tag": "adorn:kitchen_sinks" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:kitchen_sinks", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_planks.json b/common/src/generated/resources/data/adorn/recipe/yellow_planks.json index ab269d730..c16fe5660 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_planks.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_planks.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_planks", "key": { - "#": { - "tag": "minecraft:planks" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:planks", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_platform_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_platform_from_dyeing.json index 8ce5a67b6..95dca8711 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_platform_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_platform_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:platform", "key": { - "#": { - "tag": "adorn:wooden_platforms" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:wooden_platforms", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_post_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_post_from_dyeing.json index fddbc4e06..c4eb88af4 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_post_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_post_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:post", "key": { - "#": { - "tag": "adorn:wooden_posts" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:wooden_posts", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_shelf_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_shelf_from_dyeing.json index c913494f5..7175ecf18 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_shelf_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_shelf_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:shelf", "key": { - "#": { - "tag": "adorn:wooden_shelves" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:wooden_shelves", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_step_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_step_from_dyeing.json index 02405682c..cc782c93b 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_step_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_step_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:step", "key": { - "#": { - "tag": "adorn:wooden_steps" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:wooden_steps", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_table_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_table_from_dyeing.json index 72e965c40..afe0ac08e 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_table_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_table_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "adorn:table", "key": { - "#": { - "tag": "adorn:tables" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#adorn:tables", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_button.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_button.json index cb18a05af..19c0399eb 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_button.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_button.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_button", "ingredients": [ - { - "item": "adorn:yellow_planks" - } + "adorn:yellow_planks" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_button_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_button_from_dyeing.json index 65f89a5b5..dfc6551c2 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_button_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_button_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_button", "key": { - "#": { - "tag": "minecraft:wooden_buttons" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:wooden_buttons", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence.json index f847052b3..a63e1a6b0 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence.json @@ -3,12 +3,8 @@ "category": "misc", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:yellow_planks" - } + "#": "minecraft:stick", + "W": "adorn:yellow_planks" }, "pattern": [ "W#W", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_from_dyeing.json index 18a4fbaec..68b474805 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence", "key": { - "#": { - "tag": "minecraft:wooden_fences" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:wooden_fences", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate.json index 7fd71cbcc..845886255 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate.json @@ -3,12 +3,8 @@ "category": "redstone", "group": "wooden_fence", "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "adorn:yellow_planks" - } + "#": "minecraft:stick", + "W": "adorn:yellow_planks" }, "pattern": [ "#W#", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate_from_dyeing.json index aafbc2094..f8526cf11 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_fence_gate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_fence_gate", "key": { - "#": { - "tag": "minecraft:fence_gates" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:fence_gates", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate.json index 9865f2c78..16c4e380d 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate.json @@ -3,9 +3,7 @@ "category": "redstone", "group": "wooden_pressure_plate", "key": { - "#": { - "item": "adorn:yellow_planks" - } + "#": "adorn:yellow_planks" }, "pattern": [ "##" diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate_from_dyeing.json index cdfbbef12..b172d0fd7 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_pressure_plate_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_pressure_plate", "key": { - "#": { - "tag": "minecraft:wooden_pressure_plates" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:wooden_pressure_plates", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab.json index 89578b905..3cee9b740 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_slabs", "key": { - "#": { - "item": "adorn:yellow_planks" - } + "#": "adorn:yellow_planks" }, "pattern": [ "###" diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab_from_dyeing.json index 4a63c8a73..9a523b75b 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_slab_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_slab", "key": { - "#": { - "tag": "minecraft:wooden_slabs" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:wooden_slabs", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs.json index 4e908ce54..d47b7cad0 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "item": "adorn:yellow_planks" - } + "#": "adorn:yellow_planks" }, "pattern": [ "# ", diff --git a/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs_from_dyeing.json b/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs_from_dyeing.json index fbbbebd13..a6c516b0a 100644 --- a/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs_from_dyeing.json +++ b/common/src/generated/resources/data/adorn/recipe/yellow_wood_stairs_from_dyeing.json @@ -3,12 +3,8 @@ "category": "building", "group": "wooden_stairs", "key": { - "#": { - "tag": "minecraft:wooden_stairs" - }, - "*": { - "tag": "c:dyes/yellow" - } + "#": "#minecraft:wooden_stairs", + "*": "#c:dyes/yellow" }, "pattern": [ "###", diff --git a/common/src/main/java/juuxel/adorn/block/AbstractChimneyBlock.java b/common/src/main/java/juuxel/adorn/block/AbstractChimneyBlock.java index 157be0e49..b983a5aed 100644 --- a/common/src/main/java/juuxel/adorn/block/AbstractChimneyBlock.java +++ b/common/src/main/java/juuxel/adorn/block/AbstractChimneyBlock.java @@ -15,9 +15,11 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public abstract class AbstractChimneyBlock extends Block implements Waterloggable { public static final BooleanProperty CONNECTED = BooleanProperty.of("connected"); @@ -51,9 +53,9 @@ private BlockState updateConnections(BlockState state, BlockState neighborState) } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } return direction == Direction.UP ? updateConnections(state, neighborState) : state; diff --git a/common/src/main/java/juuxel/adorn/block/AbstractKitchenCounterBlock.java b/common/src/main/java/juuxel/adorn/block/AbstractKitchenCounterBlock.java index 17fefda6b..4dd91f18d 100644 --- a/common/src/main/java/juuxel/adorn/block/AbstractKitchenCounterBlock.java +++ b/common/src/main/java/juuxel/adorn/block/AbstractKitchenCounterBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.util.Shapes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -9,7 +8,7 @@ import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; -import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; @@ -21,7 +20,7 @@ import java.util.Map; public abstract class AbstractKitchenCounterBlock extends Block { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final BlockSoundGroup SOUND_GROUP = new BlockSoundGroup( 1.0F, 1.0F, SoundEvents.BLOCK_WOOD_BREAK, @@ -42,11 +41,7 @@ public abstract class AbstractKitchenCounterBlock extends Block { ); public AbstractKitchenCounterBlock(Settings settings) { - super(settings); - } - - public AbstractKitchenCounterBlock(BlockVariant variant) { - this(variant.createSettings().sounds(SOUND_GROUP)); + super(settings.sounds(SOUND_GROUP)); } @Override diff --git a/common/src/main/java/juuxel/adorn/block/AbstractTableBlock.java b/common/src/main/java/juuxel/adorn/block/AbstractTableBlock.java index 3ec2e8ad5..9bf4d1d14 100644 --- a/common/src/main/java/juuxel/adorn/block/AbstractTableBlock.java +++ b/common/src/main/java/juuxel/adorn/block/AbstractTableBlock.java @@ -13,9 +13,11 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public abstract class AbstractTableBlock extends CarpetedBlock implements Waterloggable { public static final BooleanProperty NORTH = Properties.NORTH; @@ -53,15 +55,15 @@ public FluidState getFluidState(BlockState state) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return updateConnections(super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos), world, pos); + return updateConnections(super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random), world, pos); } - private BlockState updateConnections(BlockState state, WorldAccess world, BlockPos pos) { + private BlockState updateConnections(BlockState state, BlockView world, BlockPos pos) { return state.with(NORTH, canConnectTo(world.getBlockState(pos.offset(Direction.NORTH)), Direction.NORTH)) .with(EAST, canConnectTo(world.getBlockState(pos.offset(Direction.EAST)), Direction.EAST)) .with(SOUTH, canConnectTo(world.getBlockState(pos.offset(Direction.SOUTH)), Direction.SOUTH)) diff --git a/common/src/main/java/juuxel/adorn/block/AdornBlockEntities.java b/common/src/main/java/juuxel/adorn/block/AdornBlockEntities.java index 053baf21a..ce0f4e444 100644 --- a/common/src/main/java/juuxel/adorn/block/AdornBlockEntities.java +++ b/common/src/main/java/juuxel/adorn/block/AdornBlockEntities.java @@ -17,6 +17,7 @@ import net.minecraft.block.entity.BlockEntityType.BlockEntityFactory; import net.minecraft.registry.RegistryKeys; +import java.util.Set; import java.util.function.Supplier; public final class AdornBlockEntities { @@ -34,7 +35,7 @@ public final class AdornBlockEntities { register("brewer", PlatformBridges.get().getBlockEntities()::createBrewer, AdornBlocks.BREWER); private static Registered> register(String name, BlockEntityFactory factory, Supplier block) { - return BLOCK_ENTITIES.register(name, () -> BlockEntityType.Builder.create(factory, block.get()).build(null)); + return BLOCK_ENTITIES.register(name, () -> new BlockEntityType<>(factory, Set.of(block.get()))); } private static Registered> register(String name, BlockEntityFactory factory, Class blockClass) { diff --git a/common/src/main/java/juuxel/adorn/block/AdornBlocks.java b/common/src/main/java/juuxel/adorn/block/AdornBlocks.java index b197f3639..18327ae84 100644 --- a/common/src/main/java/juuxel/adorn/block/AdornBlocks.java +++ b/common/src/main/java/juuxel/adorn/block/AdornBlocks.java @@ -13,6 +13,7 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.ButtonBlock; import net.minecraft.block.MapColor; import net.minecraft.block.Oxidizable; import net.minecraft.block.PressurePlateBlock; @@ -33,7 +34,8 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_sofa", - () -> PlatformBridges.get().getBlockFactory().createSofa(BlockVariant.wool(color)) + settings -> PlatformBridges.get().getBlockFactory().createSofa(settings), + BlockVariant.wool(color) ) ); @@ -41,7 +43,8 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_planks", - () -> PlatformBridges.get().getBlockFactory().createPaintedPlanks(BlockVariant.OAK.createSettings().mapColor(color)) + settings -> PlatformBridges.get().getBlockFactory().createPaintedPlanks(settings), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ) ); @@ -49,7 +52,8 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_wood_slab", - () -> PlatformBridges.get().getBlockFactory().createPaintedWoodSlab(BlockVariant.OAK.createSettings().mapColor(color)) + settings -> PlatformBridges.get().getBlockFactory().createPaintedWoodSlab(settings), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ) ); @@ -59,7 +63,8 @@ public final class AdornBlocks { var planks = PAINTED_PLANKS.get(color); return HELPER.registerBlock( color.asString() + "_wood_stairs", - () -> PlatformBridges.get().getBlockFactory().createPaintedWoodStairs(planks.get().getDefaultState(), BlockVariant.OAK.createSettings().mapColor(color)) + settings -> PlatformBridges.get().getBlockFactory().createPaintedWoodStairs(planks.get().getDefaultState(), settings), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ); } ); @@ -68,7 +73,8 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_wood_fence", - () -> PlatformBridges.get().getBlockFactory().createPaintedWoodFence(BlockVariant.OAK.createSettings().mapColor(color)) + settings -> PlatformBridges.get().getBlockFactory().createPaintedWoodFence(settings), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ) ); @@ -76,10 +82,11 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_wood_fence_gate", - () -> PlatformBridges.get().getBlockFactory().createPaintedWoodFenceGate( + settings -> PlatformBridges.get().getBlockFactory().createPaintedWoodFenceGate( AdornWoodTypes.PAINTED_WOODS.get(color), - BlockVariant.OAK.createSettings().mapColor(color) - ) + settings + ), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ) ); @@ -87,10 +94,8 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_wood_pressure_plate", - () -> new PressurePlateBlock( - AdornBlockSetTypes.PAINTED_WOODS.get(color), - BlockVariant.OAK.createSettings().mapColor(color) - ) + settings -> new PressurePlateBlock(AdornBlockSetTypes.PAINTED_WOODS.get(color), settings), + () -> BlockVariant.OAK.createBlockSettings().mapColor(color) ) ); @@ -98,54 +103,72 @@ public final class AdornBlocks { DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_wood_button", - () -> Blocks.createWoodenButtonBlock(AdornBlockSetTypes.PAINTED_WOODS.get(color)) + settings -> new ButtonBlock(AdornBlockSetTypes.PAINTED_WOODS.get(color), 30, settings), + () -> Blocks.createButtonSettings().mapColor(color) ) ); public static final Registered BRICK_CHIMNEY = HELPER.registerBlock("brick_chimney", - () -> new ChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.RED))); + ChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.RED) + ); public static final Registered STONE_BRICK_CHIMNEY = HELPER.registerBlock("stone_brick_chimney", - () -> new ChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.STONE_GRAY))); + ChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.STONE_GRAY) + ); public static final Registered NETHER_BRICK_CHIMNEY = HELPER.registerBlock("nether_brick_chimney", - () -> new ChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.DARK_RED))); + ChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.DARK_RED) + ); public static final Registered RED_NETHER_BRICK_CHIMNEY = HELPER.registerBlock("red_nether_brick_chimney", - () -> new ChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.DARK_RED))); + ChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.DARK_RED) + ); public static final Registered COBBLESTONE_CHIMNEY = HELPER.registerBlock("cobblestone_chimney", - () -> new ChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.STONE_GRAY))); + ChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.STONE_GRAY) + ); public static final Registered PRISMARINE_CHIMNEY = HELPER.registerBlock("prismarine_chimney", - () -> new PrismarineChimneyBlock(AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f))); + PrismarineChimneyBlock::new, + () -> AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f) + ); public static final Registered MAGMATIC_PRISMARINE_CHIMNEY = HELPER.registerBlock("magmatic_prismarine_chimney", - () -> new PrismarineChimneyBlock.WithColumn(true, AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f).luminance(state -> 3))); + settings -> new PrismarineChimneyBlock.WithColumn(true, settings), + () -> AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f).luminance(state -> 3) + ); public static final Registered SOULFUL_PRISMARINE_CHIMNEY = HELPER.registerBlock("soulful_prismarine_chimney", - () -> new PrismarineChimneyBlock.WithColumn(false, AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f))); + settings -> new PrismarineChimneyBlock.WithColumn(false, settings), + () -> AbstractChimneyBlock.createBlockSettings(MapColor.CYAN, 1.5f) + ); public static final RegisteredMap TABLE_LAMPS = BLOCKS.registerBy( DyeColor.values(), - color -> HELPER.registerBlock(color.asString() + "_table_lamp", () -> new TableLampBlock(TableLampBlock.createBlockSettings(color))) + color -> HELPER.registerBlock(color.asString() + "_table_lamp", TableLampBlock::new, () -> TableLampBlock.createBlockSettings(color)) ); public static final Registered TRADING_STATION = HELPER.registerBlock( "trading_station", - block -> new TradingStationItem(block, new Item.Settings()), - () -> new TradingStationBlock(AbstractBlock.Settings.create().mapColor(MapColor.GREEN).strength(2.5f).sounds(BlockSoundGroup.WOOD)) + TradingStationItem::new, + TradingStationBlock::new, + () -> AbstractBlock.Settings.create().mapColor(MapColor.GREEN).strength(2.5f).sounds(BlockSoundGroup.WOOD) ); public static final Registered STONE_TORCH_GROUND = HELPER.registerBlockWithoutItem("stone_torch", - () -> new TorchBlock( - ParticleTypes.FLAME, - AbstractBlock.Settings.copy(Blocks.TORCH) - .sounds(BlockSoundGroup.STONE) - .luminance(state -> 15) - )); + settings -> new TorchBlock(ParticleTypes.FLAME, settings), + () -> AbstractBlock.Settings.copy(Blocks.TORCH) + .sounds(BlockSoundGroup.STONE) + .luminance(state -> 15) + ); public static final Registered STONE_TORCH_WALL = HELPER.registerBlockWithoutItem("wall_stone_torch", - () -> new WallTorchBlock( - ParticleTypes.FLAME, - AbstractBlock.Settings.copy(STONE_TORCH_GROUND.get()).dropsLike(STONE_TORCH_GROUND.get()) - )); + settings -> new WallTorchBlock(ParticleTypes.FLAME, settings), + () -> alternativeFormOf(AbstractBlock.Settings.copy(STONE_TORCH_GROUND.get()), STONE_TORCH_GROUND.get()) + ); public static final Registered CRATE = HELPER.registerBlock("crate", - () -> new Block(AdornUtil.copySettingsSafely(Blocks.OAK_PLANKS))); + Block::new, + () -> AdornUtil.copySettingsSafely(Blocks.OAK_PLANKS) + ); public static final Registered APPLE_CRATE = registerCrate("apple_crate"); public static final Registered WHEAT_CRATE = registerCrate("wheat_crate"); public static final Registered CARROT_CRATE = registerCrate("carrot_crate"); @@ -165,82 +188,97 @@ public final class AdornBlocks { public static final Registered LIL_TATER_CRATE = registerCrate("lil_tater_crate"); public static final Registered PICKET_FENCE = HELPER.registerBlock("picket_fence", - () -> new PicketFenceBlock(AbstractBlock.Settings.copy(Blocks.OAK_FENCE).nonOpaque())); + PicketFenceBlock::new, + () -> AbstractBlock.Settings.copy(Blocks.OAK_FENCE).nonOpaque() + ); public static final Registered CHAIN_LINK_FENCE = HELPER.registerBlock("chain_link_fence", - () -> new ChainLinkFenceBlock( - AbstractBlock.Settings.copy(Blocks.IRON_BARS) - .sounds(AdornSounds.CHAIN_LINK_FENCE) - )); + ChainLinkFenceBlock::new, + () -> AbstractBlock.Settings.copy(Blocks.IRON_BARS) + .sounds(AdornSounds.CHAIN_LINK_FENCE) + ); public static final Registered STONE_LADDER = HELPER.registerBlock("stone_ladder", - () -> new StoneLadderBlock(AbstractBlock.Settings.copy(Blocks.STONE).nonOpaque())); + StoneLadderBlock::new, + () -> AbstractBlock.Settings.copy(Blocks.STONE).nonOpaque() + ); public static final Registered BREWER = HELPER.registerBlock("brewer", - () -> new BrewerBlock( - AbstractBlock.Settings.create() - .mapColor(MapColor.DEEPSLATE_GRAY) - .solid() - .strength(0.8F) - .requiresTool() - )); + BrewerBlock::new, + () -> AbstractBlock.Settings.create() + .mapColor(MapColor.DEEPSLATE_GRAY) + .solid() + .strength(0.8F) + .requiresTool() + ); public static final Registered CANDLELIT_LANTERN = HELPER.registerBlock("candlelit_lantern", - () -> new CandlelitLanternBlock(CandlelitLanternBlock.createBlockSettings())); + CandlelitLanternBlock::new, + CandlelitLanternBlock::createBlockSettings + ); public static final RegisteredMap DYED_CANDLELIT_LANTERNS = BLOCKS.registerBy( DyeColor.values(), color -> HELPER.registerBlock( color.asString() + "_candlelit_lantern", - () -> new CandlelitLanternBlock(CandlelitLanternBlock.createBlockSettings()) + CandlelitLanternBlock::new, + CandlelitLanternBlock::createBlockSettings ) ); public static final Registered COPPER_PIPE = HELPER.registerBlock("copper_pipe", - () -> new OxidizableCopperPipeBlock( - Oxidizable.OxidationLevel.UNAFFECTED, - AbstractBlock.Settings.create() - .requiresTool() - .strength(3f, 5f) - .sounds(BlockSoundGroup.COPPER) - .mapColor(MapColor.ORANGE) - )); + settings -> new OxidizableCopperPipeBlock(Oxidizable.OxidationLevel.UNAFFECTED, settings), + () -> AbstractBlock.Settings.create() + .requiresTool() + .strength(3f, 5f) + .sounds(BlockSoundGroup.COPPER) + .mapColor(MapColor.ORANGE) + ); public static final Registered EXPOSED_COPPER_PIPE = HELPER.registerBlock("exposed_copper_pipe", - () -> new OxidizableCopperPipeBlock( - Oxidizable.OxidationLevel.EXPOSED, - AbstractBlock.Settings.create() - .requiresTool() - .strength(3f, 5f) - .sounds(BlockSoundGroup.COPPER) - .mapColor(MapColor.TERRACOTTA_LIGHT_GRAY) - )); + settings -> new OxidizableCopperPipeBlock(Oxidizable.OxidationLevel.EXPOSED, settings), + () -> AbstractBlock.Settings.create() + .requiresTool() + .strength(3f, 5f) + .sounds(BlockSoundGroup.COPPER) + .mapColor(MapColor.TERRACOTTA_LIGHT_GRAY) + ); public static final Registered WEATHERED_COPPER_PIPE = HELPER.registerBlock("weathered_copper_pipe", - () -> new OxidizableCopperPipeBlock( - Oxidizable.OxidationLevel.WEATHERED, - AbstractBlock.Settings.create() - .requiresTool() - .strength(3f, 5f) - .sounds(BlockSoundGroup.COPPER) - .mapColor(MapColor.DARK_AQUA) - )); + settings -> new OxidizableCopperPipeBlock(Oxidizable.OxidationLevel.WEATHERED, settings), + () -> AbstractBlock.Settings.create() + .requiresTool() + .strength(3f, 5f) + .sounds(BlockSoundGroup.COPPER) + .mapColor(MapColor.DARK_AQUA) + ); public static final Registered OXIDIZED_COPPER_PIPE = HELPER.registerBlock("oxidized_copper_pipe", - () -> new OxidizableCopperPipeBlock( - Oxidizable.OxidationLevel.OXIDIZED, - AbstractBlock.Settings.create() - .requiresTool() - .strength(3f, 5f) - .sounds(BlockSoundGroup.COPPER) - .mapColor(MapColor.TEAL) - )); + settings -> new OxidizableCopperPipeBlock(Oxidizable.OxidationLevel.OXIDIZED, settings), + () -> AbstractBlock.Settings.create() + .requiresTool() + .strength(3f, 5f) + .sounds(BlockSoundGroup.COPPER) + .mapColor(MapColor.TEAL) + ); public static final Registered WAXED_COPPER_PIPE = HELPER.registerBlock("waxed_copper_pipe", - () -> new CopperPipeBlock(AbstractBlock.Settings.copy(COPPER_PIPE.get()))); + CopperPipeBlock::new, + () -> AbstractBlock.Settings.copy(COPPER_PIPE.get()) + ); public static final Registered WAXED_EXPOSED_COPPER_PIPE = HELPER.registerBlock("waxed_exposed_copper_pipe", - () -> new CopperPipeBlock(AbstractBlock.Settings.copy(EXPOSED_COPPER_PIPE.get()))); + CopperPipeBlock::new, + () -> AbstractBlock.Settings.copy(EXPOSED_COPPER_PIPE.get()) + ); public static final Registered WAXED_WEATHERED_COPPER_PIPE = HELPER.registerBlock("waxed_weathered_copper_pipe", - () -> new CopperPipeBlock(AbstractBlock.Settings.copy(WEATHERED_COPPER_PIPE.get()))); + CopperPipeBlock::new, + () -> AbstractBlock.Settings.copy(WEATHERED_COPPER_PIPE.get()) + ); public static final Registered WAXED_OXIDIZED_COPPER_PIPE = HELPER.registerBlock("waxed_oxidized_copper_pipe", - () -> new CopperPipeBlock(AbstractBlock.Settings.copy(OXIDIZED_COPPER_PIPE.get()))); + CopperPipeBlock::new, + () -> AbstractBlock.Settings.copy(OXIDIZED_COPPER_PIPE.get()) + ); public static void init() { } private static Registered registerCrate(String name) { - return HELPER.registerBlock(name, () -> new Item.Settings().recipeRemainder(CRATE.get().asItem()), () -> new Block(AdornUtil.copySettingsSafely(CRATE.get()))); + return HELPER.registerBlock(name, () -> new Item.Settings().recipeRemainder(CRATE.get().asItem()), Block::new, () -> AdornUtil.copySettingsSafely(CRATE.get())); + } + + private static AbstractBlock.Settings alternativeFormOf(AbstractBlock.Settings settings, Block other) { + return settings.lootTable(other.getLootTableKey()).overrideTranslationKey(other.getTranslationKey()); } } diff --git a/common/src/main/java/juuxel/adorn/block/BenchBlock.java b/common/src/main/java/juuxel/adorn/block/BenchBlock.java index b8f52dd46..1e471ea42 100644 --- a/common/src/main/java/juuxel/adorn/block/BenchBlock.java +++ b/common/src/main/java/juuxel/adorn/block/BenchBlock.java @@ -19,10 +19,13 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.ArrayList; import java.util.List; @@ -66,8 +69,8 @@ public final class BenchBlock extends SeatBlock implements Waterloggable, BlockW } } - public BenchBlock(BlockVariant variant) { - super(variant.createSettings()); + public BenchBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState() .with(AXIS, Direction.Axis.Z) .with(CONNECTED_N, false) @@ -84,9 +87,9 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } return updateConnections(world, pos, state); diff --git a/common/src/main/java/juuxel/adorn/block/BrewerBlock.java b/common/src/main/java/juuxel/adorn/block/BrewerBlock.java index d59b226b6..49adcaaa9 100644 --- a/common/src/main/java/juuxel/adorn/block/BrewerBlock.java +++ b/common/src/main/java/juuxel/adorn/block/BrewerBlock.java @@ -14,9 +14,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.BlockMirror; @@ -34,7 +35,7 @@ import java.util.Map; public final class BrewerBlock extends VisibleBlockWithEntity implements BlockWithDescription { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final BooleanProperty HAS_MUG = BooleanProperty.of("has_mug"); public static final BooleanProperty ACTIVE = BooleanProperty.of("active"); @@ -85,8 +86,12 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt } @Override - public @Nullable BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return !world.isClient ? validateTicker(type, AdornBlockEntities.BREWER.get(), BrewerBlockEntity::tick) : null; + public @Nullable BlockEntityTicker getTicker(World world, BlockState stateUnused, BlockEntityType type) { + return world instanceof ServerWorld serverWorld ? validateTicker( + type, + AdornBlockEntities.BREWER.get(), + (worldUnused, pos, state, blockEntity) -> BrewerBlockEntity.tick(serverWorld, pos, state, blockEntity) + ) : null; } @Override diff --git a/common/src/main/java/juuxel/adorn/block/CarpetedBlock.java b/common/src/main/java/juuxel/adorn/block/CarpetedBlock.java index 42ba5578e..f0f4ff4f1 100644 --- a/common/src/main/java/juuxel/adorn/block/CarpetedBlock.java +++ b/common/src/main/java/juuxel/adorn/block/CarpetedBlock.java @@ -7,7 +7,7 @@ import net.minecraft.block.DyedCarpetBlock; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContextParameterSet; +import net.minecraft.loot.context.LootWorldContext; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; @@ -16,7 +16,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -86,19 +87,19 @@ public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Ran } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (isCarpetingEnabled()) { var carpet = state.get(CARPET); if (carpet.isPresent() && !COLORS_TO_BLOCKS.get(carpet.value()).getDefaultState().canPlaceAt(world, pos)) { - world.scheduleBlockTick(pos, this, 1); + tickView.scheduleBlockTick(pos, this, 1); } } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } @Override - public List getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder) { + protected List getDroppedStacks(BlockState state, LootWorldContext.Builder builder) { if (isCarpetingEnabled() && state.get(CARPET).isPresent()) { var stacks = new ArrayList<>(super.getDroppedStacks(state, builder)); stacks.addAll(COLORS_TO_BLOCKS.get(state.get(CARPET).value()).getDefaultState().getDroppedStacks(builder)); diff --git a/common/src/main/java/juuxel/adorn/block/ChainLinkFenceBlock.java b/common/src/main/java/juuxel/adorn/block/ChainLinkFenceBlock.java index bbd49e164..8ea829e22 100644 --- a/common/src/main/java/juuxel/adorn/block/ChainLinkFenceBlock.java +++ b/common/src/main/java/juuxel/adorn/block/ChainLinkFenceBlock.java @@ -11,7 +11,9 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.WorldAccess; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public final class ChainLinkFenceBlock extends PaneBlock implements BlockWithDescription { public static final BooleanProperty UP = Properties.UP; @@ -40,8 +42,8 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { - var result = super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + var result = super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); if (direction == Direction.UP) { result = result.with(UP, connectsVerticallyTo(neighborState)); diff --git a/common/src/main/java/juuxel/adorn/block/ChairBlock.java b/common/src/main/java/juuxel/adorn/block/ChairBlock.java index 2563ac220..9ea9d4334 100644 --- a/common/src/main/java/juuxel/adorn/block/ChairBlock.java +++ b/common/src/main/java/juuxel/adorn/block/ChairBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.lib.AdornStats; import juuxel.adorn.util.Shapes; import net.minecraft.block.Block; @@ -19,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.BlockMirror; @@ -27,18 +25,20 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import org.jetbrains.annotations.Nullable; import java.util.Map; public final class ChairBlock extends CarpetedBlock implements Waterloggable, BlockWithDescription { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final EnumProperty HALF = Properties.DOUBLE_BLOCK_HALF; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; @@ -72,8 +72,8 @@ public final class ChairBlock extends CarpetedBlock implements Waterloggable, Bl UPPER_OUTLINE_SHAPES = Shapes.mergeIntoShapeMap(upperBackShapes, upperSeatShape); } - public ChairBlock(BlockVariant variant) { - super(variant.createSettings()); + public ChairBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(HALF, DoubleBlockHalf.LOWER) .with(WATERLOGGED, false)); @@ -100,7 +100,7 @@ protected void appendProperties(StateManager.Builder builder) var world = ctx.getWorld(); var pos = ctx.getBlockPos(); - if (pos.getY() < world.getTopY() - 1 && world.getBlockState(pos.up()).canReplace(ctx)) { + if (pos.getY() < world.getTopYInclusive() && world.getBlockState(pos.up()).canReplace(ctx)) { return super.getPlacementState(ctx).with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()) .with(WATERLOGGED, world.getFluidState(pos).getFluid() == Fluids.WATER); } @@ -172,9 +172,9 @@ public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } var half = state.get(HALF); @@ -188,7 +188,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio return state.with(FACING, neighborState.get(FACING)); } } else { - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } } diff --git a/common/src/main/java/juuxel/adorn/block/ChimneyBlock.java b/common/src/main/java/juuxel/adorn/block/ChimneyBlock.java index 28aa5ec57..5df67df21 100644 --- a/common/src/main/java/juuxel/adorn/block/ChimneyBlock.java +++ b/common/src/main/java/juuxel/adorn/block/ChimneyBlock.java @@ -37,7 +37,7 @@ protected void appendProperties(StateManager.Builder builder) @Override protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { world.setBlockState(pos, state.cycle(SMOKE_TYPE)); - return ActionResult.success(world.isClient); + return ActionResult.SUCCESS; } @Override diff --git a/common/src/main/java/juuxel/adorn/block/CoffeeTableBlock.java b/common/src/main/java/juuxel/adorn/block/CoffeeTableBlock.java index 4beeb142f..c2a0e26e5 100644 --- a/common/src/main/java/juuxel/adorn/block/CoffeeTableBlock.java +++ b/common/src/main/java/juuxel/adorn/block/CoffeeTableBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -14,10 +13,12 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public final class CoffeeTableBlock extends Block implements Waterloggable, BlockWithDescription { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; @@ -31,8 +32,8 @@ public final class CoffeeTableBlock extends Block implements Waterloggable, Bloc ); private static final String DESCRIPTION_KEY = "block.adorn.coffee_table.description"; - public CoffeeTableBlock(BlockVariant variant) { - super(variant.createSettings().nonOpaque()); + public CoffeeTableBlock(Settings settings) { + super(settings.nonOpaque()); setDefaultState(getDefaultState().with(WATERLOGGED, false)); } @@ -68,11 +69,11 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } } diff --git a/common/src/main/java/juuxel/adorn/block/CopperPipeBlock.java b/common/src/main/java/juuxel/adorn/block/CopperPipeBlock.java index 7d88bde98..0a20679c6 100644 --- a/common/src/main/java/juuxel/adorn/block/CopperPipeBlock.java +++ b/common/src/main/java/juuxel/adorn/block/CopperPipeBlock.java @@ -15,10 +15,12 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.HashSet; import java.util.Set; @@ -136,9 +138,9 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } return updateConnection(state, neighborState, direction); diff --git a/common/src/main/java/juuxel/adorn/block/DrawerBlock.java b/common/src/main/java/juuxel/adorn/block/DrawerBlock.java index e79a5d317..b889615ed 100644 --- a/common/src/main/java/juuxel/adorn/block/DrawerBlock.java +++ b/common/src/main/java/juuxel/adorn/block/DrawerBlock.java @@ -3,7 +3,6 @@ import com.mojang.serialization.MapCodec; import juuxel.adorn.block.entity.DrawerBlockEntity; import juuxel.adorn.block.entity.SimpleContainerBlockEntity; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.lib.AdornStats; import juuxel.adorn.platform.PlatformBridges; import juuxel.adorn.util.Shapes; @@ -17,7 +16,7 @@ import net.minecraft.menu.Menu; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; -import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.BlockMirror; @@ -35,7 +34,7 @@ import java.util.Map; public final class DrawerBlock extends VisibleBlockWithEntity implements BlockWithDescription { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; private static final Map SHAPES = Shapes.mergeShapeMaps( Shapes.buildShapeRotationsFromNorth(0, 0, 3, 16, 16, 16), // Top drawer @@ -45,8 +44,8 @@ public final class DrawerBlock extends VisibleBlockWithEntity implements BlockWi ); private static final String DESCRIPTION_KEY = "block.adorn.drawer.description"; - public DrawerBlock(BlockVariant variant) { - super(variant.createSettings().nonOpaque()); + public DrawerBlock(Settings settings) { + super(settings.nonOpaque()); } @Override diff --git a/common/src/main/java/juuxel/adorn/block/KitchenCounterBlock.java b/common/src/main/java/juuxel/adorn/block/KitchenCounterBlock.java index 261cb0fe1..753e258eb 100644 --- a/common/src/main/java/juuxel/adorn/block/KitchenCounterBlock.java +++ b/common/src/main/java/juuxel/adorn/block/KitchenCounterBlock.java @@ -1,7 +1,6 @@ package juuxel.adorn.block; import juuxel.adorn.block.property.FrontConnection; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.ItemPlacementContext; @@ -9,14 +8,17 @@ import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.WorldAccess; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public class KitchenCounterBlock extends AbstractKitchenCounterBlock implements BlockWithDescription { public static final EnumProperty FRONT = EnumProperty.of("front", FrontConnection.class); private static final String DESCRIPTION_KEY = "block.adorn.kitchen_counter.description"; - public KitchenCounterBlock(BlockVariant variant) { - super(variant); + public KitchenCounterBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(FRONT, FrontConnection.NONE)); } @@ -28,14 +30,15 @@ protected void appendProperties(StateManager.Builder builder) @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return getStateForNeighborUpdate( - super.getPlacementState(ctx), - null, null, ctx.getWorld(), ctx.getBlockPos(), null - ); + return updateConnections(super.getPlacementState(ctx), ctx.getWorld(), ctx.getBlockPos()); } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return updateConnections(state, world, pos); + } + + private BlockState updateConnections(BlockState state, BlockView world, BlockPos pos) { var facing = state.get(FACING); var frontState = world.getBlockState(pos.offset(facing)); var frontConnection = FrontConnection.NONE; diff --git a/common/src/main/java/juuxel/adorn/block/KitchenCupboardBlock.java b/common/src/main/java/juuxel/adorn/block/KitchenCupboardBlock.java index baede2d07..23a16ba2a 100644 --- a/common/src/main/java/juuxel/adorn/block/KitchenCupboardBlock.java +++ b/common/src/main/java/juuxel/adorn/block/KitchenCupboardBlock.java @@ -5,6 +5,7 @@ import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.lib.AdornStats; import juuxel.adorn.platform.PlatformBridges; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -22,8 +23,8 @@ public final class KitchenCupboardBlock extends AbstractKitchenCounterBlock implements BlockEntityProvider, BlockWithDescription { private static final String DESCRIPTION_KEY = "block.adorn.kitchen_cupboard.description"; - public KitchenCupboardBlock(BlockVariant variant) { - super(variant); + public KitchenCupboardBlock(AbstractBlock.Settings settings) { + super(settings); } @Override diff --git a/common/src/main/java/juuxel/adorn/block/KitchenSinkBlock.java b/common/src/main/java/juuxel/adorn/block/KitchenSinkBlock.java index 8891eb427..2857db602 100644 --- a/common/src/main/java/juuxel/adorn/block/KitchenSinkBlock.java +++ b/common/src/main/java/juuxel/adorn/block/KitchenSinkBlock.java @@ -1,7 +1,6 @@ package juuxel.adorn.block; import juuxel.adorn.block.entity.KitchenSinkBlockEntity; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.util.Shapes; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; @@ -11,8 +10,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.function.BooleanBiFunction; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -40,8 +39,8 @@ public final class KitchenSinkBlock extends KitchenCounterBlock implements Block }); } - public KitchenSinkBlock(BlockVariant variant) { - super(variant); + public KitchenSinkBlock(Settings settings) { + super(settings); } @Override @@ -50,9 +49,9 @@ public String getDescriptionKey() { } @Override - protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { var entity = world.getBlockEntity(pos, AdornBlockEntities.KITCHEN_SINK.get()).orElse(null); - if (entity == null) return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + if (entity == null) return ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION; boolean successful; if (stack.isOf(Items.SPONGE)) { @@ -72,7 +71,7 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl successful = entity.interactWithItem(stack, player, hand); } - return successful ? ItemActionResult.success(world.isClient) : ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return successful ? ActionResult.SUCCESS : ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION; } @Override diff --git a/common/src/main/java/juuxel/adorn/block/PicketFenceBlock.java b/common/src/main/java/juuxel/adorn/block/PicketFenceBlock.java index 9f666eb7f..0d8657e0f 100644 --- a/common/src/main/java/juuxel/adorn/block/PicketFenceBlock.java +++ b/common/src/main/java/juuxel/adorn/block/PicketFenceBlock.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.BlockMirror; @@ -19,15 +18,17 @@ import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Map; public final class PicketFenceBlock extends Block implements Waterloggable, BlockWithDescription { public static final EnumProperty SHAPE = EnumProperty.of("shape", Shape.class); - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; private static final Map STRAIGHT_OUTLINE_SHAPES = Shapes.buildShapeRotationsFromNorth(0, 0, 7, 16, 16, 9); @@ -66,7 +67,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (direction.getAxis() == state.get(FACING).getAxis()) { return updateShape(world, pos, state); } @@ -74,7 +75,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio return state; } - private BlockState updateShape(WorldAccess world, BlockPos pos, BlockState state) { + private BlockState updateShape(BlockView world, BlockPos pos, BlockState state) { var fenceFacing = state.get(FACING); for (var side : new Direction[] { fenceFacing.getOpposite(), fenceFacing }) { var inner = side == fenceFacing; diff --git a/common/src/main/java/juuxel/adorn/block/PlatformBlock.java b/common/src/main/java/juuxel/adorn/block/PlatformBlock.java index e74831d25..f8599779e 100644 --- a/common/src/main/java/juuxel/adorn/block/PlatformBlock.java +++ b/common/src/main/java/juuxel/adorn/block/PlatformBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -14,10 +13,12 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public final class PlatformBlock extends Block implements BlockWithDescription, Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; @@ -27,8 +28,8 @@ public final class PlatformBlock extends Block implements BlockWithDescription, ); private static final String DESCRIPTION_KEY = "block.adorn.platform.description"; - public PlatformBlock(BlockVariant variant) { - super(variant.createSettings()); + public PlatformBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(WATERLOGGED, false)); } @@ -64,11 +65,11 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } } diff --git a/common/src/main/java/juuxel/adorn/block/PostBlock.java b/common/src/main/java/juuxel/adorn/block/PostBlock.java index c450f3d29..8d3f295c7 100644 --- a/common/src/main/java/juuxel/adorn/block/PostBlock.java +++ b/common/src/main/java/juuxel/adorn/block/PostBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -16,9 +15,11 @@ import net.minecraft.util.BlockRotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public final class PostBlock extends Block implements BlockWithDescription, Waterloggable { public static final EnumProperty AXIS = Properties.AXIS; @@ -30,8 +31,8 @@ public final class PostBlock extends Block implements BlockWithDescription, Wate private static final String DESCRIPTION_KEY = "block.adorn.post.description"; - public PostBlock(BlockVariant variant) { - super(variant.createSettings()); + public PostBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(AXIS, Direction.Axis.Y).with(WATERLOGGED, false)); } @@ -85,11 +86,11 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } } diff --git a/common/src/main/java/juuxel/adorn/block/PrismarineChimneyBlock.java b/common/src/main/java/juuxel/adorn/block/PrismarineChimneyBlock.java index 9b7e113cc..7e3398b3c 100644 --- a/common/src/main/java/juuxel/adorn/block/PrismarineChimneyBlock.java +++ b/common/src/main/java/juuxel/adorn/block/PrismarineChimneyBlock.java @@ -10,6 +10,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; import net.minecraft.world.World; +import net.minecraft.world.block.WireOrientation; +import org.jetbrains.annotations.Nullable; public class PrismarineChimneyBlock extends AbstractChimneyBlock implements BlockWithDescription { private static final String DESCRIPTION_KEY = "block.adorn.prismarine_chimney.description"; @@ -59,7 +61,7 @@ public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState } @Override - public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable WireOrientation wireOrientation, boolean notify) { world.scheduleBlockTick(pos, this, 20); } diff --git a/common/src/main/java/juuxel/adorn/block/SeatBlock.java b/common/src/main/java/juuxel/adorn/block/SeatBlock.java index 96ed9cb92..c94ee0336 100644 --- a/common/src/main/java/juuxel/adorn/block/SeatBlock.java +++ b/common/src/main/java/juuxel/adorn/block/SeatBlock.java @@ -3,10 +3,12 @@ import com.google.common.base.Predicates; import juuxel.adorn.criterion.AdornCriteria; import juuxel.adorn.entity.AdornEntities; +import juuxel.adorn.entity.SeatEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; @@ -49,7 +51,7 @@ protected ActionResult onUse(BlockState state, World world, BlockPos pos, Player if (!occupied) { if (!world.isClient) { - var entity = AdornEntities.SEAT.get().create(world); + var entity = new SeatEntity(AdornEntities.SEAT.get(), world); entity.setPos(actualPos); world.spawnEntity(entity); world.setBlockState(actualPos, actualState.with(OCCUPIED, true)); @@ -64,7 +66,7 @@ protected ActionResult onUse(BlockState state, World world, BlockPos pos, Player AdornCriteria.SIT_ON_BLOCK.get().trigger(serverPlayer, pos); } } - return ActionResult.success(world.isClient); + return ActionResult.SUCCESS; } return ActionResult.PASS; @@ -75,7 +77,7 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt super.onStateReplaced(state, world, pos, newState, moved); if (!state.isOf(newState.getBlock())) { - if (world.isClient || !isSittingEnabled()) return; + if (!(world instanceof ServerWorld serverWorld) || !isSittingEnabled()) return; var seats = world.getEntitiesByType( AdornEntities.SEAT.get(), new Box(getActualSeatPos(world, state, pos)), @@ -83,7 +85,7 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt ); for (var seat : seats) { seat.removeAllPassengers(); - seat.kill(); + seat.kill(serverWorld); } } } diff --git a/common/src/main/java/juuxel/adorn/block/ShelfBlock.java b/common/src/main/java/juuxel/adorn/block/ShelfBlock.java index cf2499aba..371b609a8 100644 --- a/common/src/main/java/juuxel/adorn/block/ShelfBlock.java +++ b/common/src/main/java/juuxel/adorn/block/ShelfBlock.java @@ -1,7 +1,6 @@ package juuxel.adorn.block; import com.mojang.serialization.MapCodec; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.lib.AdornStats; import juuxel.adorn.platform.PlatformBridges; import juuxel.adorn.util.Shapes; @@ -22,33 +21,34 @@ import net.minecraft.menu.Menu; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.ItemScatterer; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import org.jetbrains.annotations.Nullable; import java.util.Map; public final class ShelfBlock extends VisibleBlockWithEntity implements Waterloggable, BlockWithDescription { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; private static final String DESCRIPTION_KEY = "block.adorn.shelf.description"; private static final Map SHAPES = Shapes.buildShapeRotations(0, 5, 0, 7, 6, 16); - public ShelfBlock(BlockVariant variant) { - super(variant.createSettings()); + public ShelfBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(WATERLOGGED, false)); } @@ -94,18 +94,18 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { // Based on WallTorchBlock.getStateForNeighborUpdate @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } return state.get(FACING).getOpposite() == direction && !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : state; } @Override - protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { var be = world.getBlockEntity(pos); - if (!(be instanceof Inventory inventory)) return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + if (!(be instanceof Inventory inventory)) return ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION; int slot = getSlot(state, hit); var existing = inventory.getStack(slot); @@ -141,7 +141,7 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl } } - return ItemActionResult.success(world.isClient); + return ActionResult.SUCCESS; } /** diff --git a/common/src/main/java/juuxel/adorn/block/SofaBlock.java b/common/src/main/java/juuxel/adorn/block/SofaBlock.java index 097477eb5..c9fc14622 100644 --- a/common/src/main/java/juuxel/adorn/block/SofaBlock.java +++ b/common/src/main/java/juuxel/adorn/block/SofaBlock.java @@ -1,7 +1,6 @@ package juuxel.adorn.block; import juuxel.adorn.block.property.FrontConnection; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.lib.AdornStats; import juuxel.adorn.util.Shapes; import net.minecraft.block.BedBlock; @@ -20,7 +19,6 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.text.Text; @@ -29,22 +27,23 @@ import net.minecraft.util.BlockRotation; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; public class SofaBlock extends SeatBlock implements Waterloggable, SneakClickHandler, BlockWithDescription { - public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; + public static final EnumProperty FACING = Properties.HORIZONTAL_FACING; public static final BooleanProperty CONNECTED_LEFT = BooleanProperty.of("connected_left"); public static final BooleanProperty CONNECTED_RIGHT = BooleanProperty.of("connected_right"); public static final EnumProperty FRONT_CONNECTION = EnumProperty.of("front", FrontConnection.class); @@ -54,8 +53,8 @@ public class SofaBlock extends SeatBlock implements Waterloggable, SneakClickHan private static final VoxelShape[] COLLISION_SHAPES = buildShapes(true); private static final String DESCRIPTION_KEY = "block.adorn.sofa.description"; - public SofaBlock(BlockVariant variant) { - super(variant.createSettings()); + public SofaBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState() .with(FRONT_CONNECTION, FrontConnection.NONE) .with(CONNECTED_LEFT, false) @@ -74,13 +73,13 @@ public String getDescriptionKey() { } @Override - protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (stack.getItem() instanceof DyeItem dye) { world.setBlockState(pos, AdornBlocks.SOFAS.getEager(dye.getColor()).getStateWithProperties(state)); world.playSound(player, pos, SoundEvents.BLOCK_WOOL_PLACE, SoundCategory.BLOCKS, 1f, 0.8f); if (!player.getAbilities().creativeMode) stack.decrement(1); if (!world.isClient) player.incrementStat(AdornStats.DYE_SOFA); - return ItemActionResult.success(world.isClient); + return ActionResult.SUCCESS; } return super.onUseWithItem(stack, state, world, pos, player, hand, hit); @@ -92,7 +91,7 @@ public ActionResult onSneakClick(BlockState state, World world, BlockPos pos, Pl if (state.get(OCCUPIED)) { player.sendMessage(Text.translatable("block.adorn.sofa.occupied"), true); - return ActionResult.success(world.isClient); + return ActionResult.SUCCESS; } if (BedBlock.isBedWorking(world) && sleepingDirection != null) { @@ -104,7 +103,7 @@ public ActionResult onSneakClick(BlockState state, World world, BlockPos pos, Pl }); } - return ActionResult.success(world.isClient); + return ActionResult.SUCCESS; } else { return ActionResult.PASS; } @@ -132,15 +131,15 @@ public FluidState getFluidState(BlockState state) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } return updateConnections(state, world, pos); } - private BlockState updateConnections(BlockState state, WorldAccess world, BlockPos pos) { + private BlockState updateConnections(BlockState state, BlockView world, BlockPos pos) { var direction = state.get(FACING); var leftState = world.getBlockState(pos.offset(direction.rotateYClockwise())); var rightState = world.getBlockState(pos.offset(direction.rotateYCounterclockwise())); diff --git a/common/src/main/java/juuxel/adorn/block/StepBlock.java b/common/src/main/java/juuxel/adorn/block/StepBlock.java index 2ecbee254..a19a9f60c 100644 --- a/common/src/main/java/juuxel/adorn/block/StepBlock.java +++ b/common/src/main/java/juuxel/adorn/block/StepBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -14,10 +13,12 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public final class StepBlock extends Block implements BlockWithDescription, Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; @@ -27,8 +28,8 @@ public final class StepBlock extends Block implements BlockWithDescription, Wate ); private static final String DESCRIPTION_KEY = "block.adorn.step.description"; - public StepBlock(BlockVariant variant) { - super(variant.createSettings()); + public StepBlock(Settings settings) { + super(settings); setDefaultState(getDefaultState().with(WATERLOGGED, false)); } @@ -59,12 +60,12 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } @Override diff --git a/common/src/main/java/juuxel/adorn/block/TableBlock.java b/common/src/main/java/juuxel/adorn/block/TableBlock.java index 22fbf0cd2..7e33cd515 100644 --- a/common/src/main/java/juuxel/adorn/block/TableBlock.java +++ b/common/src/main/java/juuxel/adorn/block/TableBlock.java @@ -1,6 +1,5 @@ package juuxel.adorn.block; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.BlockState; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; @@ -38,12 +37,8 @@ public final class TableBlock extends AbstractTableBlock implements BlockWithDes } } - public TableBlock(BlockVariant variant) { - super(createSettings(variant)); - } - - private static Settings createSettings(BlockVariant variant) { - return variant.createSettings().solid(); + public TableBlock(Settings settings) { + super(settings.solid()); } @Override diff --git a/common/src/main/java/juuxel/adorn/block/TableLampBlock.java b/common/src/main/java/juuxel/adorn/block/TableLampBlock.java index c260622ad..f90835ee8 100644 --- a/common/src/main/java/juuxel/adorn/block/TableLampBlock.java +++ b/common/src/main/java/juuxel/adorn/block/TableLampBlock.java @@ -18,25 +18,27 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; import net.minecraft.util.DyeColor; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Map; public final class TableLampBlock extends Block implements Waterloggable, BlockWithDescription { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public static final BooleanProperty LIT = Properties.LIT; - public static final DirectionProperty FACING = Properties.FACING; + public static final EnumProperty FACING = Properties.FACING; private static final String DESCRIPTION_KEY = "block.adorn.table_lamp.description"; private static final Map SHAPES = Shapes.buildShapeRotationsFromNorth(3, 3, 2, 13, 13, 16); @@ -71,7 +73,7 @@ protected void appendProperties(StateManager.Builder builder) } @Override - protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (stack.getItem() instanceof DyeItem dye) { world.setBlockState(pos, AdornBlocks.TABLE_LAMPS.getEager(dye.getColor()).getStateWithProperties(state)); world.playSound(player, pos, SoundEvents.BLOCK_WOOL_PLACE, SoundCategory.BLOCKS, 1f, 0.8f); @@ -84,7 +86,7 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl world.playSound(player, pos, SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.BLOCKS, 0.3f, pitch); if (!world.isClient) player.incrementStat(AdornStats.INTERACT_WITH_TABLE_LAMP); } - return ItemActionResult.success(world.isClient); + return ActionResult.SUCCESS; } @Override @@ -120,12 +122,12 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { if (state.get(WATERLOGGED)) { - world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } - return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + return super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } public static Settings createBlockSettings(DyeColor color) { diff --git a/common/src/main/java/juuxel/adorn/block/TradingStationBlock.java b/common/src/main/java/juuxel/adorn/block/TradingStationBlock.java index 811e4cc01..267f71d91 100644 --- a/common/src/main/java/juuxel/adorn/block/TradingStationBlock.java +++ b/common/src/main/java/juuxel/adorn/block/TradingStationBlock.java @@ -21,13 +21,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.ItemScatterer; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -80,8 +81,8 @@ public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable Livi } @Override - protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (world.isClient) return ItemActionResult.SUCCESS; + protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (world.isClient) return ActionResult.SUCCESS_SERVER; if (world.getBlockEntity(pos) instanceof TradingStationBlockEntity be) { if (be.getOwner() == null) { @@ -118,13 +119,13 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl } } - return ItemActionResult.CONSUME; + return ActionResult.SUCCESS_SERVER; } @Override public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { if (!state.isOf(newState.getBlock()) && world.getBlockEntity(pos) instanceof TradingStationBlockEntity tradingStation) { - if (!world.getGameRules().getBoolean(AdornGameRules.DROP_LOCKED_TRADING_STATIONS)) { + if (world instanceof ServerWorld serverWorld && !serverWorld.getGameRules().getBoolean(AdornGameRules.DROP_LOCKED_TRADING_STATIONS)) { ItemScatterer.spawn(world, pos, tradingStation.getStorage()); } diff --git a/common/src/main/java/juuxel/adorn/block/entity/AdornBlockEntityType.java b/common/src/main/java/juuxel/adorn/block/entity/AdornBlockEntityType.java index e2dd1ae2e..c36a3cac9 100644 --- a/common/src/main/java/juuxel/adorn/block/entity/AdornBlockEntityType.java +++ b/common/src/main/java/juuxel/adorn/block/entity/AdornBlockEntityType.java @@ -12,7 +12,7 @@ public final class AdornBlockEntityType extends BlockEnti private final Predicate blockPredicate; public AdornBlockEntityType(BlockEntityFactory factory, Predicate blockPredicate) { - super(factory, Set.of(), null); + super(factory, Set.of()); this.blockPredicate = blockPredicate; } diff --git a/common/src/main/java/juuxel/adorn/block/entity/BrewerBlockEntity.java b/common/src/main/java/juuxel/adorn/block/entity/BrewerBlockEntity.java index 6e74ecaaf..f023cfcb2 100644 --- a/common/src/main/java/juuxel/adorn/block/entity/BrewerBlockEntity.java +++ b/common/src/main/java/juuxel/adorn/block/entity/BrewerBlockEntity.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.recipe.RecipeEntry; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ItemScatterer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -155,7 +156,7 @@ private static void decrementIngredient(BrewerBlockEntity brewer, int slot) { } } - public static void tick(World world, BlockPos pos, BlockState state, BrewerBlockEntity brewer) { + public static void tick(ServerWorld world, BlockPos pos, BlockState state, BrewerBlockEntity brewer) { var originallyActive = brewer.isActive(); brewer.tryExtractFluidContainer(); diff --git a/common/src/main/java/juuxel/adorn/block/entity/KitchenSinkBlockEntity.java b/common/src/main/java/juuxel/adorn/block/entity/KitchenSinkBlockEntity.java index 21117cabd..1dccfa8a2 100644 --- a/common/src/main/java/juuxel/adorn/block/entity/KitchenSinkBlockEntity.java +++ b/common/src/main/java/juuxel/adorn/block/entity/KitchenSinkBlockEntity.java @@ -20,6 +20,7 @@ import net.minecraft.potion.Potions; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.FluidTags; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; @@ -114,11 +115,11 @@ public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registrie */ public abstract int calculateComparatorOutput(); - private static boolean isInfinite(Fluid fluid, World world) { + private static boolean isInfinite(Fluid fluid, ServerWorld world) { return fluid instanceof FlowableFluid flowable && flowable.isInfinite(world); } - public static boolean supportsInfiniteExtraction(World world, Fluid fluid) { + public static boolean supportsInfiniteExtraction(ServerWorld world, Fluid fluid) { return isInfinite(fluid, world) && world.getGameRules().getBoolean(AdornGameRules.INFINITE_KITCHEN_SINKS); } diff --git a/common/src/main/java/juuxel/adorn/block/property/OptionalProperty.java b/common/src/main/java/juuxel/adorn/block/property/OptionalProperty.java index 318cb7488..c2898ea99 100644 --- a/common/src/main/java/juuxel/adorn/block/property/OptionalProperty.java +++ b/common/src/main/java/juuxel/adorn/block/property/OptionalProperty.java @@ -5,8 +5,8 @@ import net.minecraft.util.StringIdentifiable; import org.jetbrains.annotations.Nullable; -import java.util.Collection; -import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Optional; @@ -16,13 +16,14 @@ public final class OptionalProperty & StringIdentifiable> exte private final EnumProperty delegate; private final Value.None none = new Value.None<>(); private final Map<@Nullable T, Value> values; + private final List> boxedValues; @SuppressWarnings("unchecked") public OptionalProperty(EnumProperty delegate) { super(delegate.getName(), (Class>) (Class) Value.class); this.delegate = delegate; - values = new HashMap<>(); + values = new LinkedHashMap<>(); values.put(null, none); for (T value : delegate.getValues()) { if (NONE_NAME.equals(value.asString())) { @@ -31,6 +32,7 @@ public OptionalProperty(EnumProperty delegate) { values.put(value, new Value.Some<>(value)); } + boxedValues = List.copyOf(values.values()); } @Override @@ -39,8 +41,13 @@ public Optional> parse(String name) { } @Override - public Collection> getValues() { - return values.values(); + public List> getValues() { + return boxedValues; + } + + @Override + public int ordinal(Value value) { + return boxedValues.indexOf(value); } @Override @@ -98,6 +105,16 @@ public boolean isPresent() { public int compareTo(Value o) { return o instanceof None ? 0 : -1; } + + @Override + public int hashCode() { + return 0; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof None; + } } } } diff --git a/common/src/main/java/juuxel/adorn/block/variant/BlockVariant.java b/common/src/main/java/juuxel/adorn/block/variant/BlockVariant.java index 3d7199565..a8bc19bb2 100644 --- a/common/src/main/java/juuxel/adorn/block/variant/BlockVariant.java +++ b/common/src/main/java/juuxel/adorn/block/variant/BlockVariant.java @@ -3,6 +3,7 @@ import com.mojang.datafixers.util.Pair; import juuxel.adorn.AdornCommon; import juuxel.adorn.block.AdornBlocks; +import juuxel.adorn.lib.registry.RegistryHelper; import juuxel.adorn.util.AdornUtil; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; @@ -17,7 +18,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -public interface BlockVariant { +public interface BlockVariant extends RegistryHelper.BlockSettingsProvider { char MOD_ID_SEPARATOR = '/'; Map WOOLS = createBy(DyeColor.values(), color -> variant(color.asString(), Blocks.WHITE_WOOL)); @@ -88,7 +89,8 @@ default Identifier nameAsIdentifier() { /** * Creates a new {@code AbstractBlock.Settings}. */ - AbstractBlock.Settings createSettings(); + @Override + AbstractBlock.Settings createBlockSettings(); static BlockVariant variant(String name, Block base) { return new BlockVariant() { @@ -98,7 +100,7 @@ public String name() { } @Override - public AbstractBlock.Settings createSettings() { + public AbstractBlock.Settings createBlockSettings() { return AdornUtil.copySettingsSafely(base); } }; @@ -125,14 +127,14 @@ private static > Map createBy(K[] keys, Funct record Wood(String name) implements BlockVariant { @Override - public AbstractBlock.Settings createSettings() { + public AbstractBlock.Settings createBlockSettings() { return AdornUtil.copySettingsSafely(Blocks.OAK_PLANKS); } } record Stone(String name) implements BlockVariant { @Override - public AbstractBlock.Settings createSettings() { + public AbstractBlock.Settings createBlockSettings() { return AdornUtil.copySettingsSafely(Blocks.COBBLESTONE); } } @@ -149,7 +151,7 @@ public Identifier nameAsIdentifier() { } @Override - public AbstractBlock.Settings createSettings() { + public AbstractBlock.Settings createBlockSettings() { return AdornUtil.copySettingsSafely(AdornBlocks.PAINTED_PLANKS.getEager(color)); } } diff --git a/common/src/main/java/juuxel/adorn/block/variant/BlockVariantSets.java b/common/src/main/java/juuxel/adorn/block/variant/BlockVariantSets.java index 973840dc8..7aa6c039c 100644 --- a/common/src/main/java/juuxel/adorn/block/variant/BlockVariantSets.java +++ b/common/src/main/java/juuxel/adorn/block/variant/BlockVariantSets.java @@ -132,54 +132,50 @@ private static void register(BlockKind kind, BlockVariant variant) { } private static Registered registerPost(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_post", () -> new PostBlock(variant)); + return HELPER.registerBlock(variant.name() + "_post", PostBlock::new, variant); } private static Registered registerPlatform(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_platform", () -> new PlatformBlock(variant)); + return HELPER.registerBlock(variant.name() + "_platform", PlatformBlock::new, variant); } private static Registered registerStep(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_step", () -> new StepBlock(variant)); + return HELPER.registerBlock(variant.name() + "_step", StepBlock::new, variant); } private static Registered registerDrawer(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_drawer", () -> new DrawerBlock(variant)); + return HELPER.registerBlock(variant.name() + "_drawer", DrawerBlock::new, variant); } private static Registered registerChair(BlockVariant variant) { - Registered block = HELPER.registerBlockWithoutItem(variant.name() + "_chair", () -> new ChairBlock(variant)); - HELPER.registerItem(variant.name() + "_chair", () -> new ChairBlockItem(block.get())); - return block; + return HELPER.registerBlock(variant.name() + "_chair", ChairBlockItem::new, ChairBlock::new, variant); } private static Registered registerTable(BlockVariant variant) { - Registered block = HELPER.registerBlockWithoutItem(variant.name() + "_table", () -> new TableBlock(variant)); - HELPER.registerItem(variant.name() + "_table", () -> new TableBlockItem(block.get())); - return block; + return HELPER.registerBlock(variant.name() + "_table", TableBlockItem::new, TableBlock::new, variant); } private static Registered registerKitchenCounter(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_kitchen_counter", () -> new KitchenCounterBlock(variant)); + return HELPER.registerBlock(variant.name() + "_kitchen_counter", KitchenCounterBlock::new, variant); } private static Registered registerKitchenCupboard(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_kitchen_cupboard", () -> new KitchenCupboardBlock(variant)); + return HELPER.registerBlock(variant.name() + "_kitchen_cupboard", KitchenCupboardBlock::new, variant); } private static Registered registerKitchenSink(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_kitchen_sink", () -> new KitchenSinkBlock(variant)); + return HELPER.registerBlock(variant.name() + "_kitchen_sink", KitchenSinkBlock::new, variant); } private static Registered registerShelf(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_shelf", () -> new ShelfBlock(variant)); + return HELPER.registerBlock(variant.name() + "_shelf", ShelfBlock::new, variant); } private static Registered registerCoffeeTable(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_coffee_table", () -> new CoffeeTableBlock(variant)); + return HELPER.registerBlock(variant.name() + "_coffee_table", CoffeeTableBlock::new, variant); } private static Registered registerBench(BlockVariant variant) { - return HELPER.registerBlock(variant.name() + "_bench", () -> new BenchBlock(variant)); + return HELPER.registerBlock(variant.name() + "_bench", BenchBlock::new, variant); } } diff --git a/common/src/main/java/juuxel/adorn/client/book/BookManager.java b/common/src/main/java/juuxel/adorn/client/book/BookManager.java index 483afbb50..2350b06ad 100644 --- a/common/src/main/java/juuxel/adorn/client/book/BookManager.java +++ b/common/src/main/java/juuxel/adorn/client/book/BookManager.java @@ -1,48 +1,24 @@ package juuxel.adorn.client.book; -import com.google.common.base.Predicates; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.mojang.datafixers.util.Pair; -import com.mojang.serialization.JsonOps; -import juuxel.adorn.util.Logging; import net.minecraft.resource.JsonDataLoader; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; -import org.slf4j.Logger; import java.util.Map; -import java.util.stream.Collectors; -public class BookManager extends JsonDataLoader { - private static final Logger LOGGER = Logging.logger(); +public class BookManager extends JsonDataLoader { public static final String DATA_TYPE = "adorn/books"; - private static final Gson GSON = new Gson(); private Map books = Map.of(); public BookManager() { - super(GSON, DATA_TYPE); + super(Book.CODEC, DATA_TYPE); } @Override - protected void apply(Map prepared, ResourceManager manager, Profiler profiler) { - books = prepared.entrySet() - .stream() - .map(entry -> { - var id = entry.getKey(); - var book = Book.CODEC.decode(JsonOps.INSTANCE, entry.getValue()); - return book.mapOrElse( - pair -> Pair.of(id, pair.getFirst()), - error -> { - LOGGER.error("Could not load book {}: {}", id, error.message()); - return null; - } - ); - }) - .filter(Predicates.notNull()) - .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)); + protected void apply(Map prepared, ResourceManager manager, Profiler profiler) { + books = Map.copyOf(prepared); } public boolean contains(Identifier id) { diff --git a/common/src/main/java/juuxel/adorn/client/book/Page.java b/common/src/main/java/juuxel/adorn/client/book/Page.java index d2c35fe66..4faf4550f 100644 --- a/common/src/main/java/juuxel/adorn/client/book/Page.java +++ b/common/src/main/java/juuxel/adorn/client/book/Page.java @@ -83,14 +83,13 @@ public record Icon(EntryOrTag items) { public List createStacks() { return switch (items) { case EntryOrTag.OfEntry(var item) -> List.of(item.getDefaultStack()); - case EntryOrTag.OfTag(var tag) -> { - var entries = Registries.ITEM.getOrCreateEntryList(tag); + case EntryOrTag.OfTag(var tag) -> Registries.ITEM.getOptional(tag).map(entries -> { List result = new ArrayList<>(entries.size()); for (var entry : entries) { result.add(entry.value().getDefaultStack()); } - yield result; - } + return result; + }).orElse(List.of()); }; } } diff --git a/common/src/main/java/juuxel/adorn/client/gui/TradeTooltipComponent.java b/common/src/main/java/juuxel/adorn/client/gui/TradeTooltipComponent.java index 128934602..c0ce3867c 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/TradeTooltipComponent.java +++ b/common/src/main/java/juuxel/adorn/client/gui/TradeTooltipComponent.java @@ -5,6 +5,7 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.tooltip.TooltipComponent; +import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public record TradeTooltipComponent(Trade trade) implements TooltipComponent { @@ -16,16 +17,16 @@ public int getWidth(TextRenderer textRenderer) { } @Override - public int getHeight() { + public int getHeight(TextRenderer textRenderer) { return 18; } @Override - public void drawItems(TextRenderer textRenderer, int x, int y, DrawContext context) { + public void drawItems(TextRenderer textRenderer, int x, int y, int width, int height, DrawContext context) { context.drawItem(trade.getPrice(), x, y); - context.drawItemInSlot(textRenderer, trade.getPrice(), x, y); + context.drawStackOverlay(textRenderer, trade.getPrice(), x, y); context.drawItem(trade.getSelling(), x + 2 * 16, y); - context.drawItemInSlot(textRenderer, trade.getSelling(), x + 2 * 16, y); - context.drawTexture(ARROW_TEXTURE, x + 16, y, 0f, 0f, 16, 16, 16, 16); + context.drawStackOverlay(textRenderer, trade.getSelling(), x + 2 * 16, y); + context.drawTexture(RenderLayer::getGuiTextured, ARROW_TEXTURE, x + 16, y, 0f, 0f, 16, 16, 16, 16); } } diff --git a/common/src/main/java/juuxel/adorn/client/gui/screen/AbstractConfigScreen.java b/common/src/main/java/juuxel/adorn/client/gui/screen/AbstractConfigScreen.java index 9208af7f0..887be9658 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/screen/AbstractConfigScreen.java +++ b/common/src/main/java/juuxel/adorn/client/gui/screen/AbstractConfigScreen.java @@ -14,6 +14,7 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.CyclingButtonWidget; +import net.minecraft.client.render.RenderLayer; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -87,7 +88,7 @@ private void renderHearts(DrawContext context, float delta) { var angle = MathHelper.lerp(delta, heart.previousAngle, heart.angle); matrices.multiply(RotationAxis.POSITIVE_Z.rotation((float) angle)); matrices.translate(-0.5 * HEART_SIZE, -0.5 * HEART_SIZE, 0.0); - context.drawTexture(HEART_TEXTURE, 0, 0, HEART_SIZE, HEART_SIZE, 0f, 0f, 8, 8, 8, 8); + context.drawTexture(RenderLayer::getGuiTextured, HEART_TEXTURE, 0, 0, 0f, 0f, HEART_SIZE, HEART_SIZE, 8, 8, 8, 8); matrices.pop(); } diff --git a/common/src/main/java/juuxel/adorn/client/gui/screen/BrewerScreen.java b/common/src/main/java/juuxel/adorn/client/gui/screen/BrewerScreen.java index c07c95b2c..4ad38e382 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/screen/BrewerScreen.java +++ b/common/src/main/java/juuxel/adorn/client/gui/screen/BrewerScreen.java @@ -1,6 +1,5 @@ package juuxel.adorn.client.gui.screen; -import com.mojang.blaze3d.systems.RenderSystem; import juuxel.adorn.AdornCommon; import juuxel.adorn.block.entity.BrewerBlockEntity; import juuxel.adorn.client.FluidRenderingBridge; @@ -12,11 +11,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ingame.MenuProvider; -import net.minecraft.client.render.BufferRenderer; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormat; -import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.texture.Sprite; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.tooltip.TooltipType; @@ -38,14 +33,14 @@ public BrewerScreen(BrewerMenu menu, PlayerInventory playerInventory, Text title @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { - context.drawTexture(TEXTURE, x, y, 0, 0, backgroundWidth, backgroundHeight); + context.drawTexture(RenderLayer::getGuiTextured, TEXTURE, x, y, 0f, 0f, backgroundWidth, backgroundHeight, 256, 256); drawFluid(context, x + 145, y + 17, menu.getFluid()); - context.drawTexture(TEXTURE, x + 145, y + 21, 176, 25, 16, 51); + context.drawTexture(RenderLayer::getGuiTextured, TEXTURE, x + 145, y + 21, 176, 25, 16, 51, 256, 256); var progress = menu.getProgress(); if (progress > 0) { float progressFract = (float) progress / (float) BrewerBlockEntity.MAX_PROGRESS; - context.drawTexture(TEXTURE, x + 84, y + 24, 176, 0, 8, MathHelper.ceil(progressFract * 25)); + context.drawTexture(RenderLayer::getGuiTextured, TEXTURE, x + 84, y + 24, 176, 0, 8, MathHelper.ceil(progressFract * 25), 256, 256); } } @@ -78,22 +73,17 @@ public static void setFluidFromPacket(MinecraftClient client, int syncId, FluidV } private static void drawSprite(DrawContext context, int x, float y, float width, float height, float u0, float v0, float u1, float v1, Sprite sprite, int color) { - RenderSystem.enableBlend(); - RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); - RenderSystem.setShaderColor(1f, 1f, 1f, 1f); - RenderSystem.setShaderTexture(0, sprite.getAtlasId()); var positionMatrix = context.getMatrices().peek().getPositionMatrix(); var au0 = MathHelper.lerp(u0, sprite.getMinU(), sprite.getMaxU()); var au1 = MathHelper.lerp(u1, sprite.getMinU(), sprite.getMaxU()); var av0 = MathHelper.lerp(v0, sprite.getMinV(), sprite.getMaxV()); var av1 = MathHelper.lerp(v1, sprite.getMinV(), sprite.getMaxV()); - var buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR); + var renderLayer = RenderLayer.getGuiTextured(sprite.getAtlasId()); + var buffer = context.vertexConsumers.getBuffer(renderLayer); buffer.vertex(positionMatrix, x, y + height, 0f).texture(au0, av1).color(color); buffer.vertex(positionMatrix, x + width, y + height, 0f).texture(au1, av1).color(color); buffer.vertex(positionMatrix, x + width, y, 0f).texture(au1, av0).color(color); buffer.vertex(positionMatrix, x, y, 0f).texture(au0, av0).color(color); - BufferRenderer.drawWithGlobalProgram(buffer.end()); - RenderSystem.disableBlend(); } public static void drawFluid(DrawContext context, int x, int y, FluidReference fluid) { diff --git a/common/src/main/java/juuxel/adorn/client/gui/screen/GuideBookScreen.java b/common/src/main/java/juuxel/adorn/client/gui/screen/GuideBookScreen.java index 97a10eb75..335f3a152 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/screen/GuideBookScreen.java +++ b/common/src/main/java/juuxel/adorn/client/gui/screen/GuideBookScreen.java @@ -22,6 +22,7 @@ import net.minecraft.client.gui.screen.ingame.BookScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.PageTurnWidget; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenTexts; @@ -97,7 +98,7 @@ public void renderBackground(DrawContext context, int mouseX, int mouseY, float super.renderBackground(context, mouseX, mouseY, delta); int x = (width - BOOK_SIZE) / 2; int y = (height - BOOK_SIZE) / 2; - context.drawTexture(BookScreen.BOOK_TEXTURE, x, y, 0, 0, BOOK_SIZE, BOOK_SIZE); + context.drawTexture(RenderLayer::getGuiTextured, BookScreen.BOOK_TEXTURE, x, y, 0, 0, BOOK_SIZE, BOOK_SIZE, 256, 256); } @Override @@ -316,7 +317,7 @@ private void renderImage(DrawContext context, Image image, int mouseX, int mouse }; RenderSystem.enableBlend(); - context.drawTexture(image.location(), imageX, imageY, 0f, 0f, image.size().x(), image.size().y(), image.size().x(), image.size().y()); + context.drawTexture(RenderLayer::getGuiTextured, image.location(), imageX, imageY, 0f, 0f, image.size().x(), image.size().y(), image.size().x(), image.size().y()); RenderSystem.disableBlend(); for (var hoverArea : image.hoverAreas()) { @@ -364,7 +365,7 @@ private CloseButton(int x, int y, PressAction onPress) { @Override protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { var texture = isHovered() ? CLOSE_BOOK_ACTIVE_TEXTURE : CLOSE_BOOK_INACTIVE_TEXTURE; - context.drawTexture(texture, getX(), getY(), 0f, 0f, 8, 8, 8, 8); + context.drawTexture(RenderLayer::getGuiTextured, texture, getX(), getY(), 0f, 0f, 8, 8, 8, 8, 256, 256); } } } diff --git a/common/src/main/java/juuxel/adorn/client/gui/screen/PalettedMenuScreen.java b/common/src/main/java/juuxel/adorn/client/gui/screen/PalettedMenuScreen.java index d0ecc9dbb..2dda990e7 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/screen/PalettedMenuScreen.java +++ b/common/src/main/java/juuxel/adorn/client/gui/screen/PalettedMenuScreen.java @@ -7,6 +7,7 @@ import juuxel.adorn.util.Colors; import net.minecraft.block.Blocks; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.menu.Menu; import net.minecraft.registry.Registries; @@ -32,7 +33,7 @@ private ColorManager.ColorPair getPalette() { protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { var bg = getPalette().bg(); RenderSystem.setShaderColor(Colors.redOf(bg), Colors.greenOf(bg), Colors.blueOf(bg), 1.0f); - context.drawTexture(getBackgroundTexture(), x, y, 0, 0, backgroundWidth, backgroundHeight); + context.drawTexture(RenderLayer::getGuiTextured, getBackgroundTexture(), x, y, 0, 0, backgroundWidth, backgroundHeight, 256, 256); RenderSystem.setShaderColor(1f, 1f, 1f, 1f); } diff --git a/common/src/main/java/juuxel/adorn/client/gui/screen/TradingStationScreen.java b/common/src/main/java/juuxel/adorn/client/gui/screen/TradingStationScreen.java index 2a06ff3b7..a32824fa3 100644 --- a/common/src/main/java/juuxel/adorn/client/gui/screen/TradingStationScreen.java +++ b/common/src/main/java/juuxel/adorn/client/gui/screen/TradingStationScreen.java @@ -7,6 +7,7 @@ import juuxel.adorn.util.Colors; import juuxel.adorn.util.Logging; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.menu.Slot; @@ -28,7 +29,7 @@ public TradingStationScreen(TradingStationMenu menu, PlayerInventory playerInven @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { - context.drawTexture(BACKGROUND_TEXTURE, x, y, 0, 0, backgroundWidth, backgroundHeight); + context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND_TEXTURE, x, y, 0, 0, backgroundWidth, backgroundHeight, 256, 256); } @Override diff --git a/common/src/main/java/juuxel/adorn/client/renderer/InvisibleEntityRenderer.java b/common/src/main/java/juuxel/adorn/client/renderer/InvisibleEntityRenderer.java index d6250d1af..fe2ebedf4 100644 --- a/common/src/main/java/juuxel/adorn/client/renderer/InvisibleEntityRenderer.java +++ b/common/src/main/java/juuxel/adorn/client/renderer/InvisibleEntityRenderer.java @@ -2,18 +2,16 @@ import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.entity.state.EntityRenderState; import net.minecraft.entity.Entity; -import net.minecraft.util.Identifier; - -public final class InvisibleEntityRenderer extends EntityRenderer { - private static final Identifier TEXTURE = Identifier.ofVanilla("missingno"); +public final class InvisibleEntityRenderer extends EntityRenderer { public InvisibleEntityRenderer(EntityRendererFactory.Context ctx) { super(ctx); } @Override - public Identifier getTexture(Entity entity) { - return TEXTURE; + public EntityRenderState createRenderState() { + return new EntityRenderState(); } } diff --git a/common/src/main/java/juuxel/adorn/client/renderer/ShelfRenderer.java b/common/src/main/java/juuxel/adorn/client/renderer/ShelfRenderer.java index 12016c833..fc3ec134c 100644 --- a/common/src/main/java/juuxel/adorn/client/renderer/ShelfRenderer.java +++ b/common/src/main/java/juuxel/adorn/client/renderer/ShelfRenderer.java @@ -6,8 +6,8 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; -import net.minecraft.client.render.model.json.ModelTransformationMode; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ModelTransformationMode; import net.minecraft.util.math.Direction; import net.minecraft.util.math.RotationAxis; diff --git a/common/src/main/java/juuxel/adorn/client/renderer/TradingStationRenderer.java b/common/src/main/java/juuxel/adorn/client/renderer/TradingStationRenderer.java index 10c26a3ae..7ebf4087d 100644 --- a/common/src/main/java/juuxel/adorn/client/renderer/TradingStationRenderer.java +++ b/common/src/main/java/juuxel/adorn/client/renderer/TradingStationRenderer.java @@ -7,13 +7,12 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.render.LightmapTextureManager; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; -import net.minecraft.client.render.model.json.ModelTransformationMode; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ModelTransformationMode; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.hit.BlockHitResult; diff --git a/common/src/main/java/juuxel/adorn/commonmixin/BlocksMixin.java b/common/src/main/java/juuxel/adorn/commonmixin/BlocksMixin.java deleted file mode 100644 index 955553534..000000000 --- a/common/src/main/java/juuxel/adorn/commonmixin/BlocksMixin.java +++ /dev/null @@ -1,20 +0,0 @@ -package juuxel.adorn.commonmixin; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import juuxel.adorn.block.AdornBlockSetTypes; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockSetType; -import net.minecraft.block.Blocks; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(Blocks.class) -abstract class BlocksMixin { - @WrapOperation(method = "createWoodenButtonBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/AbstractBlock$Settings;create()Lnet/minecraft/block/AbstractBlock$Settings;")) - private static AbstractBlock.Settings addMapColorToButton(Operation operation, BlockSetType blockSetType) { - var settings = operation.call(); - var color = AdornBlockSetTypes.PAINTED_WOODS.inverse().get(blockSetType); - return color != null ? settings.mapColor(color) : settings; - } -} diff --git a/common/src/main/java/juuxel/adorn/compat/emi/AdornEmiPlugin.java b/common/src/main/java/juuxel/adorn/compat/emi/AdornEmiPlugin.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/emi/AdornEmiPlugin.java rename to common/src/main/java/juuxel/adorn/compat/emi/AdornEmiPlugin.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/emi/BrewingEmiRecipe.java b/common/src/main/java/juuxel/adorn/compat/emi/BrewingEmiRecipe.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/emi/BrewingEmiRecipe.java rename to common/src/main/java/juuxel/adorn/compat/emi/BrewingEmiRecipe.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/emi/EmiUtil.java b/common/src/main/java/juuxel/adorn/compat/emi/EmiUtil.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/emi/EmiUtil.java rename to common/src/main/java/juuxel/adorn/compat/emi/EmiUtil.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/emi/TradingStationDragDropHandler.java b/common/src/main/java/juuxel/adorn/compat/emi/TradingStationDragDropHandler.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/emi/TradingStationDragDropHandler.java rename to common/src/main/java/juuxel/adorn/compat/emi/TradingStationDragDropHandler.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/jei/AdornJeiPlugin.java b/common/src/main/java/juuxel/adorn/compat/jei/AdornJeiPlugin.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/jei/AdornJeiPlugin.java rename to common/src/main/java/juuxel/adorn/compat/jei/AdornJeiPlugin.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/jei/BrewerCategory.java b/common/src/main/java/juuxel/adorn/compat/jei/BrewerCategory.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/jei/BrewerCategory.java rename to common/src/main/java/juuxel/adorn/compat/jei/BrewerCategory.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/jei/JeiRecipeTypes.java b/common/src/main/java/juuxel/adorn/compat/jei/JeiRecipeTypes.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/jei/JeiRecipeTypes.java rename to common/src/main/java/juuxel/adorn/compat/jei/JeiRecipeTypes.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/jei/TradingStationGhostIngredientHandler.java b/common/src/main/java/juuxel/adorn/compat/jei/TradingStationGhostIngredientHandler.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/jei/TradingStationGhostIngredientHandler.java rename to common/src/main/java/juuxel/adorn/compat/jei/TradingStationGhostIngredientHandler.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/rei/AdornReiServer.java b/common/src/main/java/juuxel/adorn/compat/rei/AdornReiServer.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/rei/AdornReiServer.java rename to common/src/main/java/juuxel/adorn/compat/rei/AdornReiServer.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/rei/BrewerDisplay.java b/common/src/main/java/juuxel/adorn/compat/rei/BrewerDisplay.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/rei/BrewerDisplay.java rename to common/src/main/java/juuxel/adorn/compat/rei/BrewerDisplay.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/rei/client/AdornReiClient.java b/common/src/main/java/juuxel/adorn/compat/rei/client/AdornReiClient.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/rei/client/AdornReiClient.java rename to common/src/main/java/juuxel/adorn/compat/rei/client/AdornReiClient.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/rei/client/BrewerCategory.java b/common/src/main/java/juuxel/adorn/compat/rei/client/BrewerCategory.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/rei/client/BrewerCategory.java rename to common/src/main/java/juuxel/adorn/compat/rei/client/BrewerCategory.java_ diff --git a/common/src/main/java/juuxel/adorn/compat/rei/client/TradingStationDraggableStackVisitor.java b/common/src/main/java/juuxel/adorn/compat/rei/client/TradingStationDraggableStackVisitor.java_ similarity index 100% rename from common/src/main/java/juuxel/adorn/compat/rei/client/TradingStationDraggableStackVisitor.java rename to common/src/main/java/juuxel/adorn/compat/rei/client/TradingStationDraggableStackVisitor.java_ diff --git a/common/src/main/java/juuxel/adorn/entity/AdornEntities.java b/common/src/main/java/juuxel/adorn/entity/AdornEntities.java index 32a8e43d2..d6d73a115 100644 --- a/common/src/main/java/juuxel/adorn/entity/AdornEntities.java +++ b/common/src/main/java/juuxel/adorn/entity/AdornEntities.java @@ -3,15 +3,17 @@ import juuxel.adorn.lib.registry.Registered; import juuxel.adorn.lib.registry.Registrar; import juuxel.adorn.lib.registry.RegistrarFactory; -import juuxel.adorn.platform.PlatformBridges; import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.registry.RegistryKeys; public final class AdornEntities { public static final Registrar> ENTITIES = RegistrarFactory.get().create(RegistryKeys.ENTITY_TYPE); - public static final Registered> SEAT = - ENTITIES.register("seat", PlatformBridges.get().getEntities()::createSeatType); + public static final Registered> SEAT = ENTITIES.register("seat", + key -> EntityType.Builder.create(SeatEntity::new, SpawnGroup.MISC) + .dimensions(0f, 0f) + .build(key)); public static void init() { } diff --git a/common/src/main/java/juuxel/adorn/entity/SeatEntity.java b/common/src/main/java/juuxel/adorn/entity/SeatEntity.java index 97989860d..053c839ae 100644 --- a/common/src/main/java/juuxel/adorn/entity/SeatEntity.java +++ b/common/src/main/java/juuxel/adorn/entity/SeatEntity.java @@ -6,18 +6,21 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +// TODO: Rewrite using BlockAttachedEntity public final class SeatEntity extends Entity { private static final TrackedData SEAT_POS = DataTracker.registerData(SeatEntity.class, TrackedDataHandlerRegistry.BLOCK_POS); private static final String NBT_SEAT_POS = "SeatPos"; @@ -46,22 +49,29 @@ public void setPos(BlockPos pos) { @Override public ActionResult interact(PlayerEntity player, Hand hand) { player.startRiding(this); - return ActionResult.success(getWorld().isClient); + return ActionResult.SUCCESS; } @Override protected void removePassenger(Entity passenger) { super.removePassenger(passenger); - kill(); + if (getWorld() instanceof ServerWorld world) { + kill(world); + } + } + + @Override + public boolean damage(ServerWorld world, DamageSource source, float amount) { + return false; } @Override - public void kill() { + public void kill(ServerWorld world) { removeAllPassengers(); if (!getWorld().isClient) { PlatformBridges.get().getNetwork().sendToTracking(this, new EntityPassengersSetS2CPacket(this)); } - super.kill(); + super.kill(world); var state = getWorld().getBlockState(seatPos); if (state.getBlock() instanceof SeatBlock) { getWorld().setBlockState(seatPos, state.with(SeatBlock.OCCUPIED, false)); diff --git a/common/src/main/java/juuxel/adorn/fluid/FluidKeyImpl.java b/common/src/main/java/juuxel/adorn/fluid/FluidKeyImpl.java index 53551b5d5..d3f37a4c9 100644 --- a/common/src/main/java/juuxel/adorn/fluid/FluidKeyImpl.java +++ b/common/src/main/java/juuxel/adorn/fluid/FluidKeyImpl.java @@ -7,6 +7,7 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.entry.RegistryEntryList; import java.util.List; import java.util.Set; @@ -31,8 +32,9 @@ record Simple(EntryOrTag fluids) implements FluidKey { public Set getFluids() { return switch (fluids) { case EntryOrTag.OfEntry(var fluid) -> Set.of(fluid); - case EntryOrTag.OfTag(var tag) -> Registries.FLUID.getOrCreateEntryList(tag) + case EntryOrTag.OfTag(var tag) -> Registries.FLUID.getOptional(tag) .stream() + .flatMap(RegistryEntryList::stream) .map(RegistryEntry::value) .collect(Collectors.toSet()); }; diff --git a/common/src/main/java/juuxel/adorn/item/AdornBookItem.java b/common/src/main/java/juuxel/adorn/item/AdornBookItem.java index 694c82ef0..b958f8a6c 100644 --- a/common/src/main/java/juuxel/adorn/item/AdornBookItem.java +++ b/common/src/main/java/juuxel/adorn/item/AdornBookItem.java @@ -8,10 +8,10 @@ import net.minecraft.item.tooltip.TooltipType; import net.minecraft.stat.Stats; import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import java.util.List; @@ -25,13 +25,13 @@ public AdornBookItem(Identifier bookId, Settings settings) { } @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + public ActionResult use(World world, PlayerEntity user, Hand hand) { if (!world.isClient) { PlatformBridges.get().getNetwork().sendToClient(user, new OpenBookS2CMessage(bookId)); } user.incrementStat(Stats.USED.getOrCreateStat(this)); - return TypedActionResult.success(user.getStackInHand(hand), world.isClient); + return ActionResult.SUCCESS; } @Override diff --git a/common/src/main/java/juuxel/adorn/item/AdornItems.java b/common/src/main/java/juuxel/adorn/item/AdornItems.java index 2e62019fa..7b74246d2 100644 --- a/common/src/main/java/juuxel/adorn/item/AdornItems.java +++ b/common/src/main/java/juuxel/adorn/item/AdornItems.java @@ -3,56 +3,81 @@ import juuxel.adorn.AdornCommon; import juuxel.adorn.block.AdornBlocks; import juuxel.adorn.component.AdornComponentTypes; -import net.minecraft.component.type.FoodComponent; import juuxel.adorn.lib.registry.Registered; import juuxel.adorn.lib.registry.Registrar; import juuxel.adorn.lib.registry.RegistrarFactory; -import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.ConsumableComponents; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.component.type.SuspiciousStewEffectsComponent; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.Item; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Rarity; import net.minecraft.util.math.Direction; +import java.util.List; +import java.util.function.Function; +import java.util.function.Supplier; + public final class AdornItems { public static final Registrar ITEMS = RegistrarFactory.get().create(RegistryKeys.ITEM); private static final FoodComponent DRINK_FOOD_COMPONENT = drinkFoodComponentBuilder().build(); - public static final Registered STONE_ROD = ITEMS.register("stone_rod", () -> new ItemWithDescription(new Item.Settings())); - public static final Registered MUG = ITEMS.register("mug", () -> new ItemWithDescription(new Item.Settings().maxCount(16))); - public static final Registered HOT_CHOCOLATE = ITEMS.register("hot_chocolate", - () -> new DrinkInMugItem(new Item.Settings().food(DRINK_FOOD_COMPONENT).maxCount(1))); - public static final Registered SWEET_BERRY_JUICE = ITEMS.register("sweet_berry_juice", - () -> new DrinkInMugItem(new Item.Settings().food(DRINK_FOOD_COMPONENT).maxCount(1))); - public static final Registered GLOW_BERRY_TEA = ITEMS.register("glow_berry_tea", - () -> new DrinkInMugItem( - new Item.Settings() - .food(drinkFoodComponentBuilder().statusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 400), 1.0f).build()) - .maxCount(1) - )); - public static final Registered NETHER_WART_COFFEE = ITEMS.register("nether_wart_coffee", - () -> new DrinkInMugItem(new Item.Settings().food(DRINK_FOOD_COMPONENT).maxCount(1))); + public static final Registered STONE_ROD = register("stone_rod", ItemWithDescription::new); + public static final Registered MUG = register("mug", ItemWithDescription::new, () -> new Item.Settings().maxCount(16)); + public static final Registered HOT_CHOCOLATE = register("hot_chocolate", + DrinkInMugItem::new, + () -> new Item.Settings().food(DRINK_FOOD_COMPONENT, ConsumableComponents.DRINK).maxCount(1) + ); + public static final Registered SWEET_BERRY_JUICE = register("sweet_berry_juice", + DrinkInMugItem::new, + () -> new Item.Settings().food(DRINK_FOOD_COMPONENT, ConsumableComponents.DRINK).maxCount(1) + ); + public static final Registered GLOW_BERRY_TEA = register("glow_berry_tea", + DrinkInMugItem::new, + () -> new Item.Settings() + .food(DRINK_FOOD_COMPONENT, ConsumableComponents.DRINK) + .component(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS, new SuspiciousStewEffectsComponent(List.of( + new SuspiciousStewEffectsComponent.StewEffect(StatusEffects.GLOWING, 400) + ))) + .maxCount(1) + ); + public static final Registered NETHER_WART_COFFEE = register("nether_wart_coffee", + DrinkInMugItem::new, + () -> new Item.Settings().food(DRINK_FOOD_COMPONENT, ConsumableComponents.DRINK).maxCount(1) + ); public static final Registered STONE_TORCH = ITEMS.register("stone_torch", - () -> new VerticallyAttachableBlockItemWithDescription( + key -> new VerticallyAttachableBlockItemWithDescription( AdornBlocks.STONE_TORCH_GROUND.get(), AdornBlocks.STONE_TORCH_WALL.get(), - new Item.Settings(), - Direction.DOWN + Direction.DOWN, + new Item.Settings().registryKey(key) )); - public static final Registered GUIDE_BOOK = ITEMS.register("guide_book", - () -> new AdornBookItem(AdornCommon.id("guide"), new Item.Settings().rarity(Rarity.UNCOMMON))); - public static final Registered TRADERS_MANUAL = ITEMS.register("traders_manual", - () -> new AdornBookItem(AdornCommon.id("traders_manual"), new Item.Settings())); - - public static final Registered COPPER_NUGGET = ITEMS.register("copper_nugget", () -> new ItemWithDescription(new Item.Settings())); - public static final Registered WATERING_CAN = ITEMS.register("watering_can", - () -> new WateringCanItem( - new Item.Settings() - .component(AdornComponentTypes.FERTILIZER_LEVEL.get(), 0) - .component(AdornComponentTypes.WATER_LEVEL.get(), 0) - )); + public static final Registered GUIDE_BOOK = register("guide_book", + settings -> new AdornBookItem(AdornCommon.id("guide"), settings), + () -> new Item.Settings().rarity(Rarity.UNCOMMON) + ); + public static final Registered TRADERS_MANUAL = register("traders_manual", + settings -> new AdornBookItem(AdornCommon.id("traders_manual"), settings)); + + public static final Registered COPPER_NUGGET = register("copper_nugget", ItemWithDescription::new); + public static final Registered WATERING_CAN = register("watering_can", + WateringCanItem::new, + () -> new Item.Settings() + .component(AdornComponentTypes.FERTILIZER_LEVEL.get(), 0) + .component(AdornComponentTypes.WATER_LEVEL.get(), 0) + ); + + private static Registered register(String name, Function factory) { + return register(name, factory, Item.Settings::new); + } + + private static Registered register(String name, Function factory, Supplier settings) { + return ITEMS.register(name, key -> factory.apply(settings.get().registryKey(key))); + } private static FoodComponent.Builder drinkFoodComponentBuilder() { return new FoodComponent.Builder().nutrition(4).saturationModifier(0.3F).alwaysEdible(); diff --git a/common/src/main/java/juuxel/adorn/item/ChairBlockItem.java b/common/src/main/java/juuxel/adorn/item/ChairBlockItem.java index 161ee032b..d536b373e 100644 --- a/common/src/main/java/juuxel/adorn/item/ChairBlockItem.java +++ b/common/src/main/java/juuxel/adorn/item/ChairBlockItem.java @@ -7,8 +7,8 @@ import net.minecraft.util.math.Direction; public final class ChairBlockItem extends AdornTallBlockItem { - public ChairBlockItem(Block block) { - super(block, new Settings()); + public ChairBlockItem(Block block, Settings settings) { + super(block, settings); } @Override diff --git a/common/src/main/java/juuxel/adorn/item/DrinkInMugItem.java b/common/src/main/java/juuxel/adorn/item/DrinkInMugItem.java index 31e85cc16..7362bd25f 100644 --- a/common/src/main/java/juuxel/adorn/item/DrinkInMugItem.java +++ b/common/src/main/java/juuxel/adorn/item/DrinkInMugItem.java @@ -3,8 +3,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.UseAction; +import net.minecraft.item.consume.UseAction; import net.minecraft.world.World; public class DrinkInMugItem extends ItemWithDescription { @@ -22,9 +21,4 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { public UseAction getUseAction(ItemStack stack) { return UseAction.DRINK; } - - @Override - public SoundEvent getEatSound() { - return getDrinkSound(); - } } diff --git a/common/src/main/java/juuxel/adorn/item/TableBlockItem.java b/common/src/main/java/juuxel/adorn/item/TableBlockItem.java index 21502c294..edbcfc883 100644 --- a/common/src/main/java/juuxel/adorn/item/TableBlockItem.java +++ b/common/src/main/java/juuxel/adorn/item/TableBlockItem.java @@ -7,8 +7,8 @@ import net.minecraft.util.math.Direction; public final class TableBlockItem extends BaseBlockItem { - public TableBlockItem(Block block) { - super(block, new Settings()); + public TableBlockItem(Block block, Settings settings) { + super(block, settings); } @Override diff --git a/common/src/main/java/juuxel/adorn/item/VerticallyAttachableBlockItemWithDescription.java b/common/src/main/java/juuxel/adorn/item/VerticallyAttachableBlockItemWithDescription.java index 9b2c19f02..b12af44f5 100644 --- a/common/src/main/java/juuxel/adorn/item/VerticallyAttachableBlockItemWithDescription.java +++ b/common/src/main/java/juuxel/adorn/item/VerticallyAttachableBlockItemWithDescription.java @@ -10,8 +10,8 @@ import java.util.List; public final class VerticallyAttachableBlockItemWithDescription extends VerticallyAttachableBlockItem { - public VerticallyAttachableBlockItemWithDescription(Block standingBlock, Block wallBlock, Settings settings, Direction verticalAttachmentDirection) { - super(standingBlock, wallBlock, settings, verticalAttachmentDirection); + public VerticallyAttachableBlockItemWithDescription(Block standingBlock, Block wallBlock, Direction verticalAttachmentDirection, Settings settings) { + super(standingBlock, wallBlock, verticalAttachmentDirection, settings); } @Override diff --git a/common/src/main/java/juuxel/adorn/item/WateringCanItem.java b/common/src/main/java/juuxel/adorn/item/WateringCanItem.java index 812508162..17e1f6a0d 100644 --- a/common/src/main/java/juuxel/adorn/item/WateringCanItem.java +++ b/common/src/main/java/juuxel/adorn/item/WateringCanItem.java @@ -21,9 +21,9 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -31,7 +31,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldEvents; import net.minecraft.world.event.GameEvent; -import org.jetbrains.annotations.Nullable; import java.util.List; @@ -49,13 +48,13 @@ public WateringCanItem(Settings settings) { } @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + public ActionResult use(World world, PlayerEntity user, Hand hand) { var stack = user.getStackInHand(hand); var success = false; var hitResult = raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY); if (hitResult.getType() != HitResult.Type.BLOCK) { - return TypedActionResult.pass(stack); + return ActionResult.PASS; } int waterLevel = stack.getOrDefault(AdornComponentTypes.WATER_LEVEL.get(), 0); @@ -97,7 +96,8 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han stack.set(AdornComponentTypes.WATER_LEVEL.get(), waterLevel); world.emitGameEvent(user, GameEvent.ITEM_INTERACT_FINISH, pos); world.playSound(user, pos, AdornSounds.ITEM_WATERING_CAN_WATER.get(), SoundCategory.PLAYERS); - user.getItemCooldownManager().set(this, 10); + + user.getItemCooldownManager().set(stack, 10); var mut = new BlockPos.Mutable(); for (int xo = -1; xo <= 1; xo++) { @@ -112,7 +112,7 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han } } - return success ? TypedActionResult.success(stack, world.isClient()) : TypedActionResult.pass(stack); + return success ? ActionResult.SUCCESS : ActionResult.PASS; } private void water(World world, BlockPos pos, PlayerEntity player, ItemStack stack) { diff --git a/common/src/main/java/juuxel/adorn/lib/registry/Registrar.java b/common/src/main/java/juuxel/adorn/lib/registry/Registrar.java index 7d05c9903..7ba894d93 100644 --- a/common/src/main/java/juuxel/adorn/lib/registry/Registrar.java +++ b/common/src/main/java/juuxel/adorn/lib/registry/Registrar.java @@ -1,5 +1,7 @@ package juuxel.adorn.lib.registry; +import net.minecraft.registry.RegistryKey; + import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -12,6 +14,11 @@ public interface Registrar extends Iterable { */ Registered.WithKey register(String id, Supplier provider); + /** + * Registers an object with the id. The object is created using the provider. + */ + Registered.WithKey register(String id, Function, ? extends U> provider); + @SuppressWarnings("unchecked") default RegisteredMap registerBy(Collection keys, Function> factory) { List keyList; diff --git a/common/src/main/java/juuxel/adorn/lib/registry/RegistryHelper.java b/common/src/main/java/juuxel/adorn/lib/registry/RegistryHelper.java index e3ad2a023..8f6a5b7fb 100644 --- a/common/src/main/java/juuxel/adorn/lib/registry/RegistryHelper.java +++ b/common/src/main/java/juuxel/adorn/lib/registry/RegistryHelper.java @@ -1,9 +1,11 @@ package juuxel.adorn.lib.registry; import juuxel.adorn.item.BaseBlockItem; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.item.Item; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; @@ -23,34 +25,57 @@ public RegistryHelper(Registrar blocks, Registrar items) { /** * Registers a block with the name and an item with default settings. */ - public Registered registerBlock(String name, Supplier block) { - return registerBlock(name, Item.Settings::new, block); + public Registered registerBlock(String name, Function block, BlockSettingsProvider settings) { + return registerBlock(name, ItemSettingsProvider.DEFAULT, block, settings); } /** * Registers a block with the name and the item settings. */ - public Registered registerBlock(String name, Supplier itemSettings, Supplier block) { - return registerBlock(name, b -> makeItemForBlock(b, itemSettings.get()), block); + public Registered registerBlock( + String name, + ItemSettingsProvider itemSettings, + Function block, + BlockSettingsProvider settings + ) { + return registerBlock(name, RegistryHelper::makeItemForBlock, itemSettings, block, settings); + } + + /** + * Registers a block with the name and an item created by the item provider with default settings. + */ + public Registered registerBlock( + String name, + BiFunction itemProvider, + Function block, + BlockSettingsProvider settings + ) { + return registerBlock(name, itemProvider, ItemSettingsProvider.DEFAULT, block, settings); } /** * Registers a block with the name and an item created by the item provider. */ - public Registered registerBlock(String name, Function itemProvider, Supplier block) { - var registered = registerBlockWithoutItem(name, block); - registerItem(name, () -> itemProvider.apply(registered.get())); + public Registered registerBlock( + String name, + BiFunction itemProvider, + ItemSettingsProvider itemSettings, + Function block, + BlockSettingsProvider settings + ) { + var registered = registerBlockWithoutItem(name, block, settings); + items.register(name, key -> itemProvider.apply(registered.get(), itemSettings.createItemSettings().registryKey(key))); return registered; } /** * Registers a block with the name and without an item. */ - public Registered registerBlockWithoutItem(String name, Supplier block) { - return blocks.register(name, block); + public Registered registerBlockWithoutItem(String name, Function block, BlockSettingsProvider settings) { + return blocks.register(name, key -> block.apply(settings.createBlockSettings().registryKey(key))); } - private Item makeItemForBlock(Block block, Item.Settings itemSettings) { + private static Item makeItemForBlock(Block block, Item.Settings itemSettings) { return new BaseBlockItem(block, itemSettings); } @@ -58,7 +83,23 @@ private Item makeItemForBlock(Block block, Item.Settings itemSettings) { // Functions for registering other content // ----------------------------------------- - public Registered registerItem(String name, Supplier content) { - return items.register(name, content); + public Registered registerItem(String name, Function factory) { + return registerItem(name, factory, ItemSettingsProvider.DEFAULT); + } + + public Registered registerItem(String name, Function factory, ItemSettingsProvider settings) { + return items.register(name, key -> factory.apply(settings.createItemSettings().registryKey(key))); + } + + @FunctionalInterface + public interface BlockSettingsProvider { + AbstractBlock.Settings createBlockSettings(); + } + + @FunctionalInterface + public interface ItemSettingsProvider { + ItemSettingsProvider DEFAULT = Item.Settings::new; + + Item.Settings createItemSettings(); } } diff --git a/common/src/main/java/juuxel/adorn/platform/BlockFactory.java b/common/src/main/java/juuxel/adorn/platform/BlockFactory.java index 5a4dbe2d9..548c72f0f 100644 --- a/common/src/main/java/juuxel/adorn/platform/BlockFactory.java +++ b/common/src/main/java/juuxel/adorn/platform/BlockFactory.java @@ -1,7 +1,6 @@ package juuxel.adorn.platform; import juuxel.adorn.block.SofaBlock; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -14,8 +13,8 @@ public interface BlockFactory { BlockFactory DEFAULT = new BlockFactory() {}; - default SofaBlock createSofa(BlockVariant variant) { - return new SofaBlock(variant); + default SofaBlock createSofa(AbstractBlock.Settings settings) { + return new SofaBlock(settings); } default Block createPaintedPlanks(AbstractBlock.Settings settings) { diff --git a/common/src/main/java/juuxel/adorn/platform/EntityBridge.java b/common/src/main/java/juuxel/adorn/platform/EntityBridge.java deleted file mode 100644 index c591ed402..000000000 --- a/common/src/main/java/juuxel/adorn/platform/EntityBridge.java +++ /dev/null @@ -1,8 +0,0 @@ -package juuxel.adorn.platform; - -import juuxel.adorn.entity.SeatEntity; -import net.minecraft.entity.EntityType; - -public interface EntityBridge { - EntityType createSeatType(); -} diff --git a/common/src/main/java/juuxel/adorn/platform/PlatformBridges.java b/common/src/main/java/juuxel/adorn/platform/PlatformBridges.java index bf1afba1e..9ee297346 100644 --- a/common/src/main/java/juuxel/adorn/platform/PlatformBridges.java +++ b/common/src/main/java/juuxel/adorn/platform/PlatformBridges.java @@ -7,7 +7,6 @@ public interface PlatformBridges { BlockEntityBridge getBlockEntities(); BlockFactory getBlockFactory(); - EntityBridge getEntities(); MenuBridge getMenus(); NetworkBridge getNetwork(); ResourceBridge getResources(); diff --git a/common/src/main/java/juuxel/adorn/recipe/AdornRecipeBookCategories.java b/common/src/main/java/juuxel/adorn/recipe/AdornRecipeBookCategories.java new file mode 100644 index 000000000..9a6f04dcd --- /dev/null +++ b/common/src/main/java/juuxel/adorn/recipe/AdornRecipeBookCategories.java @@ -0,0 +1,16 @@ +package juuxel.adorn.recipe; + +import juuxel.adorn.lib.registry.Registered; +import juuxel.adorn.lib.registry.Registrar; +import juuxel.adorn.lib.registry.RegistrarFactory; +import net.minecraft.recipe.book.RecipeBookCategory; +import net.minecraft.registry.RegistryKeys; + +public final class AdornRecipeBookCategories { + public static final Registrar RECIPE_BOOK_CATEGORIES = RegistrarFactory.get().create(RegistryKeys.RECIPE_BOOK_CATEGORY); + + public static final Registered BREWING = RECIPE_BOOK_CATEGORIES.register("brewing", RecipeBookCategory::new); + + public static void init() { + } +} diff --git a/common/src/main/java/juuxel/adorn/recipe/AdornRecipeSerializers.java b/common/src/main/java/juuxel/adorn/recipe/AdornRecipeSerializers.java index bcf010d37..b70fed7e1 100644 --- a/common/src/main/java/juuxel/adorn/recipe/AdornRecipeSerializers.java +++ b/common/src/main/java/juuxel/adorn/recipe/AdornRecipeSerializers.java @@ -4,7 +4,7 @@ import juuxel.adorn.lib.registry.Registrar; import juuxel.adorn.lib.registry.RegistrarFactory; import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.SpecialRecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.registry.RegistryKeys; public final class AdornRecipeSerializers { @@ -15,7 +15,7 @@ public final class AdornRecipeSerializers { public static final Registered> BREWING_FROM_FLUID = RECIPE_SERIALIZERS.register("brewing_from_fluid", FluidBrewingRecipe.Serializer::new); public static final Registered> FERTILIZER_REFILLING = - RECIPE_SERIALIZERS.register("fertilizer_refilling", () -> new SpecialRecipeSerializer<>(FertilizerRefillingRecipe::new)); + RECIPE_SERIALIZERS.register("fertilizer_refilling", () -> new SpecialCraftingRecipe.SpecialRecipeSerializer<>(FertilizerRefillingRecipe::new)); public static void init() { } diff --git a/common/src/main/java/juuxel/adorn/recipe/BrewerInput.java b/common/src/main/java/juuxel/adorn/recipe/BrewerInput.java index 58e1c0e3b..efdfe2039 100644 --- a/common/src/main/java/juuxel/adorn/recipe/BrewerInput.java +++ b/common/src/main/java/juuxel/adorn/recipe/BrewerInput.java @@ -1,8 +1,19 @@ package juuxel.adorn.recipe; import juuxel.adorn.fluid.FluidReference; +import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.input.RecipeInput; +import java.util.Optional; + public interface BrewerInput extends RecipeInput { FluidReference getFluidReference(); + + default boolean matches(int slot, Ingredient ingredient) { + return ingredient.test(getStackInSlot(slot)); + } + + default boolean matches(int slot, Optional ingredient) { + return Ingredient.matches(ingredient, getStackInSlot(slot)); + } } diff --git a/common/src/main/java/juuxel/adorn/recipe/BrewingRecipe.java b/common/src/main/java/juuxel/adorn/recipe/BrewingRecipe.java index 52f39abce..b1260f679 100644 --- a/common/src/main/java/juuxel/adorn/recipe/BrewingRecipe.java +++ b/common/src/main/java/juuxel/adorn/recipe/BrewingRecipe.java @@ -5,7 +5,7 @@ public sealed interface BrewingRecipe extends Recipe permits FluidBrewingRecipe, ItemBrewingRecipe { @Override - default RecipeType getType() { + default RecipeType getType() { return AdornRecipeTypes.BREWING.get(); } } diff --git a/common/src/main/java/juuxel/adorn/recipe/FertilizerRefillingRecipe.java b/common/src/main/java/juuxel/adorn/recipe/FertilizerRefillingRecipe.java index 964ed8d2a..a8ff727d4 100644 --- a/common/src/main/java/juuxel/adorn/recipe/FertilizerRefillingRecipe.java +++ b/common/src/main/java/juuxel/adorn/recipe/FertilizerRefillingRecipe.java @@ -39,7 +39,7 @@ public ItemStack craft(CraftingRecipeInput input, RegistryWrapper.WrapperLookup var wateringCan = ItemStack.EMPTY; var fertilizers = 0; - for (int slot = 0; slot < inventory.getSize(); slot++) { + for (int slot = 0; slot < inventory.size(); slot++) { var stack = inventory.getStackInSlot(slot); if (stack.isOf(AdornItems.WATERING_CAN.get())) { @@ -66,12 +66,7 @@ public ItemStack craft(CraftingRecipeInput input, RegistryWrapper.WrapperLookup } @Override - public boolean fits(int width, int height) { - return width * height >= 2; - } - - @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return AdornRecipeSerializers.FERTILIZER_REFILLING.get(); } diff --git a/common/src/main/java/juuxel/adorn/recipe/FluidBrewingRecipe.java b/common/src/main/java/juuxel/adorn/recipe/FluidBrewingRecipe.java index 63913b442..eb429672d 100644 --- a/common/src/main/java/juuxel/adorn/recipe/FluidBrewingRecipe.java +++ b/common/src/main/java/juuxel/adorn/recipe/FluidBrewingRecipe.java @@ -7,49 +7,49 @@ import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.codec.PacketCodec; import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.IngredientPlacement; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.book.RecipeBookCategory; import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.World; +import java.util.Optional; + import static juuxel.adorn.block.entity.BrewerBlockEntity.LEFT_INGREDIENT_SLOT; import static juuxel.adorn.block.entity.BrewerBlockEntity.RIGHT_INGREDIENT_SLOT; -public record FluidBrewingRecipe(Ingredient firstIngredient, Ingredient secondIngredient, FluidIngredient fluid, ItemStack result) implements BrewingRecipe { +public record FluidBrewingRecipe(Ingredient firstIngredient, Optional secondIngredient, FluidIngredient fluid, ItemStack result) implements BrewingRecipe { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group( - Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("first_ingredient").forGetter(FluidBrewingRecipe::firstIngredient), - Ingredient.ALLOW_EMPTY_CODEC.optionalFieldOf("second_ingredient", Ingredient.empty()).forGetter(FluidBrewingRecipe::secondIngredient), + Ingredient.CODEC.fieldOf("first_ingredient").forGetter(FluidBrewingRecipe::firstIngredient), + Ingredient.CODEC.optionalFieldOf("second_ingredient").forGetter(FluidBrewingRecipe::secondIngredient), FluidIngredient.CODEC.fieldOf("fluid").forGetter(FluidBrewingRecipe::fluid), ItemStack.VALIDATED_CODEC.fieldOf("result").forGetter(FluidBrewingRecipe::result) ).apply(builder, FluidBrewingRecipe::new)); @Override public boolean matches(BrewerInput input, World world) { - var itemsMatch = (matches(input, LEFT_INGREDIENT_SLOT, firstIngredient) && matches(input, RIGHT_INGREDIENT_SLOT, secondIngredient)) || - (matches(input, RIGHT_INGREDIENT_SLOT, firstIngredient) && matches(input, LEFT_INGREDIENT_SLOT, firstIngredient)); + var itemsMatch = (input.matches(LEFT_INGREDIENT_SLOT, firstIngredient) && input.matches(RIGHT_INGREDIENT_SLOT, secondIngredient)) || + (input.matches(RIGHT_INGREDIENT_SLOT, firstIngredient) && input.matches(LEFT_INGREDIENT_SLOT, firstIngredient)); return itemsMatch && input.getFluidReference().matches(fluid); } - private static boolean matches(BrewerInput input, int index, Ingredient ingredient) { - return ingredient.test(input.getStackInSlot(index)); - } - @Override public ItemStack craft(BrewerInput input, RegistryWrapper.WrapperLookup registries) { return result.copy(); } @Override - public boolean fits(int width, int height) { - return true; + public IngredientPlacement getIngredientPlacement() { + return IngredientPlacement.NONE; } @Override - public ItemStack getResult(RegistryWrapper.WrapperLookup registries) { - return result; + public RecipeBookCategory getRecipeBookCategory() { + return AdornRecipeBookCategories.BREWING.get(); } @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return AdornRecipeSerializers.BREWING_FROM_FLUID.get(); } @@ -57,7 +57,7 @@ public static final class Serializer implements RecipeSerializer PACKET_CODEC = PacketCodec.tuple( Ingredient.PACKET_CODEC, FluidBrewingRecipe::firstIngredient, - Ingredient.PACKET_CODEC, + Ingredient.OPTIONAL_PACKET_CODEC, FluidBrewingRecipe::secondIngredient, FluidIngredient.PACKET_CODEC, FluidBrewingRecipe::fluid, diff --git a/common/src/main/java/juuxel/adorn/recipe/InventoryWrappingRecipeInput.java b/common/src/main/java/juuxel/adorn/recipe/InventoryWrappingRecipeInput.java index 6e7019912..ca4484925 100644 --- a/common/src/main/java/juuxel/adorn/recipe/InventoryWrappingRecipeInput.java +++ b/common/src/main/java/juuxel/adorn/recipe/InventoryWrappingRecipeInput.java @@ -17,7 +17,7 @@ public ItemStack getStackInSlot(int slot) { } @Override - public int getSize() { + public int size() { return parent.size(); } diff --git a/common/src/main/java/juuxel/adorn/recipe/ItemBrewingRecipe.java b/common/src/main/java/juuxel/adorn/recipe/ItemBrewingRecipe.java index a30749237..721469cbf 100644 --- a/common/src/main/java/juuxel/adorn/recipe/ItemBrewingRecipe.java +++ b/common/src/main/java/juuxel/adorn/recipe/ItemBrewingRecipe.java @@ -6,28 +6,28 @@ import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.codec.PacketCodec; import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.IngredientPlacement; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.book.RecipeBookCategory; import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.World; +import java.util.Optional; + import static juuxel.adorn.block.entity.BrewerBlockEntity.LEFT_INGREDIENT_SLOT; import static juuxel.adorn.block.entity.BrewerBlockEntity.RIGHT_INGREDIENT_SLOT; -public record ItemBrewingRecipe(Ingredient firstIngredient, Ingredient secondIngredient, ItemStack result) implements BrewingRecipe { +public record ItemBrewingRecipe(Ingredient firstIngredient, Optional secondIngredient, ItemStack result) implements BrewingRecipe { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group( - Ingredient.DISALLOW_EMPTY_CODEC.fieldOf("first_ingredient").forGetter(ItemBrewingRecipe::firstIngredient), - Ingredient.ALLOW_EMPTY_CODEC.optionalFieldOf("second_ingredient", Ingredient.empty()).forGetter(ItemBrewingRecipe::secondIngredient), + Ingredient.CODEC.fieldOf("first_ingredient").forGetter(ItemBrewingRecipe::firstIngredient), + Ingredient.CODEC.optionalFieldOf("second_ingredient").forGetter(ItemBrewingRecipe::secondIngredient), ItemStack.VALIDATED_CODEC.fieldOf("result").forGetter(ItemBrewingRecipe::result) ).apply(builder, ItemBrewingRecipe::new)); @Override public boolean matches(BrewerInput input, World world) { - return (matches(input, LEFT_INGREDIENT_SLOT, firstIngredient) && matches(input, RIGHT_INGREDIENT_SLOT, secondIngredient)) || - (matches(input, RIGHT_INGREDIENT_SLOT, firstIngredient) && matches(input, LEFT_INGREDIENT_SLOT, secondIngredient)); - } - - private static boolean matches(BrewerInput input, int index, Ingredient ingredient) { - return ingredient.test(input.getStackInSlot(index)); + return (input.matches(LEFT_INGREDIENT_SLOT, firstIngredient) && input.matches(RIGHT_INGREDIENT_SLOT, secondIngredient)) || + (input.matches(RIGHT_INGREDIENT_SLOT, firstIngredient) && input.matches(LEFT_INGREDIENT_SLOT, secondIngredient)); } @Override @@ -36,23 +36,30 @@ public ItemStack craft(BrewerInput input, RegistryWrapper.WrapperLookup registri } @Override - public boolean fits(int width, int height) { - return true; + public IngredientPlacement getIngredientPlacement() { + return IngredientPlacement.NONE; } @Override - public ItemStack getResult(RegistryWrapper.WrapperLookup registries) { - return result; + public RecipeBookCategory getRecipeBookCategory() { + return AdornRecipeBookCategories.BREWING.get(); } @Override - public RecipeSerializer getSerializer() { + public RecipeSerializer getSerializer() { return AdornRecipeSerializers.BREWING.get(); } public static final class Serializer implements RecipeSerializer { - private static final PacketCodec PACKET_CODEC = - PacketCodec.ofStatic(Serializer::write, Serializer::read); + private static final PacketCodec PACKET_CODEC = PacketCodec.tuple( + Ingredient.PACKET_CODEC, + ItemBrewingRecipe::firstIngredient, + Ingredient.OPTIONAL_PACKET_CODEC, + ItemBrewingRecipe::secondIngredient, + ItemStack.PACKET_CODEC, + ItemBrewingRecipe::result, + ItemBrewingRecipe::new + ); @Override public MapCodec codec() { @@ -63,18 +70,5 @@ public MapCodec codec() { public PacketCodec packetCodec() { return PACKET_CODEC; } - - private static ItemBrewingRecipe read(RegistryByteBuf buf) { - var first = Ingredient.PACKET_CODEC.decode(buf); - var second = Ingredient.PACKET_CODEC.decode(buf); - var output = ItemStack.PACKET_CODEC.decode(buf); - return new ItemBrewingRecipe(first, second, output); - } - - private static void write(RegistryByteBuf buf, ItemBrewingRecipe recipe) { - Ingredient.PACKET_CODEC.encode(buf, recipe.firstIngredient); - Ingredient.PACKET_CODEC.encode(buf, recipe.secondIngredient); - ItemStack.PACKET_CODEC.encode(buf, recipe.result); - } } } diff --git a/common/src/main/java/juuxel/adorn/trading/Trade.java b/common/src/main/java/juuxel/adorn/trading/Trade.java index 49da04376..4e0cedb99 100644 --- a/common/src/main/java/juuxel/adorn/trading/Trade.java +++ b/common/src/main/java/juuxel/adorn/trading/Trade.java @@ -63,8 +63,8 @@ public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registries) { @Override public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registries) { - nbt.put(NBT_SELLING, selling.encodeAllowEmpty(registries)); - nbt.put(NBT_PRICE, price.encodeAllowEmpty(registries)); + nbt.put(NBT_SELLING, selling.toNbtAllowEmpty(registries)); + nbt.put(NBT_PRICE, price.toNbtAllowEmpty(registries)); return nbt; } diff --git a/common/src/main/resources/adorn.accesswidener b/common/src/main/resources/adorn.accesswidener index 16263b40f..25a52ffed 100644 --- a/common/src/main/resources/adorn.accesswidener +++ b/common/src/main/resources/adorn.accesswidener @@ -2,7 +2,7 @@ accessWidener v1 named # Blocks accessible method net/minecraft/block/AbstractCandleBlock spawnCandleParticles (Lnet/minecraft/world/World;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/random/Random;)V -accessible method net/minecraft/block/Blocks createWoodenButtonBlock (Lnet/minecraft/block/BlockSetType;)Lnet/minecraft/block/Block; +accessible method net/minecraft/block/Blocks createButtonSettings ()Lnet/minecraft/block/AbstractBlock$Settings; accessible method net/minecraft/block/BlockSetType register (Lnet/minecraft/block/BlockSetType;)Lnet/minecraft/block/BlockSetType; extendable method net/minecraft/block/PaneBlock connectsTo (Lnet/minecraft/block/BlockState;Z)Z accessible method net/minecraft/block/TallPlantBlock onBreakInCreative (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V @@ -13,7 +13,7 @@ accessible method net/minecraft/world/GameRules register (Ljava/lang/String;Lnet accessible method net/minecraft/world/GameRules$BooleanRule create (Z)Lnet/minecraft/world/GameRules$Type; # Fluids -accessible method net/minecraft/fluid/FlowableFluid isInfinite (Lnet/minecraft/world/World;)Z +accessible method net/minecraft/fluid/FlowableFluid isInfinite (Lnet/minecraft/server/world/ServerWorld;)Z # Menus accessible class net/minecraft/menu/MenuType$Factory @@ -23,3 +23,9 @@ accessible method net/minecraft/client/gui/screen/ingame/MenuScreens register (L # Texts accessible method net/minecraft/text/TextCodecs combine (Ljava/util/List;)Lnet/minecraft/text/MutableText; + +# Block entities +accessible method net/minecraft/block/entity/BlockEntityType (Lnet/minecraft/block/entity/BlockEntityType$BlockEntityFactory;Ljava/util/Set;)V + +# Screens +accessible field net/minecraft/client/gui/DrawContext vertexConsumers Lnet/minecraft/client/render/VertexConsumerProvider$Immediate; diff --git a/common/src/main/resources/mixins.adorn.common.json b/common/src/main/resources/mixins.adorn.common.json index b46298c8b..a1df4f93e 100644 --- a/common/src/main/resources/mixins.adorn.common.json +++ b/common/src/main/resources/mixins.adorn.common.json @@ -6,7 +6,6 @@ "mixins": [ "BlockMixin", - "BlocksMixin", "BubbleColumnBlockMixin", "FenceGateBlockMixin" ], diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornDataGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornDataGenerator.java index ae5ad5951..0cd82012e 100644 --- a/fabric/src/commonData/java/juuxel/adorn/data/AdornDataGenerator.java +++ b/fabric/src/commonData/java/juuxel/adorn/data/AdornDataGenerator.java @@ -13,7 +13,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(AdornTagGenerator::new); pack.addProvider(AdornBlockLootTableGenerator::new); pack.addProvider(AdornModelGenerator::new); - pack.addProvider(AdornRecipeGenerator::new); + pack.addProvider(AdornRecipeGenerator.Provider::new); pack.addProvider(BookGenerator::new); var blockTags = pack.addProvider(AdornBlockTagGenerator::new); pack.addProvider((output, registriesFuture) -> new AdornItemTagGenerator(output, registriesFuture, blockTags)); diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java index 75a9ec9ed..1a60b7cd2 100644 --- a/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java +++ b/fabric/src/commonData/java/juuxel/adorn/data/AdornRecipeGenerator.java @@ -9,6 +9,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.data.server.recipe.RecipeExporter; +import net.minecraft.data.server.recipe.RecipeGenerator; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; @@ -23,13 +24,13 @@ import java.util.concurrent.CompletableFuture; -public final class AdornRecipeGenerator extends FabricRecipeProvider { - public AdornRecipeGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { - super(output, registriesFuture); +public final class AdornRecipeGenerator extends RecipeGenerator { + private AdornRecipeGenerator(RegistryWrapper.WrapperLookup registries, RecipeExporter exporter) { + super(registries, exporter); } @Override - public void generate(RecipeExporter exporter) { + public void generate() { AdornBlocks.PAINTED_PLANKS.forEach((color, block) -> offerPlankDyeingRecipe(exporter, block, color)); AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerPaintedSlabRecipe(exporter, block, color)); AdornBlocks.PAINTED_WOOD_SLABS.forEach((color, block) -> offerSlabDyeingRecipe(exporter, block, color)); @@ -60,11 +61,11 @@ public void generate(RecipeExporter exporter) { } } - private static void offerPlankDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPlankDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.PLANKS, "planks", false); } - private static void offerPaintedSlabRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedSlabRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, output, Ingredient.ofItems(planks)) .group("wooden_slabs") @@ -72,11 +73,11 @@ private static void offerPaintedSlabRecipe(RecipeExporter exporter, ItemConverti .offerTo(exporter); } - private static void offerSlabDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerSlabDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.WOODEN_SLABS, "slab", true); } - private static void offerPaintedStairsRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedStairsRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); createStairsRecipe(output, Ingredient.ofItems(planks)) .group("wooden_stairs") @@ -84,11 +85,11 @@ private static void offerPaintedStairsRecipe(RecipeExporter exporter, ItemConver .offerTo(exporter); } - private static void offerStairDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerStairDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.WOODEN_STAIRS, "stairs", true); } - private static void offerPaintedFenceRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedFenceRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); createFenceRecipe(output, Ingredient.ofItems(planks)) .group("wooden_fence") @@ -96,11 +97,11 @@ private static void offerPaintedFenceRecipe(RecipeExporter exporter, ItemConvert .offerTo(exporter); } - private static void offerFenceDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerFenceDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.WOODEN_FENCES, "fence", true); } - private static void offerPaintedFenceGateRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedFenceGateRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); createFenceGateRecipe(output, Ingredient.ofItems(planks)) .group("wooden_fence") @@ -108,11 +109,11 @@ private static void offerPaintedFenceGateRecipe(RecipeExporter exporter, ItemCon .offerTo(exporter); } - private static void offerFenceGateDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerFenceGateDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.FENCE_GATES, "fence_gate", true); } - private static void offerPaintedPressurePlateRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedPressurePlateRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); createPressurePlateRecipe(RecipeCategory.REDSTONE, output, Ingredient.ofItems(planks)) .group("wooden_pressure_plate") @@ -120,34 +121,34 @@ private static void offerPaintedPressurePlateRecipe(RecipeExporter exporter, Ite .offerTo(exporter); } - private static void offerPressurePlateDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPressurePlateDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.WOODEN_PRESSURE_PLATES, "pressure_plate", true); } - private static void offerPaintedButtonRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerPaintedButtonRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { var planks = AdornBlocks.PAINTED_PLANKS.getEager(color); - createTransmutationRecipe(output, Ingredient.ofItems(planks)) + createButtonRecipe(output, Ingredient.ofItems(planks)) .group("wooden_button") .criterion("has_planks", conditionsFromItem(planks)) .offerTo(exporter); } - private static void offerButtonDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { + private void offerButtonDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color) { offerDyeingRecipe(exporter, output, color, ItemTags.WOODEN_BUTTONS, "button", true); } - private static void offerDyeingRecipe(RecipeExporter exporter, DyeColor color, TagKey ingredient, BlockKind kind) { + private void offerDyeingRecipe(RecipeExporter exporter, DyeColor color, TagKey ingredient, BlockKind kind) { var variant = BlockVariant.PAINTED_WOODS.get(color); var group = AdornCommon.NAMESPACE + ':' + kind.id(); offerDyeingRecipe(exporter, BlockVariantSets.get(kind, variant).get(), color, ingredient, kind.id(), group, true); } - private static void offerDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color, TagKey ingredient, String kind, boolean suffix) { + private void offerDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color, TagKey ingredient, String kind, boolean suffix) { offerDyeingRecipe(exporter, output, color, ingredient, kind, "wooden_" + kind, suffix); } - private static void offerDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color, TagKey ingredient, String kind, String group, boolean suffix) { - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 8) + private void offerDyeingRecipe(RecipeExporter exporter, ItemConvertible output, DyeColor color, TagKey ingredient, String kind, String group, boolean suffix) { + createShaped(RecipeCategory.BUILDING_BLOCKS, output, 8) .input('*', TagKey.of(RegistryKeys.ITEM, Identifier.of("c", "dyes/" + color.asString()))) .input('#', ingredient) .pattern("###") @@ -157,4 +158,20 @@ private static void offerDyeingRecipe(RecipeExporter exporter, ItemConvertible o .criterion("has_" + kind, conditionsFromTag(ingredient)) .offerTo(exporter, suffix ? getItemPath(output) + "_from_dyeing" : getItemPath(output)); } + + public static final class Provider extends FabricRecipeProvider { + public Provider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registries, RecipeExporter exporter) { + return new AdornRecipeGenerator(registries, exporter); + } + + @Override + public String getName() { + return "Adorn Recipes"; + } + } } diff --git a/fabric/src/main/java/juuxel/adorn/Adorn.java b/fabric/src/main/java/juuxel/adorn/Adorn.java index e40f3b404..c79289502 100644 --- a/fabric/src/main/java/juuxel/adorn/Adorn.java +++ b/fabric/src/main/java/juuxel/adorn/Adorn.java @@ -27,6 +27,7 @@ import juuxel.adorn.loot.AdornLootConditionTypes; import juuxel.adorn.loot.AdornLootFunctionTypes; import juuxel.adorn.menu.AdornMenus; +import juuxel.adorn.recipe.AdornRecipeBookCategories; import juuxel.adorn.recipe.AdornRecipeSerializers; import juuxel.adorn.recipe.AdornRecipeTypes; import juuxel.adorn.resources.AdornResources; @@ -54,6 +55,7 @@ public static void init() { AdornStats.init(); SofaSleeping.init(); AdornCriteria.init(); + AdornRecipeBookCategories.init(); AdornRecipeTypes.init(); AdornRecipeSerializers.init(); AdornLootConditionTypes.init(); diff --git a/fabric/src/main/java/juuxel/adorn/lib/AdornItemsFabric.java b/fabric/src/main/java/juuxel/adorn/lib/AdornItemsFabric.java index 301291d00..74350167a 100644 --- a/fabric/src/main/java/juuxel/adorn/lib/AdornItemsFabric.java +++ b/fabric/src/main/java/juuxel/adorn/lib/AdornItemsFabric.java @@ -1,15 +1,17 @@ package juuxel.adorn.lib; import juuxel.adorn.item.FuelData; -import net.fabricmc.fabric.api.registry.FuelRegistry; +import net.fabricmc.fabric.api.registry.FuelRegistryEvents; public final class AdornItemsFabric { public static void init() { - for (var fuelData : FuelData.FUEL_DATA) { - switch (fuelData) { - case FuelData.ForItem(var item, int burnTime) -> FuelRegistry.INSTANCE.add(item.get(), burnTime); - case FuelData.ForTag(var tag, int burnTime) -> FuelRegistry.INSTANCE.add(tag, burnTime); + FuelRegistryEvents.BUILD.register((builder, context) -> { + for (var fuelData : FuelData.FUEL_DATA) { + switch (fuelData) { + case FuelData.ForItem(var item, int burnTime) -> builder.add(item.get(), burnTime); + case FuelData.ForTag(var tag, int burnTime) -> builder.add(tag, burnTime); + } } - } + }); } } diff --git a/fabric/src/main/java/juuxel/adorn/lib/SofaSleeping.java b/fabric/src/main/java/juuxel/adorn/lib/SofaSleeping.java index 8b4e7d81e..3520fb65b 100644 --- a/fabric/src/main/java/juuxel/adorn/lib/SofaSleeping.java +++ b/fabric/src/main/java/juuxel/adorn/lib/SofaSleeping.java @@ -3,6 +3,7 @@ import juuxel.adorn.block.SofaBlock; import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents; import net.minecraft.block.BedBlock; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; public final class SofaSleeping { @@ -38,7 +39,7 @@ public static void init() { if (player.getWorld().isDay()) { return false; } else { - return player.getWorld().getGameRules().getBoolean(AdornGameRules.SKIP_NIGHT_ON_SOFAS); + return player.getWorld() instanceof ServerWorld world && world.getGameRules().getBoolean(AdornGameRules.SKIP_NIGHT_ON_SOFAS); } } else { return true; // go on diff --git a/fabric/src/main/java/juuxel/adorn/platform/fabric/EntityBridgeImpl.java b/fabric/src/main/java/juuxel/adorn/platform/fabric/EntityBridgeImpl.java deleted file mode 100644 index 7dfaa372f..000000000 --- a/fabric/src/main/java/juuxel/adorn/platform/fabric/EntityBridgeImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package juuxel.adorn.platform.fabric; - -import juuxel.adorn.entity.SeatEntity; -import juuxel.adorn.platform.EntityBridge; -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; -import net.minecraft.entity.EntityDimensions; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnGroup; - -public final class EntityBridgeImpl implements EntityBridge { - public static final EntityBridgeImpl INSTANCE = new EntityBridgeImpl(); - - @Override - public EntityType createSeatType() { - return FabricEntityTypeBuilder.create(SpawnGroup.MISC, SeatEntity::new) - .dimensions(EntityDimensions.fixed(0f, 0f)) - .build(); - } -} diff --git a/fabric/src/main/java/juuxel/adorn/platform/fabric/PlatformBridgesImpl.java b/fabric/src/main/java/juuxel/adorn/platform/fabric/PlatformBridgesImpl.java index b29ebd3f2..0a0c30602 100644 --- a/fabric/src/main/java/juuxel/adorn/platform/fabric/PlatformBridgesImpl.java +++ b/fabric/src/main/java/juuxel/adorn/platform/fabric/PlatformBridgesImpl.java @@ -2,7 +2,6 @@ import juuxel.adorn.platform.BlockEntityBridge; import juuxel.adorn.platform.BlockFactory; -import juuxel.adorn.platform.EntityBridge; import juuxel.adorn.platform.MenuBridge; import juuxel.adorn.platform.NetworkBridge; import juuxel.adorn.platform.PlatformBridges; @@ -19,11 +18,6 @@ public BlockFactory getBlockFactory() { return BlockFactory.DEFAULT; } - @Override - public EntityBridge getEntities() { - return EntityBridgeImpl.INSTANCE; - } - @Override public MenuBridge getMenus() { return MenuBridgeImpl.INSTANCE; diff --git a/fabric/src/main/java/juuxel/adorn/platform/fabric/RegistrarImpl.java b/fabric/src/main/java/juuxel/adorn/platform/fabric/RegistrarImpl.java index c15f76b0d..c2b4c83f4 100644 --- a/fabric/src/main/java/juuxel/adorn/platform/fabric/RegistrarImpl.java +++ b/fabric/src/main/java/juuxel/adorn/platform/fabric/RegistrarImpl.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.function.Function; import java.util.function.Supplier; public final class RegistrarImpl implements Registrar { @@ -21,13 +22,25 @@ public RegistrarImpl(Registry registry) { @Override public Registered.WithKey register(String id, Supplier provider) { - var key = RegistryKey.of(registry.getKey(), AdornCommon.id(id)); - var registered = Registry.register(registry, key, provider.get()); - objects.add(registered); + var key = createKey(id); + U value = provider.get(); + return register(key, value); + } + + @Override + public Registered.WithKey register(String id, Function, ? extends U> provider) { + var key = createKey(id); + U value = provider.apply(key); + return register(key, value); + } + + private Registered.WithKey register(RegistryKey key, U value) { + Registry.register(registry, key, value); + objects.add(value); return new Registered.WithKey<>() { @Override public U get() { - return registered; + return value; } @Override @@ -37,6 +50,10 @@ public RegistryKey key() { }; } + private RegistryKey createKey(String id) { + return RegistryKey.of(registry.getKey(), AdornCommon.id(id)); + } + @Override public Iterator iterator() { return objects.iterator(); diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index a4eff660d..ce1718610 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -24,16 +24,16 @@ "modmenu": [ "juuxel.adorn.compat.modmenu.AdornModMenuPlugin" ], - "rei_common": [ + "rei_common_disabled": [ "juuxel.adorn.compat.rei.AdornReiServer" ], - "rei_client": [ + "rei_client_disabled": [ "juuxel.adorn.compat.rei.client.AdornReiClient" ], - "emi": [ + "emi_disabled": [ "juuxel.adorn.compat.emi.AdornEmiPlugin" ], - "jei_mod_plugin": [ + "jei_mod_plugin_disabled": [ "juuxel.adorn.compat.jei.AdornJeiPlugin" ] }, diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java b/forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java index fd6f70840..7f6330407 100644 --- a/forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java +++ b/forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java @@ -27,6 +27,7 @@ import juuxel.adorn.platform.forge.event.ItemEvents; import juuxel.adorn.platform.forge.networking.AdornNetworking; import juuxel.adorn.platform.forge.registrar.ForgeRegistrar; +import juuxel.adorn.recipe.AdornRecipeBookCategories; import juuxel.adorn.recipe.AdornRecipeSerializers; import juuxel.adorn.recipe.AdornRecipeTypes; import net.neoforged.api.distmarker.Dist; @@ -54,9 +55,11 @@ public Adorn() { register(AdornBlockEntities.BLOCK_ENTITIES, modBus); AdornItemGroups.init(); register(AdornItemGroups.ITEM_GROUPS, modBus); + AdornRecipeBookCategories.init(); AdornRecipeTypes.init(); AdornRecipeSerializers.init(); register(AdornMenus.MENUS, modBus); + register(AdornRecipeBookCategories.RECIPE_BOOK_CATEGORIES, modBus); register(AdornRecipeSerializers.RECIPE_SERIALIZERS, modBus); register(AdornRecipeTypes.RECIPE_TYPES, modBus); register(AdornLootConditionTypes.LOOT_CONDITION_TYPES, modBus); diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/BlockFactoryImpl.java b/forge/src/main/java/juuxel/adorn/platform/forge/BlockFactoryImpl.java index 996425f11..884d1efda 100644 --- a/forge/src/main/java/juuxel/adorn/platform/forge/BlockFactoryImpl.java +++ b/forge/src/main/java/juuxel/adorn/platform/forge/BlockFactoryImpl.java @@ -1,7 +1,6 @@ package juuxel.adorn.platform.forge; import juuxel.adorn.block.SofaBlock; -import juuxel.adorn.block.variant.BlockVariant; import juuxel.adorn.platform.BlockFactory; import juuxel.adorn.platform.forge.block.PaintedPlanksBlockNeo; import juuxel.adorn.platform.forge.block.PaintedWoodFenceBlockNeo; @@ -18,8 +17,8 @@ public final class BlockFactoryImpl implements BlockFactory { public static final BlockFactoryImpl INSTANCE = new BlockFactoryImpl(); @Override - public SofaBlock createSofa(BlockVariant variant) { - return new SofaBlockForge(variant); + public SofaBlock createSofa(AbstractBlock.Settings settings) { + return new SofaBlockForge(settings); } @Override diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/EntityBridgeImpl.java b/forge/src/main/java/juuxel/adorn/platform/forge/EntityBridgeImpl.java deleted file mode 100644 index 20753c20d..000000000 --- a/forge/src/main/java/juuxel/adorn/platform/forge/EntityBridgeImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package juuxel.adorn.platform.forge; - -import juuxel.adorn.AdornCommon; -import juuxel.adorn.entity.SeatEntity; -import juuxel.adorn.platform.EntityBridge; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnGroup; - -public final class EntityBridgeImpl implements EntityBridge { - public static final EntityBridgeImpl INSTANCE = new EntityBridgeImpl(); - - @Override - public EntityType createSeatType() { - return EntityType.Builder.create(SeatEntity::new, SpawnGroup.MISC) - .dimensions(0, 0) - .build(AdornCommon.NAMESPACE + ":seat"); - } -} diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/PlatformBridgesImpl.java b/forge/src/main/java/juuxel/adorn/platform/forge/PlatformBridgesImpl.java index d4b5afd2c..5c3979787 100644 --- a/forge/src/main/java/juuxel/adorn/platform/forge/PlatformBridgesImpl.java +++ b/forge/src/main/java/juuxel/adorn/platform/forge/PlatformBridgesImpl.java @@ -2,7 +2,6 @@ import juuxel.adorn.platform.BlockEntityBridge; import juuxel.adorn.platform.BlockFactory; -import juuxel.adorn.platform.EntityBridge; import juuxel.adorn.platform.MenuBridge; import juuxel.adorn.platform.NetworkBridge; import juuxel.adorn.platform.PlatformBridges; @@ -19,11 +18,6 @@ public BlockFactory getBlockFactory() { return BlockFactoryImpl.INSTANCE; } - @Override - public EntityBridge getEntities() { - return EntityBridgeImpl.INSTANCE; - } - @Override public MenuBridge getMenus() { return MenuBridgeImpl.INSTANCE; diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/block/SofaBlockForge.java b/forge/src/main/java/juuxel/adorn/platform/forge/block/SofaBlockForge.java index c67ba5bf6..4510bcb7d 100644 --- a/forge/src/main/java/juuxel/adorn/platform/forge/block/SofaBlockForge.java +++ b/forge/src/main/java/juuxel/adorn/platform/forge/block/SofaBlockForge.java @@ -1,20 +1,17 @@ package juuxel.adorn.platform.forge.block; import juuxel.adorn.block.SofaBlock; -import juuxel.adorn.block.variant.BlockVariant; import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; -import org.jetbrains.annotations.Nullable; public final class SofaBlockForge extends SofaBlock { - public SofaBlockForge(BlockVariant variant) { - super(variant); + public SofaBlockForge(Settings settings) { + super(settings); } @Override diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/block/entity/KitchenSinkBlockEntityForge.java b/forge/src/main/java/juuxel/adorn/platform/forge/block/entity/KitchenSinkBlockEntityForge.java index 118408ad3..c4d4ff015 100644 --- a/forge/src/main/java/juuxel/adorn/platform/forge/block/entity/KitchenSinkBlockEntityForge.java +++ b/forge/src/main/java/juuxel/adorn/platform/forge/block/entity/KitchenSinkBlockEntityForge.java @@ -13,6 +13,7 @@ import net.minecraft.potion.Potions; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.FluidTags; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -31,7 +32,7 @@ public final class KitchenSinkBlockEntityForge extends KitchenSinkBlockEntity im private final FluidTank tank = new FluidTank(FluidType.BUCKET_VOLUME) { @Override public FluidStack drain(int maxDrain, FluidAction action) { - if (supportsInfiniteExtraction(getWorld(), fluid.getFluid())) { + if (getWorld() instanceof ServerWorld world && supportsInfiniteExtraction(world, fluid.getFluid())) { return fluid.copyWithAmount(Math.min(getFluidAmount(), maxDrain)); } diff --git a/gradle.properties b/gradle.properties index db24a37a1..9d38e01b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=true mod-version = 6.0.0 # Minecraft -minecraft-version = 1.21.1 -yarn-mappings = build.3 +minecraft-version = 1.21.3 +yarn-mappings = build.2 menu-mappings = 1.19.3+1 neoforge-mappings-patch-version = 1.21+build.4 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d1fbc84a..12abbe86d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] dashloader = "2.0-pre2" emi = "1.1.10+1.21" -fabric-loader = "0.15.11" -fabric-api = "0.104.0+1.21.1" +fabric-loader = "0.16.7" +fabric-api = "0.106.1+1.21.3" jankson = "1.2.1" -modmenu = "11.0.1" -neoforge = "21.1.8" +modmenu = "12.0.0-beta.1" +neoforge = "21.3.2-beta" rei = "16.0.744" towelette = "e5e39eb"