Skip to content

Commit 4a63239

Browse files
Update C tags to include 26.2 content (#3251)
1 parent acb0836 commit 4a63239

10 files changed

Lines changed: 21 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
"tag.item.c.bricks.resin": "Resin Bricks",
180180
"tag.item.c.buckets": "Buckets",
181181
"tag.item.c.buckets.empty": "Empty Buckets",
182+
"tag.item.c.buckets.entity_dry": "Dry Entity Buckets",
182183
"tag.item.c.buckets.entity_water": "Water Entity Buckets",
183184
"tag.item.c.buckets.lava": "Lava Buckets",
184185
"tag.item.c.buckets.milk": "Milk Buckets",

src/generated/resources/data/c/tags/item/buckets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"#c:buckets/lava",
66
"#c:buckets/milk",
77
"#c:buckets/powder_snow",
8-
"#c:buckets/entity_water"
8+
"#c:buckets/entity_water",
9+
"#c:buckets/entity_dry"
910
]
1011
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:sulfur_cube_bucket"
4+
]
5+
}

src/generated/resources/data/c/tags/item/music_discs.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"minecraft:music_disc_creator_music_box",
2121
"minecraft:music_disc_precipice",
2222
"minecraft:music_disc_tears",
23-
"minecraft:music_disc_lava_chicken"
23+
"minecraft:music_disc_lava_chicken",
24+
"minecraft:music_disc_bounce"
2425
]
2526
}

src/generated/resources/data/c/tags/worldgen/biome/is_cave.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"values": [
33
"minecraft:lush_caves",
44
"minecraft:dripstone_caves",
5+
"minecraft:sulfur_caves",
56
"minecraft:deep_dark"
67
]
78
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"minecraft:sparse_jungle",
88
"minecraft:beach",
99
"minecraft:lush_caves",
10-
"minecraft:dripstone_caves"
10+
"minecraft:dripstone_caves",
11+
"minecraft:sulfur_caves"
1112
]
1213
}

