Skip to content

Commit 2002c21

Browse files
TelepathicGruntTelepathicGrunt
authored
[1.21.4] Sync remaining c tags from Fabric side (#1628)
1 parent e613b59 commit 2002c21

38 files changed

+326
-82
lines changed

‎src/generated/resources/assets/c/lang/en_us.json

+14-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"tag.block.c.fence_gates": "Fence Gates",
4141
"tag.block.c.fence_gates.wooden": "Wooden Fence Gates",
4242
"tag.block.c.fences": "Fences",
43-
"tag.block.c.fences.nether_brick": "Fences Nether Brick",
43+
"tag.block.c.fences.nether_brick": "Nether Brick Fences",
4444
"tag.block.c.fences.wooden": "Wooden Fences",
4545
"tag.block.c.glass_blocks": "Glass Blocks",
4646
"tag.block.c.glass_blocks.cheap": "Silica Glass Blocks",
@@ -108,6 +108,7 @@
108108
"tag.block.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks",
109109
"tag.block.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks",
110110
"tag.block.c.storage_blocks.redstone": "Redstone Storage Blocks",
111+
"tag.block.c.storage_blocks.resin": "Resin Storage Blocks",
111112
"tag.block.c.storage_blocks.slime": "Slime Storage Blocks",
112113
"tag.block.c.storage_blocks.wheat": "Wheat Storage Blocks",
113114
"tag.block.c.stripped_logs": "Stripped Logs",
@@ -150,6 +151,7 @@
150151
"tag.item.c.bricks": "Bricks",
151152
"tag.item.c.bricks.nether": "Nether Bricks",
152153
"tag.item.c.bricks.normal": "Normal Bricks",
154+
"tag.item.c.bricks.resin": "Resin Bricks",
153155
"tag.item.c.buckets": "Buckets",
154156
"tag.item.c.buckets.empty": "Empty Buckets",
155157
"tag.item.c.buckets.entity_water": "Water Entity Buckets",
@@ -164,6 +166,8 @@
164166
"tag.item.c.chests.ender": "Ender Chests",
165167
"tag.item.c.chests.trapped": "Trapped Chests",
166168
"tag.item.c.chests.wooden": "Wooden Chests",
169+
"tag.item.c.clumps": "Clumps",
170+
"tag.item.c.clumps.resin": "Resin Clumps",
167171
"tag.item.c.clusters": "Clusters",
168172
"tag.item.c.cobblestones": "Cobblestones",
169173
"tag.item.c.cobblestones.deepslate": "Deepslate Cobblestones",
@@ -302,6 +306,8 @@
302306
"tag.item.c.ores_in_ground.stone": "Stone Ores In Ground",
303307
"tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
304308
"tag.item.c.player_workstations.furnaces": "Furnaces",
309+
"tag.item.c.potions": "Potions",
310+
"tag.item.c.potions.bottle": "Bottled Potions",
305311
"tag.item.c.raw_materials": "Raw Materials",
306312
"tag.item.c.raw_materials.copper": "Copper Raw Materials",
307313
"tag.item.c.raw_materials.gold": "Gold Raw Materials",
@@ -327,6 +333,7 @@
327333
"tag.item.c.seeds.beetroot": "Beetroot Seeds",
328334
"tag.item.c.seeds.melon": "Melon Seeds",
329335
"tag.item.c.seeds.pumpkin": "Pumpkin Seeds",
336+
"tag.item.c.seeds.torchflower": "Torchflower Seeds",
330337
"tag.item.c.seeds.wheat": "Wheat Seeds",
331338
"tag.item.c.shulker_boxes": "Shulker Boxes",
332339
"tag.item.c.slime_balls": "Slimeballs",
@@ -346,6 +353,7 @@
346353
"tag.item.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks",
347354
"tag.item.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks",
348355
"tag.item.c.storage_blocks.redstone": "Redstone Storage Blocks",
356+
"tag.item.c.storage_blocks.resin": "Resin Storage Blocks",
349357
"tag.item.c.storage_blocks.slime": "Slime Storage Blocks",
350358
"tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks",
351359
"tag.item.c.strings": "Strings",
@@ -413,7 +421,7 @@
413421
"tag.worldgen.biome.c.is_outer_end_island": "Outer End Island",
414422
"tag.worldgen.biome.c.is_overworld": "Is Overworld",
415423
"tag.worldgen.biome.c.is_plains": "Plains",
416-
"tag.worldgen.biome.c.is_plateau": "Plateaus",
424+
"tag.worldgen.biome.c.is_plateau": "Plateau",
417425
"tag.worldgen.biome.c.is_rare": "Rare",
418426
"tag.worldgen.biome.c.is_river": "River",
419427
"tag.worldgen.biome.c.is_sandy": "Sandy",
@@ -429,6 +437,10 @@
429437
"tag.worldgen.biome.c.is_stony_shores": "Stony Shores",
430438
"tag.worldgen.biome.c.is_swamp": "Swamps",
431439
"tag.worldgen.biome.c.is_taiga": "Taiga",
440+
"tag.worldgen.biome.c.is_temperate": "Temperate",
441+
"tag.worldgen.biome.c.is_temperate.end": "Temperate End",
442+
"tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether",
443+
"tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld",
432444
"tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Trees",
433445
"tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Trees",
434446
"tag.worldgen.biome.c.is_tree.jungle": "Jungle Trees",

‎src/generated/resources/data/c/tags/block/storage_blocks.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"#c:storage_blocks/raw_gold",
1515
"#c:storage_blocks/raw_iron",
1616
"#c:storage_blocks/redstone",
17+
"#c:storage_blocks/resin",
1718
"#c:storage_blocks/slime",
1819
"#c:storage_blocks/wheat",
1920
{

‎src/generated/resources/data/c/tags/block/storage_blocks/resin.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:resin_block"
4+
]
5+
}

