Skip to content

Commit a71b70c

Browse files
gabizougabizou
committed
feat(minecraft): update features for 26.1-pre-2
Removes redundant feature types and adds newly introduced ones. See: https://minecraft.wiki/w/Java_Edition_26.1_Pre-Release_2
1 parent cca781f commit a71b70c

File tree

2 files changed

+42
-54
lines changed

2 files changed

+42
-54
lines changed

‎src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ public final class FeatureTypes {
8484

8585
public static final DefaultedRegistryReference<FeatureType> FILL_LAYER = FeatureTypes.key(ResourceKey.minecraft("fill_layer"));
8686

87-
public static final DefaultedRegistryReference<FeatureType> FLOWER = FeatureTypes.key(ResourceKey.minecraft("flower"));
88-
8987
public static final DefaultedRegistryReference<FeatureType> FOSSIL = FeatureTypes.key(ResourceKey.minecraft("fossil"));
9088

9189
public static final DefaultedRegistryReference<FeatureType> FREEZE_TOP_LAYER = FeatureTypes.key(ResourceKey.minecraft("freeze_top_layer"));
@@ -116,8 +114,6 @@ public final class FeatureTypes {
116114

117115
public static final DefaultedRegistryReference<FeatureType> NETHER_FOREST_VEGETATION = FeatureTypes.key(ResourceKey.minecraft("nether_forest_vegetation"));
118116

119-
public static final DefaultedRegistryReference<FeatureType> NO_BONEMEAL_FLOWER = FeatureTypes.key(ResourceKey.minecraft("no_bonemeal_flower"));
120-
121117
public static final DefaultedRegistryReference<FeatureType> NO_OP = FeatureTypes.key(ResourceKey.minecraft("no_op"));
122118

123119
public static final DefaultedRegistryReference<FeatureType> ORE = FeatureTypes.key(ResourceKey.minecraft("ore"));
@@ -126,8 +122,6 @@ public final class FeatureTypes {
126122

127123
public static final DefaultedRegistryReference<FeatureType> RANDOM_BOOLEAN_SELECTOR = FeatureTypes.key(ResourceKey.minecraft("random_boolean_selector"));
128124

129-
public static final DefaultedRegistryReference<FeatureType> RANDOM_PATCH = FeatureTypes.key(ResourceKey.minecraft("random_patch"));
130-
131125
public static final DefaultedRegistryReference<FeatureType> RANDOM_SELECTOR = FeatureTypes.key(ResourceKey.minecraft("random_selector"));
132126

133127
public static final DefaultedRegistryReference<FeatureType> REPLACE_SINGLE_BLOCK = FeatureTypes.key(ResourceKey.minecraft("replace_single_block"));

‎src/main/java/org/spongepowered/api/world/generation/feature/Features.java‎

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public final class Features {
5656

5757
public static final DefaultedRegistryReference<Feature> BASALT_PILLAR = Features.key(ResourceKey.minecraft("basalt_pillar"));
5858

59+
public static final DefaultedRegistryReference<Feature> BERRY_BUSH = Features.key(ResourceKey.minecraft("berry_bush"));
60+
5961
public static final DefaultedRegistryReference<Feature> BIRCH = Features.key(ResourceKey.minecraft("birch"));
6062

6163
public static final DefaultedRegistryReference<Feature> BIRCH_BEES_0002 = Features.key(ResourceKey.minecraft("birch_bees_0002"));
@@ -76,6 +78,12 @@ public final class Features {
7678

7779
public static final DefaultedRegistryReference<Feature> BONUS_CHEST = Features.key(ResourceKey.minecraft("bonus_chest"));
7880

81+
public static final DefaultedRegistryReference<Feature> BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("brown_mushroom"));
82+
83+
public static final DefaultedRegistryReference<Feature> BUSH = Features.key(ResourceKey.minecraft("bush"));
84+
85+
public static final DefaultedRegistryReference<Feature> CACTUS = Features.key(ResourceKey.minecraft("cactus"));
86+
7987
public static final DefaultedRegistryReference<Feature> CAVE_VINE = Features.key(ResourceKey.minecraft("cave_vine"));
8088

8189
public static final DefaultedRegistryReference<Feature> CAVE_VINE_IN_MOSS = Features.key(ResourceKey.minecraft("cave_vine_in_moss"));
@@ -98,12 +106,16 @@ public final class Features {
98106

99107
public static final DefaultedRegistryReference<Feature> CRIMSON_FUNGUS_PLANTED = Features.key(ResourceKey.minecraft("crimson_fungus_planted"));
100108

109+
public static final DefaultedRegistryReference<Feature> CRIMSON_ROOTS = Features.key(ResourceKey.minecraft("crimson_roots"));
110+
101111
public static final DefaultedRegistryReference<Feature> DARK_FOREST_VEGETATION = Features.key(ResourceKey.minecraft("dark_forest_vegetation"));
102112

103113
public static final DefaultedRegistryReference<Feature> DARK_OAK = Features.key(ResourceKey.minecraft("dark_oak"));
104114

105115
public static final DefaultedRegistryReference<Feature> DARK_OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("dark_oak_leaf_litter"));
106116

117+
public static final DefaultedRegistryReference<Feature> DEAD_BUSH = Features.key(ResourceKey.minecraft("dead_bush"));
118+
107119
public static final DefaultedRegistryReference<Feature> DELTA = Features.key(ResourceKey.minecraft("delta"));
108120

109121
public static final DefaultedRegistryReference<Feature> DESERT_WELL = Features.key(ResourceKey.minecraft("desert_well"));
@@ -120,6 +132,8 @@ public final class Features {
120132

121133
public static final DefaultedRegistryReference<Feature> DRIPSTONE_CLUSTER = Features.key(ResourceKey.minecraft("dripstone_cluster"));
122134

135+
public static final DefaultedRegistryReference<Feature> DRY_GRASS = Features.key(ResourceKey.minecraft("dry_grass"));
136+
123137
public static final DefaultedRegistryReference<Feature> END_GATEWAY_DELAYED = Features.key(ResourceKey.minecraft("end_gateway_delayed"));
124138

125139
public static final DefaultedRegistryReference<Feature> END_GATEWAY_RETURN = Features.key(ResourceKey.minecraft("end_gateway_return"));
@@ -152,6 +166,8 @@ public final class Features {
152166

153167
public static final DefaultedRegistryReference<Feature> FANCY_OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("fancy_oak_leaf_litter"));
154168

169+
public static final DefaultedRegistryReference<Feature> FIREFLY_BUSH = Features.key(ResourceKey.minecraft("firefly_bush"));
170+
155171
public static final DefaultedRegistryReference<Feature> FLOWER_CHERRY = Features.key(ResourceKey.minecraft("flower_cherry"));
156172

157173
public static final DefaultedRegistryReference<Feature> FLOWER_DEFAULT = Features.key(ResourceKey.minecraft("flower_default"));
@@ -180,6 +196,10 @@ public final class Features {
180196

181197
public static final DefaultedRegistryReference<Feature> GLOW_LICHEN = Features.key(ResourceKey.minecraft("glow_lichen"));
182198

199+
public static final DefaultedRegistryReference<Feature> GRASS = Features.key(ResourceKey.minecraft("grass"));
200+
201+
public static final DefaultedRegistryReference<Feature> GRASS_JUNGLE = Features.key(ResourceKey.minecraft("grass_jungle"));
202+
183203
public static final DefaultedRegistryReference<Feature> HUGE_BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("huge_brown_mushroom"));
184204

185205
public static final DefaultedRegistryReference<Feature> HUGE_RED_MUSHROOM = Features.key(ResourceKey.minecraft("huge_red_mushroom"));
@@ -206,6 +226,10 @@ public final class Features {
206226

207227
public static final DefaultedRegistryReference<Feature> LARGE_DRIPSTONE = Features.key(ResourceKey.minecraft("large_dripstone"));
208228

229+
public static final DefaultedRegistryReference<Feature> LARGE_FERN = Features.key(ResourceKey.minecraft("large_fern"));
230+
231+
public static final DefaultedRegistryReference<Feature> LEAF_LITTER = Features.key(ResourceKey.minecraft("leaf_litter"));
232+
209233
public static final DefaultedRegistryReference<Feature> LUSH_CAVES_CLAY = Features.key(ResourceKey.minecraft("lush_caves_clay"));
210234

211235
public static final DefaultedRegistryReference<Feature> MANGROVE = Features.key(ResourceKey.minecraft("mangrove"));
@@ -220,6 +244,8 @@ public final class Features {
220244

221245
public static final DefaultedRegistryReference<Feature> MEGA_SPRUCE = Features.key(ResourceKey.minecraft("mega_spruce"));
222246

247+
public static final DefaultedRegistryReference<Feature> MELON = Features.key(ResourceKey.minecraft("melon"));
248+
223249
public static final DefaultedRegistryReference<Feature> MONSTER_ROOM = Features.key(ResourceKey.minecraft("monster_room"));
224250

225251
public static final DefaultedRegistryReference<Feature> MOSS_PATCH = Features.key(ResourceKey.minecraft("moss_patch"));
@@ -310,7 +336,7 @@ public final class Features {
310336

311337
public static final DefaultedRegistryReference<Feature> ORE_TUFF = Features.key(ResourceKey.minecraft("ore_tuff"));
312338

313-
public static final DefaultedRegistryReference<Feature> PALE_FOREST_FLOWERS = Features.key(ResourceKey.minecraft("pale_forest_flowers"));
339+
public static final DefaultedRegistryReference<Feature> PALE_FOREST_FLOWER = Features.key(ResourceKey.minecraft("pale_forest_flower"));
314340

315341
public static final DefaultedRegistryReference<Feature> PALE_GARDEN_VEGETATION = Features.key(ResourceKey.minecraft("pale_garden_vegetation"));
316342

@@ -326,52 +352,10 @@ public final class Features {
326352

327353
public static final DefaultedRegistryReference<Feature> PALE_OAK_CREAKING = Features.key(ResourceKey.minecraft("pale_oak_creaking"));
328354

329-
public static final DefaultedRegistryReference<Feature> PATCH_BERRY_BUSH = Features.key(ResourceKey.minecraft("patch_berry_bush"));
330-
331-
public static final DefaultedRegistryReference<Feature> PATCH_BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("patch_brown_mushroom"));
332-
333-
public static final DefaultedRegistryReference<Feature> PATCH_BUSH = Features.key(ResourceKey.minecraft("patch_bush"));
334-
335-
public static final DefaultedRegistryReference<Feature> PATCH_CACTUS = Features.key(ResourceKey.minecraft("patch_cactus"));
336-
337-
public static final DefaultedRegistryReference<Feature> PATCH_CRIMSON_ROOTS = Features.key(ResourceKey.minecraft("patch_crimson_roots"));
338-
339-
public static final DefaultedRegistryReference<Feature> PATCH_DEAD_BUSH = Features.key(ResourceKey.minecraft("patch_dead_bush"));
340-
341-
public static final DefaultedRegistryReference<Feature> PATCH_DRY_GRASS = Features.key(ResourceKey.minecraft("patch_dry_grass"));
342-
343355
public static final DefaultedRegistryReference<Feature> PATCH_FIRE = Features.key(ResourceKey.minecraft("patch_fire"));
344356

345-
public static final DefaultedRegistryReference<Feature> PATCH_FIREFLY_BUSH = Features.key(ResourceKey.minecraft("patch_firefly_bush"));
346-
347-
public static final DefaultedRegistryReference<Feature> PATCH_GRASS = Features.key(ResourceKey.minecraft("patch_grass"));
348-
349-
public static final DefaultedRegistryReference<Feature> PATCH_GRASS_JUNGLE = Features.key(ResourceKey.minecraft("patch_grass_jungle"));
350-
351-
public static final DefaultedRegistryReference<Feature> PATCH_GRASS_MEADOW = Features.key(ResourceKey.minecraft("patch_grass_meadow"));
352-
353-
public static final DefaultedRegistryReference<Feature> PATCH_LARGE_FERN = Features.key(ResourceKey.minecraft("patch_large_fern"));
354-
355-
public static final DefaultedRegistryReference<Feature> PATCH_LEAF_LITTER = Features.key(ResourceKey.minecraft("patch_leaf_litter"));
356-
357-
public static final DefaultedRegistryReference<Feature> PATCH_MELON = Features.key(ResourceKey.minecraft("patch_melon"));
358-
359-
public static final DefaultedRegistryReference<Feature> PATCH_PUMPKIN = Features.key(ResourceKey.minecraft("patch_pumpkin"));
360-
361-
public static final DefaultedRegistryReference<Feature> PATCH_RED_MUSHROOM = Features.key(ResourceKey.minecraft("patch_red_mushroom"));
362-
363357
public static final DefaultedRegistryReference<Feature> PATCH_SOUL_FIRE = Features.key(ResourceKey.minecraft("patch_soul_fire"));
364358

365-
public static final DefaultedRegistryReference<Feature> PATCH_SUGAR_CANE = Features.key(ResourceKey.minecraft("patch_sugar_cane"));
366-
367-
public static final DefaultedRegistryReference<Feature> PATCH_SUNFLOWER = Features.key(ResourceKey.minecraft("patch_sunflower"));
368-
369-
public static final DefaultedRegistryReference<Feature> PATCH_TAIGA_GRASS = Features.key(ResourceKey.minecraft("patch_taiga_grass"));
370-
371-
public static final DefaultedRegistryReference<Feature> PATCH_TALL_GRASS = Features.key(ResourceKey.minecraft("patch_tall_grass"));
372-
373-
public static final DefaultedRegistryReference<Feature> PATCH_WATERLILY = Features.key(ResourceKey.minecraft("patch_waterlily"));
374-
375359
public static final DefaultedRegistryReference<Feature> PILE_HAY = Features.key(ResourceKey.minecraft("pile_hay"));
376360

377361
public static final DefaultedRegistryReference<Feature> PILE_ICE = Features.key(ResourceKey.minecraft("pile_ice"));
@@ -386,6 +370,10 @@ public final class Features {
386370

387371
public static final DefaultedRegistryReference<Feature> POINTED_DRIPSTONE = Features.key(ResourceKey.minecraft("pointed_dripstone"));
388372

373+
public static final DefaultedRegistryReference<Feature> PUMPKIN = Features.key(ResourceKey.minecraft("pumpkin"));
374+
375+
public static final DefaultedRegistryReference<Feature> RED_MUSHROOM = Features.key(ResourceKey.minecraft("red_mushroom"));
376+
389377
public static final DefaultedRegistryReference<Feature> ROOTED_AZALEA_TREE = Features.key(ResourceKey.minecraft("rooted_azalea_tree"));
390378

391379
public static final DefaultedRegistryReference<Feature> SCULK_PATCH_ANCIENT_CITY = Features.key(ResourceKey.minecraft("sculk_patch_ancient_city"));
@@ -404,8 +392,6 @@ public final class Features {
404392

405393
public static final DefaultedRegistryReference<Feature> SEA_PICKLE = Features.key(ResourceKey.minecraft("sea_pickle"));
406394

407-
public static final DefaultedRegistryReference<Feature> SINGLE_PIECE_OF_GRASS = Features.key(ResourceKey.minecraft("single_piece_of_grass"));
408-
409395
public static final DefaultedRegistryReference<Feature> SMALL_BASALT_COLUMNS = Features.key(ResourceKey.minecraft("small_basalt_columns"));
410396

411397
public static final DefaultedRegistryReference<Feature> SPORE_BLOSSOM = Features.key(ResourceKey.minecraft("spore_blossom"));
@@ -424,12 +410,20 @@ public final class Features {
424410

425411
public static final DefaultedRegistryReference<Feature> SPRUCE = Features.key(ResourceKey.minecraft("spruce"));
426412

413+
public static final DefaultedRegistryReference<Feature> SUGAR_CANE = Features.key(ResourceKey.minecraft("sugar_cane"));
414+
415+
public static final DefaultedRegistryReference<Feature> SUNFLOWER = Features.key(ResourceKey.minecraft("sunflower"));
416+
427417
public static final DefaultedRegistryReference<Feature> SUPER_BIRCH_BEES = Features.key(ResourceKey.minecraft("super_birch_bees"));
428418

429419
public static final DefaultedRegistryReference<Feature> SUPER_BIRCH_BEES_0002 = Features.key(ResourceKey.minecraft("super_birch_bees_0002"));
430420

431421
public static final DefaultedRegistryReference<Feature> SWAMP_OAK = Features.key(ResourceKey.minecraft("swamp_oak"));
432422

423+
public static final DefaultedRegistryReference<Feature> TAIGA_GRASS = Features.key(ResourceKey.minecraft("taiga_grass"));
424+
425+
public static final DefaultedRegistryReference<Feature> TALL_GRASS = Features.key(ResourceKey.minecraft("tall_grass"));
426+
433427
public static final DefaultedRegistryReference<Feature> TALL_MANGROVE = Features.key(ResourceKey.minecraft("tall_mangrove"));
434428

435429
public static final DefaultedRegistryReference<Feature> TREES_BADLANDS = Features.key(ResourceKey.minecraft("trees_badlands"));
@@ -482,11 +476,11 @@ public final class Features {
482476

483477
public static final DefaultedRegistryReference<Feature> WARPED_FUNGUS_PLANTED = Features.key(ResourceKey.minecraft("warped_fungus_planted"));
484478

485-
public static final DefaultedRegistryReference<Feature> WEEPING_VINES = Features.key(ResourceKey.minecraft("weeping_vines"));
479+
public static final DefaultedRegistryReference<Feature> WATERLILY = Features.key(ResourceKey.minecraft("waterlily"));
486480

487-
public static final DefaultedRegistryReference<Feature> WILDFLOWERS_BIRCH_FOREST = Features.key(ResourceKey.minecraft("wildflowers_birch_forest"));
481+
public static final DefaultedRegistryReference<Feature> WEEPING_VINES = Features.key(ResourceKey.minecraft("weeping_vines"));
488482

489-
public static final DefaultedRegistryReference<Feature> WILDFLOWERS_MEADOW = Features.key(ResourceKey.minecraft("wildflowers_meadow"));
483+
public static final DefaultedRegistryReference<Feature> WILDFLOWER = Features.key(ResourceKey.minecraft("wildflower"));
490484

491485
private Features() {
492486
}

0 commit comments

Comments
 (0)