src/main/java/net/neoforged/neoforge/common/Tags.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ public static class Items {
416416
public static final TagKey<Item> BUCKETS_MILK = tag("buckets/milk");
417417
public static final TagKey<Item> BUCKETS_POWDER_SNOW = tag("buckets/powder_snow");
418418
public static final TagKey<Item> BUCKETS_ENTITY_WATER = tag("buckets/entity_water");
419+
public static final TagKey<Item> BUCKETS_ENTITY_DRY = tag("buckets/entity_dry");
419420
/**
420421
* For blocks that are similar to amethyst where their budding block produces buds and cluster blocks
421422
*/

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
139139
.add(Biomes.SPARSE_JUNGLE)
140140
.add(Biomes.BEACH)
141141
.add(Biomes.LUSH_CAVES)
142-
.add(Biomes.DRIPSTONE_CAVES);
142+
.add(Biomes.DRIPSTONE_CAVES)
143+
.add(Biomes.SULFUR_CAVES);
143144
tag(Tags.Biomes.IS_WET_NETHER);
144145
tag(Tags.Biomes.IS_WET_END);
145146
tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addTag(Tags.Biomes.IS_WET_NETHER).addTag(Tags.Biomes.IS_WET_END);
@@ -261,7 +262,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
261262
tag(Tags.Biomes.IS_AQUATIC_ICY).add(Biomes.FROZEN_RIVER, Biomes.DEEP_FROZEN_OCEAN, Biomes.FROZEN_OCEAN);
262263
tag(Tags.Biomes.IS_AQUATIC).addTag(Tags.Biomes.IS_OCEAN).addTag(Tags.Biomes.IS_RIVER);
263264

264-
tag(Tags.Biomes.IS_CAVE).add(Biomes.LUSH_CAVES, Biomes.DRIPSTONE_CAVES, Biomes.DEEP_DARK);
265+
tag(Tags.Biomes.IS_CAVE).add(Biomes.LUSH_CAVES, Biomes.DRIPSTONE_CAVES, Biomes.SULFUR_CAVES, Biomes.DEEP_DARK);
265266
tag(Tags.Biomes.IS_UNDERGROUND).addTag(Tags.Biomes.IS_CAVE);
266267

267268
tag(Tags.Biomes.IS_NETHER_FOREST).add(Biomes.CRIMSON_FOREST, Biomes.WARPED_FOREST);

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public void addTags(HolderLookup.Provider lookupProvider) {
4949
tag(Tags.Items.BUCKETS_MILK).add(Items.MILK_BUCKET);
5050
tag(Tags.Items.BUCKETS_POWDER_SNOW).add(Items.POWDER_SNOW_BUCKET);
5151
tag(Tags.Items.BUCKETS_ENTITY_WATER).add(Items.AXOLOTL_BUCKET, Items.COD_BUCKET, Items.PUFFERFISH_BUCKET, Items.TADPOLE_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.SALMON_BUCKET);
52-
tag(Tags.Items.BUCKETS).addTags(Tags.Items.BUCKETS_EMPTY, Tags.Items.BUCKETS_WATER, Tags.Items.BUCKETS_LAVA, Tags.Items.BUCKETS_MILK, Tags.Items.BUCKETS_POWDER_SNOW, Tags.Items.BUCKETS_ENTITY_WATER);
52+
tag(Tags.Items.BUCKETS_ENTITY_DRY).add(Items.SULFUR_CUBE_BUCKET);
53+
tag(Tags.Items.BUCKETS).addTags(Tags.Items.BUCKETS_EMPTY, Tags.Items.BUCKETS_WATER, Tags.Items.BUCKETS_LAVA, Tags.Items.BUCKETS_MILK, Tags.Items.BUCKETS_POWDER_SNOW, Tags.Items.BUCKETS_ENTITY_WATER, Tags.Items.BUCKETS_ENTITY_DRY);
5354
copy(Tags.Blocks.BUDDING_BLOCKS, Tags.Items.BUDDING_BLOCKS);
5455
copy(Tags.Blocks.BUDS, Tags.Items.BUDS);
5556
copy(Tags.Blocks.CHAINS, Tags.Items.CHAINS);
@@ -186,7 +187,7 @@ public void addTags(HolderLookup.Provider lookupProvider) {
186187
Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD,
187188
Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT, Items.MUSIC_DISC_OTHERSIDE, Items.MUSIC_DISC_5, Items.MUSIC_DISC_PIGSTEP,
188189
Items.MUSIC_DISC_RELIC, Items.MUSIC_DISC_CREATOR, Items.MUSIC_DISC_CREATOR_MUSIC_BOX, Items.MUSIC_DISC_PRECIPICE,
189-
Items.MUSIC_DISC_TEARS, Items.MUSIC_DISC_LAVA_CHICKEN);
190+
Items.MUSIC_DISC_TEARS, Items.MUSIC_DISC_LAVA_CHICKEN, Items.MUSIC_DISC_BOUNCE);
190191
tag(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR);
191192
copy(Tags.Blocks.NETHERRACKS, Tags.Items.NETHERRACKS);
192193
tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_COPPER, Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD);

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ protected void addTranslations() {
166166
add(Tags.Items.BUCKETS_MILK, "Milk Buckets");
167167
add(Tags.Items.BUCKETS_POWDER_SNOW, "Powder Snow Buckets");
168168
add(Tags.Items.BUCKETS_ENTITY_WATER, "Water Entity Buckets");
169+
add(Tags.Items.BUCKETS_ENTITY_DRY, "Dry Entity Buckets");
169170
add(Tags.Items.BUDDING_BLOCKS, "Budding Blocks");
170171
add(Tags.Items.BUDS, "Buds");
171172
add(Tags.Items.CHAINS, "Chains");

0 commit comments

Comments
 (0)