‎src/generated/resources/data/c/tags/block/stripped_logs.json

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"minecraft:stripped_jungle_log",
99
"minecraft:stripped_mangrove_log",
1010
"minecraft:stripped_oak_log",
11+
"minecraft:stripped_pale_oak_log",
1112
"minecraft:stripped_spruce_log",
1213
"minecraft:stripped_crimson_stem",
1314
"minecraft:stripped_warped_stem"

‎src/generated/resources/data/c/tags/block/stripped_woods.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"minecraft:stripped_jungle_wood",
88
"minecraft:stripped_mangrove_wood",
99
"minecraft:stripped_oak_wood",
10+
"minecraft:stripped_pale_oak_wood",
1011
"minecraft:stripped_spruce_wood",
11-
"minecraft:stripped_warped_hyphae",
12-
"minecraft:stripped_crimson_hyphae"
12+
"minecraft:stripped_crimson_hyphae",
13+
"minecraft:stripped_warped_hyphae"
1314
]
1415
}

‎src/generated/resources/data/c/tags/entity_type/boats.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"minecraft:jungle_chest_boat",
88
"minecraft:acacia_chest_boat",
99
"minecraft:cherry_chest_boat",
10+
"minecraft:pale_oak_chest_boat",
1011
"minecraft:dark_oak_chest_boat",
1112
"minecraft:mangrove_chest_boat",
1213
"minecraft:bamboo_chest_raft",

‎src/generated/resources/data/c/tags/item/bricks.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"values": [
33
"#c:bricks/normal",
4-
"#c:bricks/nether"
4+
"#c:bricks/nether",
5+
"#c:bricks/resin"
56
]
67
}

‎src/generated/resources/data/c/tags/item/bricks/resin.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:resin_brick"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/clumps.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"#c:clumps/resin"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/clumps/resin.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:resin_clump"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/potions.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"#c:potions/bottle"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/potions/bottle.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"values": [
3+
"minecraft:potion",
4+
"minecraft:splash_potion",
5+
"minecraft:lingering_potion"
6+
]
7+
}

‎src/generated/resources/data/c/tags/item/seeds.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"#c:seeds/beetroot",
44
"#c:seeds/melon",
55
"#c:seeds/pumpkin",
6+
"#c:seeds/torchflower",
67
"#c:seeds/wheat",
78
{
89
"id": "#forge:seeds",

‎src/generated/resources/data/c/tags/item/seeds/torchflower.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:torchflower_seeds"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/storage_blocks.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"#c:storage_blocks/raw_gold",
1515
"#c:storage_blocks/raw_iron",
1616
"#c:storage_blocks/redstone",
17+
"#c:storage_blocks/resin",
1718
"#c:storage_blocks/slime",
1819
"#c:storage_blocks/wheat",
1920
{

‎src/generated/resources/data/c/tags/item/storage_blocks/resin.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:resin_block"
4+
]
5+
}

‎src/generated/resources/data/c/tags/item/stripped_logs.json

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"minecraft:stripped_jungle_log",
99
"minecraft:stripped_mangrove_log",
1010
"minecraft:stripped_oak_log",
11+
"minecraft:stripped_pale_oak_log",
1112
"minecraft:stripped_spruce_log",
1213
"minecraft:stripped_crimson_stem",
1314
"minecraft:stripped_warped_stem"

