Skip to content

Commit

Permalink
[1.21.4] Sync remaining c tags from Fabric side (#1628)
Browse files Browse the repository at this point in the history
  • Loading branch information
TelepathicGrunt authored Dec 24, 2024
1 parent e613b59 commit 2002c21
Show file tree
Hide file tree
Showing 38 changed files with 326 additions and 82 deletions.
16 changes: 14 additions & 2 deletions src/generated/resources/assets/c/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"tag.block.c.fence_gates": "Fence Gates",
"tag.block.c.fence_gates.wooden": "Wooden Fence Gates",
"tag.block.c.fences": "Fences",
"tag.block.c.fences.nether_brick": "Fences Nether Brick",
"tag.block.c.fences.nether_brick": "Nether Brick Fences",
"tag.block.c.fences.wooden": "Wooden Fences",
"tag.block.c.glass_blocks": "Glass Blocks",
"tag.block.c.glass_blocks.cheap": "Silica Glass Blocks",
Expand Down Expand Up @@ -108,6 +108,7 @@
"tag.block.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks",
"tag.block.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks",
"tag.block.c.storage_blocks.redstone": "Redstone Storage Blocks",
"tag.block.c.storage_blocks.resin": "Resin Storage Blocks",
"tag.block.c.storage_blocks.slime": "Slime Storage Blocks",
"tag.block.c.storage_blocks.wheat": "Wheat Storage Blocks",
"tag.block.c.stripped_logs": "Stripped Logs",
Expand Down Expand Up @@ -150,6 +151,7 @@
"tag.item.c.bricks": "Bricks",
"tag.item.c.bricks.nether": "Nether Bricks",
"tag.item.c.bricks.normal": "Normal Bricks",
"tag.item.c.bricks.resin": "Resin Bricks",
"tag.item.c.buckets": "Buckets",
"tag.item.c.buckets.empty": "Empty Buckets",
"tag.item.c.buckets.entity_water": "Water Entity Buckets",
Expand All @@ -164,6 +166,8 @@
"tag.item.c.chests.ender": "Ender Chests",
"tag.item.c.chests.trapped": "Trapped Chests",
"tag.item.c.chests.wooden": "Wooden Chests",
"tag.item.c.clumps": "Clumps",
"tag.item.c.clumps.resin": "Resin Clumps",
"tag.item.c.clusters": "Clusters",
"tag.item.c.cobblestones": "Cobblestones",
"tag.item.c.cobblestones.deepslate": "Deepslate Cobblestones",
Expand Down Expand Up @@ -302,6 +306,8 @@
"tag.item.c.ores_in_ground.stone": "Stone Ores In Ground",
"tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
"tag.item.c.player_workstations.furnaces": "Furnaces",
"tag.item.c.potions": "Potions",
"tag.item.c.potions.bottle": "Bottled Potions",
"tag.item.c.raw_materials": "Raw Materials",
"tag.item.c.raw_materials.copper": "Copper Raw Materials",
"tag.item.c.raw_materials.gold": "Gold Raw Materials",
Expand All @@ -327,6 +333,7 @@
"tag.item.c.seeds.beetroot": "Beetroot Seeds",
"tag.item.c.seeds.melon": "Melon Seeds",
"tag.item.c.seeds.pumpkin": "Pumpkin Seeds",
"tag.item.c.seeds.torchflower": "Torchflower Seeds",
"tag.item.c.seeds.wheat": "Wheat Seeds",
"tag.item.c.shulker_boxes": "Shulker Boxes",
"tag.item.c.slime_balls": "Slimeballs",
Expand All @@ -346,6 +353,7 @@
"tag.item.c.storage_blocks.raw_gold": "Raw Gold Storage Blocks",
"tag.item.c.storage_blocks.raw_iron": "Raw Iron Storage Blocks",
"tag.item.c.storage_blocks.redstone": "Redstone Storage Blocks",
"tag.item.c.storage_blocks.resin": "Resin Storage Blocks",
"tag.item.c.storage_blocks.slime": "Slime Storage Blocks",
"tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks",
"tag.item.c.strings": "Strings",
Expand Down Expand Up @@ -413,7 +421,7 @@
"tag.worldgen.biome.c.is_outer_end_island": "Outer End Island",
"tag.worldgen.biome.c.is_overworld": "Is Overworld",
"tag.worldgen.biome.c.is_plains": "Plains",
"tag.worldgen.biome.c.is_plateau": "Plateaus",
"tag.worldgen.biome.c.is_plateau": "Plateau",
"tag.worldgen.biome.c.is_rare": "Rare",
"tag.worldgen.biome.c.is_river": "River",
"tag.worldgen.biome.c.is_sandy": "Sandy",
Expand All @@ -429,6 +437,10 @@
"tag.worldgen.biome.c.is_stony_shores": "Stony Shores",
"tag.worldgen.biome.c.is_swamp": "Swamps",
"tag.worldgen.biome.c.is_taiga": "Taiga",
"tag.worldgen.biome.c.is_temperate": "Temperate",
"tag.worldgen.biome.c.is_temperate.end": "Temperate End",
"tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether",
"tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld",
"tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Trees",
"tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Trees",
"tag.worldgen.biome.c.is_tree.jungle": "Jungle Trees",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"#c:storage_blocks/raw_gold",
"#c:storage_blocks/raw_iron",
"#c:storage_blocks/redstone",
"#c:storage_blocks/resin",
"#c:storage_blocks/slime",
"#c:storage_blocks/wheat",
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_block"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"minecraft:stripped_jungle_log",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_oak_log",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_spruce_log",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_warped_stem"
Expand Down
5 changes: 3 additions & 2 deletions src/generated/resources/data/c/tags/block/stripped_woods.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_crimson_hyphae"
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_warped_hyphae"
]
}
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/entity_type/boats.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"minecraft:jungle_chest_boat",
"minecraft:acacia_chest_boat",
"minecraft:cherry_chest_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:mangrove_chest_boat",
"minecraft:bamboo_chest_raft",
Expand Down
3 changes: 2 additions & 1 deletion src/generated/resources/data/c/tags/item/bricks.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"#c:bricks/normal",
"#c:bricks/nether"
"#c:bricks/nether",
"#c:bricks/resin"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/bricks/resin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_brick"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/clumps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#c:clumps/resin"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/clumps/resin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_clump"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/potions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#c:potions/bottle"
]
}
7 changes: 7 additions & 0 deletions src/generated/resources/data/c/tags/item/potions/bottle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"minecraft:potion",
"minecraft:splash_potion",
"minecraft:lingering_potion"
]
}
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/seeds.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"#c:seeds/beetroot",
"#c:seeds/melon",
"#c:seeds/pumpkin",
"#c:seeds/torchflower",
"#c:seeds/wheat",
{
"id": "#forge:seeds",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:torchflower_seeds"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"#c:storage_blocks/raw_gold",
"#c:storage_blocks/raw_iron",
"#c:storage_blocks/redstone",
"#c:storage_blocks/resin",
"#c:storage_blocks/slime",
"#c:storage_blocks/wheat",
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:resin_block"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"minecraft:stripped_jungle_log",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_oak_log",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_spruce_log",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_warped_stem"
Expand Down
5 changes: 3 additions & 2 deletions src/generated/resources/data/c/tags/item/stripped_woods.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_wood",
"minecraft:stripped_pale_oak_wood",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_crimson_hyphae"
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_warped_hyphae"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"values": [
"#c:is_cold/overworld",
{
"id": "#c:is_cold/nether",
"required": false
},
"#c:is_cold/nether",
"#c:is_cold/end",
{
"id": "#forge:is_cold",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:dark_forest",
"minecraft:pale_garden"
]
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_dense_vegetation/overworld",
{
"id": "#c:is_dense_vegetation/nether",
"required": false
},
{
"id": "#c:is_dense_vegetation/end",
"required": false
},
"#c:is_dense_vegetation/nether",
"#c:is_dense_vegetation/end",
{
"id": "#forge:is_dense",
"required": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"values": [
"#c:is_hot/overworld",
"#c:is_hot/nether",
{
"id": "#c:is_hot/end",
"required": false
},
"#c:is_hot/end",
{
"id": "#forge:is_hot",
"required": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"values": [
"minecraft:swamp",
"minecraft:mangrove_swamp",
"minecraft:jungle",
"minecraft:bamboo_jungle",
"minecraft:sparse_jungle",
Expand All @@ -13,6 +11,7 @@
"minecraft:savanna_plateau",
"minecraft:windswept_savanna",
"minecraft:stony_peaks",
"minecraft:mushroom_fields",
"minecraft:warm_ocean",
{
"id": "#forge:is_hot/overworld",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:windswept_savanna",
"minecraft:ice_spikes",
"minecraft:windswept_gravelly_hills",
"minecraft:pale_garden",
"minecraft:mushroom_fields",
"minecraft:deep_dark",
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_sparse_vegetation/overworld",
{
"id": "#c:is_sparse_vegetation/nether",
"required": false
},
{
"id": "#c:is_sparse_vegetation/end",
"required": false
},
"#c:is_sparse_vegetation/nether",
"#c:is_sparse_vegetation/end",
{
"id": "#forge:is_sparse_vegetation",
"required": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"minecraft:dark_forest",
"minecraft:pale_garden",
"minecraft:deep_dark",
{
"id": "#forge:is_spooky",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"#c:is_temperate/overworld",
"#c:is_temperate/nether",
"#c:is_temperate/end"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"values": [
"minecraft:plains",
"minecraft:sunflower_plains",
"minecraft:forest",
"minecraft:flower_forest",
"minecraft:birch_forest",
"minecraft:old_growth_birch_forest",
"minecraft:dark_forest",
"minecraft:cherry_grove",
"minecraft:meadow",
"minecraft:swamp",
"minecraft:mangrove_swamp",
"minecraft:beach",
"minecraft:ocean",
"minecraft:deep_ocean"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"minecraft:forest",
"minecraft:flower_forest",
"minecraft:birch_forest",
"minecraft:dark_forest",
"minecraft:old_growth_birch_forest",
"minecraft:dark_forest",
"minecraft:pale_garden",
"minecraft:windswept_forest"
]
}
10 changes: 2 additions & 8 deletions src/generated/resources/data/c/tags/worldgen/biome/is_wet.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"values": [
"#c:is_wet/overworld",
{
"id": "#c:is_wet/nether",
"required": false
},
{
"id": "#c:is_wet/end",
"required": false
},
"#c:is_wet/nether",
"#c:is_wet/end",
{
"id": "#forge:is_wet",
"required": false
Expand Down
Loading

0 comments on commit 2002c21

Please sign in to comment.