Skip to content

Commit e3fe3f8

Browse files
committed
Initial port of common and Fabric code to 1.21.3
1 parent 0eaf048 commit e3fe3f8

File tree

502 files changed

+1449
-2816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

502 files changed

+1449
-2816
lines changed

common/src/generated/resources/data/adorn/recipe/black_bench_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:bench",
55
"key": {
6-
"#": {
7-
"tag": "adorn:benches"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:benches",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_chair_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:chair",
55
"key": {
6-
"#": {
7-
"tag": "adorn:chairs"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:chairs",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_coffee_table_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:coffee_table",
55
"key": {
6-
"#": {
7-
"tag": "adorn:coffee_tables"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:coffee_tables",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_drawer_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:drawer",
55
"key": {
6-
"#": {
7-
"tag": "adorn:drawers"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:drawers",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_kitchen_counter_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:kitchen_counter",
55
"key": {
6-
"#": {
7-
"tag": "adorn:kitchen_counters"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:kitchen_counters",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_kitchen_cupboard_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:kitchen_cupboard",
55
"key": {
6-
"#": {
7-
"tag": "adorn:kitchen_cupboards"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:kitchen_cupboards",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_kitchen_sink_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:kitchen_sink",
55
"key": {
6-
"#": {
7-
"tag": "adorn:kitchen_sinks"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:kitchen_sinks",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_planks.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_planks",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:planks"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:planks",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_platform_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:platform",
55
"key": {
6-
"#": {
7-
"tag": "adorn:wooden_platforms"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:wooden_platforms",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_post_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:post",
55
"key": {
6-
"#": {
7-
"tag": "adorn:wooden_posts"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:wooden_posts",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_shelf_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:shelf",
55
"key": {
6-
"#": {
7-
"tag": "adorn:wooden_shelves"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:wooden_shelves",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_step_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:step",
55
"key": {
6-
"#": {
7-
"tag": "adorn:wooden_steps"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:wooden_steps",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_table_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:table",
55
"key": {
6-
"#": {
7-
"tag": "adorn:tables"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#adorn:tables",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_button.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"category": "redstone",
44
"group": "wooden_button",
55
"ingredients": [
6-
{
7-
"item": "adorn:black_planks"
8-
}
6+
"adorn:black_planks"
97
],
108
"result": {
119
"count": 1,

common/src/generated/resources/data/adorn/recipe/black_wood_button_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_button",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:wooden_buttons"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:wooden_buttons",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_fence.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "misc",
44
"group": "wooden_fence",
55
"key": {
6-
"#": {
7-
"item": "minecraft:stick"
8-
},
9-
"W": {
10-
"item": "adorn:black_planks"
11-
}
6+
"#": "minecraft:stick",
7+
"W": "adorn:black_planks"
128
},
139
"pattern": [
1410
"W#W",

common/src/generated/resources/data/adorn/recipe/black_wood_fence_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_fence",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:wooden_fences"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:wooden_fences",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "redstone",
44
"group": "wooden_fence",
55
"key": {
6-
"#": {
7-
"item": "minecraft:stick"
8-
},
9-
"W": {
10-
"item": "adorn:black_planks"
11-
}
6+
"#": "minecraft:stick",
7+
"W": "adorn:black_planks"
128
},
139
"pattern": [
1410
"#W#",

common/src/generated/resources/data/adorn/recipe/black_wood_fence_gate_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_fence_gate",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:fence_gates"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:fence_gates",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"category": "redstone",
44
"group": "wooden_pressure_plate",
55
"key": {
6-
"#": {
7-
"item": "adorn:black_planks"
8-
}
6+
"#": "adorn:black_planks"
97
},
108
"pattern": [
119
"##"

common/src/generated/resources/data/adorn/recipe/black_wood_pressure_plate_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_pressure_plate",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:wooden_pressure_plates"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:wooden_pressure_plates",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_slab.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"category": "building",
44
"group": "wooden_slabs",
55
"key": {
6-
"#": {
7-
"item": "adorn:black_planks"
8-
}
6+
"#": "adorn:black_planks"
97
},
108
"pattern": [
119
"###"

common/src/generated/resources/data/adorn/recipe/black_wood_slab_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_slab",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:wooden_slabs"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:wooden_slabs",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/black_wood_stairs.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"category": "building",
44
"group": "wooden_stairs",
55
"key": {
6-
"#": {
7-
"item": "adorn:black_planks"
8-
}
6+
"#": "adorn:black_planks"
97
},
108
"pattern": [
119
"# ",

common/src/generated/resources/data/adorn/recipe/black_wood_stairs_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "wooden_stairs",
55
"key": {
6-
"#": {
7-
"tag": "minecraft:wooden_stairs"
8-
},
9-
"*": {
10-
"tag": "c:dyes/black"
11-
}
6+
"#": "#minecraft:wooden_stairs",
7+
"*": "#c:dyes/black"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/blue_bench_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:bench",
55
"key": {
6-
"#": {
7-
"tag": "adorn:benches"
8-
},
9-
"*": {
10-
"tag": "c:dyes/blue"
11-
}
6+
"#": "#adorn:benches",
7+
"*": "#c:dyes/blue"
128
},
139
"pattern": [
1410
"###",

common/src/generated/resources/data/adorn/recipe/blue_chair_from_dyeing.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"category": "building",
44
"group": "adorn:chair",
55
"key": {
6-
"#": {
7-
"tag": "adorn:chairs"
8-
},
9-
"*": {
10-
"tag": "c:dyes/blue"
11-
}
6+
"#": "#adorn:chairs",
7+
"*": "#c:dyes/blue"
128
},
139
"pattern": [
1410
"###",

0 commit comments

Comments
 (0)