‎src/generated/resources/data/c/tags/item/stripped_woods.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"minecraft:stripped_jungle_wood",
88
"minecraft:stripped_mangrove_wood",
99
"minecraft:stripped_oak_wood",
10+
"minecraft:stripped_pale_oak_wood",
1011
"minecraft:stripped_spruce_wood",
11-
"minecraft:stripped_warped_hyphae",
12-
"minecraft:stripped_crimson_hyphae"
12+
"minecraft:stripped_crimson_hyphae",
13+
"minecraft:stripped_warped_hyphae"
1314
]
1415
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_cold.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"values": [
33
"#c:is_cold/overworld",
4-
{
5-
"id": "#c:is_cold/nether",
6-
"required": false
7-
},
4+
"#c:is_cold/nether",
85
"#c:is_cold/end",
96
{
107
"id": "#forge:is_cold",

‎src/generated/resources/data/c/tags/worldgen/biome/is_dark_forest.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"minecraft:dark_forest",
4+
"minecraft:pale_garden"
5+
]
6+
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
{
22
"values": [
33
"#c:is_dense_vegetation/overworld",
4-
{
5-
"id": "#c:is_dense_vegetation/nether",
6-
"required": false
7-
},
8-
{
9-
"id": "#c:is_dense_vegetation/end",
10-
"required": false
11-
},
4+
"#c:is_dense_vegetation/nether",
5+
"#c:is_dense_vegetation/end",
126
{
137
"id": "#forge:is_dense",
148
"required": false

‎src/generated/resources/data/c/tags/worldgen/biome/is_hot.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"values": [
33
"#c:is_hot/overworld",
44
"#c:is_hot/nether",
5-
{
6-
"id": "#c:is_hot/end",
7-
"required": false
8-
},
5+
"#c:is_hot/end",
96
{
107
"id": "#forge:is_hot",
118
"required": false

‎src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"values": [
3-
"minecraft:swamp",
4-
"minecraft:mangrove_swamp",
53
"minecraft:jungle",
64
"minecraft:bamboo_jungle",
75
"minecraft:sparse_jungle",
@@ -13,6 +11,7 @@
1311
"minecraft:savanna_plateau",
1412
"minecraft:windswept_savanna",
1513
"minecraft:stony_peaks",
14+
"minecraft:mushroom_fields",
1615
"minecraft:warm_ocean",
1716
{
1817
"id": "#forge:is_hot/overworld",

‎src/generated/resources/data/c/tags/worldgen/biome/is_rare.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"minecraft:windswept_savanna",
1212
"minecraft:ice_spikes",
1313
"minecraft:windswept_gravelly_hills",
14+
"minecraft:pale_garden",
1415
"minecraft:mushroom_fields",
1516
"minecraft:deep_dark",
1617
{

‎src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
{
22
"values": [
33
"#c:is_sparse_vegetation/overworld",
4-
{
5-
"id": "#c:is_sparse_vegetation/nether",
6-
"required": false
7-
},
8-
{
9-
"id": "#c:is_sparse_vegetation/end",
10-
"required": false
11-
},
4+
"#c:is_sparse_vegetation/nether",
5+
"#c:is_sparse_vegetation/end",
126
{
137
"id": "#forge:is_sparse_vegetation",
148
"required": false

‎src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"values": [
33
"minecraft:dark_forest",
4+
"minecraft:pale_garden",
45
"minecraft:deep_dark",
56
{
67
"id": "#forge:is_spooky",

‎src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"values": [
3+
"#c:is_temperate/overworld",
4+
"#c:is_temperate/nether",
5+
"#c:is_temperate/end"
6+
]
7+
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"values": []
3+
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"values": []
3+
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"values": [
3+
"minecraft:plains",
4+
"minecraft:sunflower_plains",
5+
"minecraft:forest",
6+
"minecraft:flower_forest",
7+
"minecraft:birch_forest",
8+
"minecraft:old_growth_birch_forest",
9+
"minecraft:dark_forest",
10+
"minecraft:cherry_grove",
11+
"minecraft:meadow",
12+
"minecraft:swamp",
13+
"minecraft:mangrove_swamp",
14+
"minecraft:beach",
15+
"minecraft:ocean",
16+
"minecraft:deep_ocean"
17+
]
18+
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_tree/deciduous.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
"minecraft:forest",
44
"minecraft:flower_forest",
55
"minecraft:birch_forest",
6-
"minecraft:dark_forest",
76
"minecraft:old_growth_birch_forest",
7+
"minecraft:dark_forest",
8+
"minecraft:pale_garden",
89
"minecraft:windswept_forest"
910
]
1011
}

‎src/generated/resources/data/c/tags/worldgen/biome/is_wet.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
{
22
"values": [
33
"#c:is_wet/overworld",
4-
{
5-
"id": "#c:is_wet/nether",
6-
"required": false
7-
},
8-
{
9-
"id": "#c:is_wet/end",
10-
"required": false
11-
},
4+
"#c:is_wet/nether",
5+
"#c:is_wet/end",
126
{
137
"id": "#forge:is_wet",
148
"required": false

0 commit comments

Comments
 (0)