Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21.4] Sync remaining c tags from Fabric side #1628

Merged
merged 32 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
22d2cfb
Sync with fabric tags
TelepathicGrunt Oct 13, 2024
3b2ebd2
Add torchflower seeds tag
TelepathicGrunt Oct 13, 2024
671174c
Improved the javadoc for ore rates
TelepathicGrunt Oct 13, 2024
6288029
add mushrooms javadoc
TelepathicGrunt Oct 13, 2024
828782a
added seeds javadoc
TelepathicGrunt Oct 13, 2024
3593e39
addsparse and dense vegetation javadoc
TelepathicGrunt Oct 13, 2024
7f08d7a
Added lush javadoc
TelepathicGrunt Oct 13, 2024
a3d60a1
Added magical javadoc
TelepathicGrunt Oct 13, 2024
3d0a53a
Added rare javadoc
TelepathicGrunt Oct 13, 2024
72e677f
plateau javadoc
TelepathicGrunt Oct 13, 2024
1be0da6
Deprecate is modified tag for removal in future
TelepathicGrunt Oct 13, 2024
8182d6e
Added spooky javadoc
TelepathicGrunt Oct 13, 2024
a2e06c7
more javadoc and fixed biomes in temperature tag
TelepathicGrunt Oct 14, 2024
cbb4cbb
fixed typo in biome temperature tag javadoc
TelepathicGrunt Oct 14, 2024
1b63348
attempt 2 at potion tag javadoc
TelepathicGrunt Oct 14, 2024
2b7215c
Add bottled potion subtag
TelepathicGrunt Oct 14, 2024
bfeefc5
Datagen biome temperature fix
TelepathicGrunt Oct 14, 2024
c2c0507
Improved potion javadoc more
TelepathicGrunt Oct 14, 2024
87bccd6
Changed potion verb to noun
TelepathicGrunt Oct 14, 2024
2d3ec4b
Improve potion javadoc to mention data component
TelepathicGrunt Oct 14, 2024
c666f78
Merge branch '1.21.x' into SyncToFabricTags2
TelepathicGrunt Dec 12, 2024
0892660
Added 1.21.4 tags from fabric
TelepathicGrunt Dec 13, 2024
e108804
Added missing pale wood stuff in tags
TelepathicGrunt Dec 13, 2024
6553f2c
Merge branch '1.21.x' into SyncToFabricTags2
TelepathicGrunt Dec 13, 2024
df6f7fd
adjust resin tag name
TelepathicGrunt Dec 13, 2024
603e405
Bottled Potions
TelepathicGrunt Dec 13, 2024
03094bb
Bottled Potions datagen
TelepathicGrunt Dec 13, 2024
1bc3f63
Update src/main/java/net/neoforged/neoforge/common/Tags.java
TelepathicGrunt Dec 15, 2024
31cae73
fix build and address nether brick fence lang
TelepathicGrunt Dec 15, 2024
f582e8b
singular plateau translation
TelepathicGrunt Dec 15, 2024
3fea4f1
improve javadoc to be clear on tag name for ore bearing and or in tags
TelepathicGrunt Dec 15, 2024
62cde00
Merge branch '1.21.x' into SyncToFabricTags2
TelepathicGrunt Dec 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading