Skip to content

Commit 216db8d

Browse files
gabizougabizou
committed
feat(minecraft): update to 26.3-snapshot-10
Breaking change: - Removed carver ChunkState - Renamed some StructureTags Changes between snapshots: - Campsite map item name changes Additions: - DensityFunctions See: https://minecraft.wiki/w/Java_Edition_26.3_Snapshot_10
1 parent 026b0ff commit 216db8d

6 files changed

Lines changed: 37 additions & 28 deletions

File tree

‎src/main/java/org/spongepowered/api/item/ItemTypes.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@ public final class ItemTypes {
452452

453453
public static final DefaultedRegistryReference<ItemType> BURIED_TREASURE_MAP = ItemTypes.key(ResourceKey.minecraft("buried_treasure_map"));
454454

455+
public static final DefaultedRegistryReference<ItemType> BURIED_TRIAL_CHAMBERS_MAP = ItemTypes.key(ResourceKey.minecraft("buried_trial_chambers_map"));
456+
455457
public static final DefaultedRegistryReference<ItemType> BURN_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("burn_pottery_sherd"));
456458

457459
public static final DefaultedRegistryReference<ItemType> BUSH = ItemTypes.key(ResourceKey.minecraft("bush"));
@@ -1478,8 +1480,6 @@ public final class ItemTypes {
14781480

14791481
public static final DefaultedRegistryReference<ItemType> JUNGLE_DOOR = ItemTypes.key(ResourceKey.minecraft("jungle_door"));
14801482

1481-
public static final DefaultedRegistryReference<ItemType> JUNGLE_EXPLORER_MAP = ItemTypes.key(ResourceKey.minecraft("jungle_explorer_map"));
1482-
14831483
public static final DefaultedRegistryReference<ItemType> JUNGLE_FENCE = ItemTypes.key(ResourceKey.minecraft("jungle_fence"));
14841484

14851485
public static final DefaultedRegistryReference<ItemType> JUNGLE_FENCE_GATE = ItemTypes.key(ResourceKey.minecraft("jungle_fence_gate"));
@@ -1494,6 +1494,8 @@ public final class ItemTypes {
14941494

14951495
public static final DefaultedRegistryReference<ItemType> JUNGLE_PRESSURE_PLATE = ItemTypes.key(ResourceKey.minecraft("jungle_pressure_plate"));
14961496

1497+
public static final DefaultedRegistryReference<ItemType> JUNGLE_PYRAMID_MAP = ItemTypes.key(ResourceKey.minecraft("jungle_pyramid_map"));
1498+
14971499
public static final DefaultedRegistryReference<ItemType> JUNGLE_SAPLING = ItemTypes.key(ResourceKey.minecraft("jungle_sapling"));
14981500

14991501
public static final DefaultedRegistryReference<ItemType> JUNGLE_SHELF = ItemTypes.key(ResourceKey.minecraft("jungle_shelf"));
@@ -1988,7 +1990,7 @@ public final class ItemTypes {
19881990

19891991
public static final DefaultedRegistryReference<ItemType> OBSIDIAN = ItemTypes.key(ResourceKey.minecraft("obsidian"));
19901992

1991-
public static final DefaultedRegistryReference<ItemType> OCEAN_EXPLORER_MAP = ItemTypes.key(ResourceKey.minecraft("ocean_explorer_map"));
1993+
public static final DefaultedRegistryReference<ItemType> OCEAN_MONUMENT_MAP = ItemTypes.key(ResourceKey.minecraft("ocean_monument_map"));
19921994

19931995
public static final DefaultedRegistryReference<ItemType> OCELOT_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("ocelot_spawn_egg"));
19941996

@@ -2906,7 +2908,7 @@ public final class ItemTypes {
29062908

29072909
public static final DefaultedRegistryReference<ItemType> SUSPICIOUS_STEW = ItemTypes.key(ResourceKey.minecraft("suspicious_stew"));
29082910

2909-
public static final DefaultedRegistryReference<ItemType> SWAMP_EXPLORER_MAP = ItemTypes.key(ResourceKey.minecraft("swamp_explorer_map"));
2911+
public static final DefaultedRegistryReference<ItemType> SWAMP_HUT_MAP = ItemTypes.key(ResourceKey.minecraft("swamp_hut_map"));
29102912

29112913
public static final DefaultedRegistryReference<ItemType> SWEET_BERRIES = ItemTypes.key(ResourceKey.minecraft("sweet_berries"));
29122914

@@ -2950,8 +2952,6 @@ public final class ItemTypes {
29502952

29512953
public static final DefaultedRegistryReference<ItemType> TRAPPED_CHEST = ItemTypes.key(ResourceKey.minecraft("trapped_chest"));
29522954

2953-
public static final DefaultedRegistryReference<ItemType> TRIAL_EXPLORER_MAP = ItemTypes.key(ResourceKey.minecraft("trial_explorer_map"));
2954-
29552955
public static final DefaultedRegistryReference<ItemType> TRIAL_KEY = ItemTypes.key(ResourceKey.minecraft("trial_key"));
29562956

29572957
public static final DefaultedRegistryReference<ItemType> TRIAL_SPAWNER = ItemTypes.key(ResourceKey.minecraft("trial_spawner"));
@@ -3294,7 +3294,7 @@ public final class ItemTypes {
32943294

32953295
public static final DefaultedRegistryReference<ItemType> WOODEN_SWORD = ItemTypes.key(ResourceKey.minecraft("wooden_sword"));
32963296

3297-
public static final DefaultedRegistryReference<ItemType> WOODLAND_EXPLORER_MAP = ItemTypes.key(ResourceKey.minecraft("woodland_explorer_map"));
3297+
public static final DefaultedRegistryReference<ItemType> WOODLAND_MANSION_MAP = ItemTypes.key(ResourceKey.minecraft("woodland_mansion_map"));
32983298

32993299
public static final DefaultedRegistryReference<ItemType> WRITABLE_BOOK = ItemTypes.key(ResourceKey.minecraft("writable_book"));
33003300

‎src/main/java/org/spongepowered/api/tag/BlockTypeTags.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public final class BlockTypeTags {
167167

168168
public static final DefaultedTag<BlockType> CONCRETE_STAIRS = BlockTypeTags.key(ResourceKey.minecraft("concrete_stairs"));
169169

170+
public static final DefaultedTag<BlockType> CONDUIT_EFFECT_BLOCK = BlockTypeTags.key(ResourceKey.minecraft("conduit_effect_block"));
171+
170172
public static final DefaultedTag<BlockType> CONVERTIBLE_TO_MUD = BlockTypeTags.key(ResourceKey.minecraft("convertible_to_mud"));
171173

172174
public static final DefaultedTag<BlockType> COPPER = BlockTypeTags.key(ResourceKey.minecraft("copper"));
@@ -365,6 +367,8 @@ public final class BlockTypeTags {
365367

366368
public static final DefaultedTag<BlockType> NEEDS_STONE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_stone_tool"));
367369

370+
public static final DefaultedTag<BlockType> NETHER_PORTAL_FRAME = BlockTypeTags.key(ResourceKey.minecraft("nether_portal_frame"));
371+
368372
public static final DefaultedTag<BlockType> NYLIUM = BlockTypeTags.key(ResourceKey.minecraft("nylium"));
369373

370374
public static final DefaultedTag<BlockType> OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("oak_logs"));

‎src/main/java/org/spongepowered/api/tag/FluidTypeTags.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,16 @@
3737
@RegistryScopes(scopes = RegistryScope.GAME)
3838
public final class FluidTypeTags {
3939

40+
public static final DefaultedTag<FluidType> AXOLOTL_TRIES_TO_FIND = FluidTypeTags.key(ResourceKey.minecraft("axolotl_tries_to_find"));
41+
4042
public static final DefaultedTag<FluidType> BUBBLE_COLUMN_CAN_OCCUPY = FluidTypeTags.key(ResourceKey.minecraft("bubble_column_can_occupy"));
4143

44+
public static final DefaultedTag<FluidType> DOLPHIN_TRIES_TO_FIND = FluidTypeTags.key(ResourceKey.minecraft("dolphin_tries_to_find"));
45+
46+
public static final DefaultedTag<FluidType> ENTITY_FLOATABLE = FluidTypeTags.key(ResourceKey.minecraft("entity_floatable"));
47+
48+
public static final DefaultedTag<FluidType> FROG_TRIES_TO_FIND_LAND_NEAR = FluidTypeTags.key(ResourceKey.minecraft("frog_tries_to_find_land_near"));
49+
4250
public static final DefaultedTag<FluidType> LAVA = FluidTypeTags.key(ResourceKey.minecraft("lava"));
4351

4452
public static final DefaultedTag<FluidType> SUPPORTS_FROGSPAWN = FluidTypeTags.key(ResourceKey.minecraft("supports_frogspawn"));

‎src/main/java/org/spongepowered/api/tag/StructureTags.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,17 @@ public final class StructureTags {
6969

7070
public static final DefaultedTag<Structure> ON_ANCIENT_CITY_MAPS = StructureTags.key(ResourceKey.minecraft("on_ancient_city_maps"));
7171

72+
public static final DefaultedTag<Structure> ON_BURIED_TRIAL_CHAMBERS_MAPS = StructureTags.key(ResourceKey.minecraft("on_buried_trial_chambers_maps"));
73+
7274
public static final DefaultedTag<Structure> ON_DESERT_PYRAMID_MAPS = StructureTags.key(ResourceKey.minecraft("on_desert_pyramid_maps"));
7375

7476
public static final DefaultedTag<Structure> ON_DESERT_VILLAGE_MAPS = StructureTags.key(ResourceKey.minecraft("on_desert_village_maps"));
7577

76-
public static final DefaultedTag<Structure> ON_JUNGLE_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_jungle_explorer_maps"));
78+
public static final DefaultedTag<Structure> ON_JUNGLE_PYRAMID_MAPS = StructureTags.key(ResourceKey.minecraft("on_jungle_pyramid_maps"));
7779

7880
public static final DefaultedTag<Structure> ON_MINESHAFT_MAPS = StructureTags.key(ResourceKey.minecraft("on_mineshaft_maps"));
7981

80-
public static final DefaultedTag<Structure> ON_OCEAN_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_ocean_explorer_maps"));
82+
public static final DefaultedTag<Structure> ON_OCEAN_MONUMENT_MAPS = StructureTags.key(ResourceKey.minecraft("on_ocean_monument_maps"));
8183

8284
public static final DefaultedTag<Structure> ON_OCEAN_RUIN_WARM_MAPS = StructureTags.key(ResourceKey.minecraft("on_ocean_ruin_warm_maps"));
8385

@@ -87,15 +89,13 @@ public final class StructureTags {
8789

8890
public static final DefaultedTag<Structure> ON_SNOWY_VILLAGE_MAPS = StructureTags.key(ResourceKey.minecraft("on_snowy_village_maps"));
8991

90-
public static final DefaultedTag<Structure> ON_SWAMP_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_swamp_explorer_maps"));
92+
public static final DefaultedTag<Structure> ON_SWAMP_HUT_MAPS = StructureTags.key(ResourceKey.minecraft("on_swamp_hut_maps"));
9193

9294
public static final DefaultedTag<Structure> ON_TAIGA_VILLAGE_MAPS = StructureTags.key(ResourceKey.minecraft("on_taiga_village_maps"));
9395

9496
public static final DefaultedTag<Structure> ON_TREASURE_MAPS = StructureTags.key(ResourceKey.minecraft("on_treasure_maps"));
9597

96-
public static final DefaultedTag<Structure> ON_TRIAL_CHAMBERS_MAPS = StructureTags.key(ResourceKey.minecraft("on_trial_chambers_maps"));
97-
98-
public static final DefaultedTag<Structure> ON_WOODLAND_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_woodland_explorer_maps"));
98+
public static final DefaultedTag<Structure> ON_WOODLAND_MANSION_MAPS = StructureTags.key(ResourceKey.minecraft("on_woodland_mansion_maps"));
9999

100100
public static final DefaultedTag<Structure> RUINED_PORTAL = StructureTags.key(ResourceKey.minecraft("ruined_portal"));
101101

‎src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ public final class ChunkStates {
5252
*/
5353
public static final DefaultedRegistryReference<ChunkState> BIOMES = ChunkStates.key(ResourceKey.minecraft("biomes"));
5454

55-
/**
56-
* A {@link Chunk} that is being "carved out" for general terrain
57-
* features that require things like "caves" or "canyons".
58-
*/
59-
public static final DefaultedRegistryReference<ChunkState> CARVERS = ChunkStates.key(ResourceKey.minecraft("carvers"));
60-
6155
/**
6256
* Identifies a {@link Chunk} that is considered empty. The method
6357
* {@link Chunk#isEmpty()} would return {@code true}. Identifies the
@@ -90,12 +84,6 @@ public final class ChunkStates {
9084
*/
9185
public static final DefaultedRegistryReference<ChunkState> LIGHT = ChunkStates.key(ResourceKey.minecraft("light"));
9286

93-
/**
94-
* A {@link Chunk} where the {@link BlockState block states} are being
95-
* set and structure locations are set.
96-
*/
97-
public static final DefaultedRegistryReference<ChunkState> NOISE = ChunkStates.key(ResourceKey.minecraft("noise"));
98-
9987
/**
10088
* A {@link Chunk} state that is being used for entity spawning.
10189
* Generally requires that the neighboring chunks are adequately populated,
@@ -117,14 +105,17 @@ public final class ChunkStates {
117105
public static final DefaultedRegistryReference<ChunkState> STRUCTURE_STARTS = ChunkStates.key(ResourceKey.minecraft("structure_starts"));
118106

119107
/**
120-
* A {@link Chunk} that is at this state means that it is being
121-
* generated with a "base" layer of terrain.
108+
* A {@link Chunk} that is being generated with a "base" layer of terrain:
109+
* carving out caves and canyons, setting {@link BlockState block states},
110+
* and placing structure locations. Replaces the former separate
111+
* {@code carvers}, {@code noise}, and {@code surface} states, which were
112+
* merged into this single step.
122113
*
123114
* <p>The chunk should not have any {@link Entity} instances or
124115
* {@link BlockEntity} instances and may have a valid {@link WorldLike}
125116
* used for world generation.</p>
126117
*/
127-
public static final DefaultedRegistryReference<ChunkState> SURFACE = ChunkStates.key(ResourceKey.minecraft("surface"));
118+
public static final DefaultedRegistryReference<ChunkState> TERRAIN = ChunkStates.key(ResourceKey.minecraft("terrain"));
128119

129120
private ChunkStates() {
130121
}

‎src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public final class DensityFunctions {
4848

4949
public static final DefaultedRegistryReference<DensityFunction> NETHER_BASE_3D_NOISE = DensityFunctions.key(ResourceKey.minecraft("nether/base_3d_noise"));
5050

51+
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_AMPLIFIED_CHUNK_SURFACE_LEVEL = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/chunk_surface_level"));
52+
5153
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_AMPLIFIED_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/depth"));
5254

5355
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_AMPLIFIED_FACTOR = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/factor"));
@@ -76,6 +78,8 @@ public final class DensityFunctions {
7678

7779
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_CAVES_SPAGHETTI_ROUGHNESS_FUNCTION = DensityFunctions.key(ResourceKey.minecraft("overworld/caves/spaghetti_roughness_function"));
7880

81+
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_CHUNK_SURFACE_LEVEL = DensityFunctions.key(ResourceKey.minecraft("overworld/chunk_surface_level"));
82+
7983
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_CONTINENTS = DensityFunctions.key(ResourceKey.minecraft("overworld/continents"));
8084

8185
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld/depth"));
@@ -88,6 +92,8 @@ public final class DensityFunctions {
8892

8993
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_JAGGEDNESS = DensityFunctions.key(ResourceKey.minecraft("overworld/jaggedness"));
9094

95+
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_LARGE_BIOMES_CHUNK_SURFACE_LEVEL = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/chunk_surface_level"));
96+
9197
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_LARGE_BIOMES_CONTINENTS = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/continents"));
9298

9399
public static final DefaultedRegistryReference<DensityFunction> OVERWORLD_LARGE_BIOMES_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/depth"));

0 commit comments

Comments
 (0)