Skip to content

Commit a9ee2fc

Browse files
committed
Update to 1.21
1 parent 9f175bf commit a9ee2fc

File tree

5 files changed

+78
-7
lines changed

5 files changed

+78
-7
lines changed

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public enum MinecraftVersion {
5959
* This constant represents Minecraft (Java Edition) Version 1.21
6060
* ("Tricky Trials")
6161
*/
62-
MINECRAFT_1_21(21, 0, "1.21+"),
62+
MINECRAFT_1_21(21, 0, "1.21.x"),
6363

6464
/**
6565
* This constant represents an exceptional state in which we were unable

src/test/java/io/github/thebusybiscuit/slimefun4/utils/biomes/TestBiomeMapCompatibility.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ void testCompatibilities(String name, MinecraftVersion version) {
106106
MinecraftVersion.MINECRAFT_1_17,
107107
MinecraftVersion.MINECRAFT_1_18,
108108
MinecraftVersion.MINECRAFT_1_19,
109-
MinecraftVersion.MINECRAFT_1_20
109+
MinecraftVersion.MINECRAFT_1_20,
110+
MinecraftVersion.MINECRAFT_1_21
110111
});
111112

112113
testCases.put("oil_v1.16", new MinecraftVersion[] {
@@ -117,7 +118,8 @@ void testCompatibilities(String name, MinecraftVersion version) {
117118
testCases.put("oil_v1.18", new MinecraftVersion[] {
118119
MinecraftVersion.MINECRAFT_1_18,
119120
MinecraftVersion.MINECRAFT_1_19,
120-
MinecraftVersion.MINECRAFT_1_20
121+
MinecraftVersion.MINECRAFT_1_20,
122+
MinecraftVersion.MINECRAFT_1_21
121123
});
122124

123125
testCases.put("salt_v1.16", new MinecraftVersion[] {
@@ -128,7 +130,8 @@ void testCompatibilities(String name, MinecraftVersion version) {
128130
testCases.put("salt_v1.18", new MinecraftVersion[] {
129131
MinecraftVersion.MINECRAFT_1_18,
130132
MinecraftVersion.MINECRAFT_1_19,
131-
MinecraftVersion.MINECRAFT_1_20
133+
MinecraftVersion.MINECRAFT_1_20,
134+
MinecraftVersion.MINECRAFT_1_21
132135
});
133136

134137
testCases.put("uranium_v1.16", new MinecraftVersion[] {
@@ -142,7 +145,8 @@ void testCompatibilities(String name, MinecraftVersion version) {
142145
testCases.put("uranium_v1.18", new MinecraftVersion[] {
143146
MinecraftVersion.MINECRAFT_1_18,
144147
MinecraftVersion.MINECRAFT_1_19,
145-
MinecraftVersion.MINECRAFT_1_20
148+
MinecraftVersion.MINECRAFT_1_20,
149+
MinecraftVersion.MINECRAFT_1_21
146150
});
147151
// @formatter:on
148152

src/test/resources/biomes/1.20.5+.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@
6363
"minecraft:jagged_peaks",
6464
"minecraft:stony_peaks",
6565
"minecraft:cherry_grove",
66-
"minecraft:custom",
66+
"minecraft:custom"
6767
]

src/test/resources/biomes/1.20.x.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@
6363
"minecraft:jagged_peaks",
6464
"minecraft:stony_peaks",
6565
"minecraft:cherry_grove",
66-
"minecraft:custom",
66+
"minecraft:custom"
6767
]
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[
2+
"minecraft:ocean",
3+
"minecraft:plains",
4+
"minecraft:desert",
5+
"minecraft:windswept_hills",
6+
"minecraft:forest",
7+
"minecraft:taiga",
8+
"minecraft:swamp",
9+
"minecraft:mangrove_swamp",
10+
"minecraft:river",
11+
"minecraft:nether_wastes",
12+
"minecraft:the_end",
13+
"minecraft:frozen_ocean",
14+
"minecraft:frozen_river",
15+
"minecraft:snowy_plains",
16+
"minecraft:mushroom_fields",
17+
"minecraft:beach",
18+
"minecraft:jungle",
19+
"minecraft:sparse_jungle",
20+
"minecraft:deep_ocean",
21+
"minecraft:stony_shore",
22+
"minecraft:snowy_beach",
23+
"minecraft:birch_forest",
24+
"minecraft:dark_forest",
25+
"minecraft:snowy_taiga",
26+
"minecraft:old_growth_pine_taiga",
27+
"minecraft:windswept_forest",
28+
"minecraft:savanna",
29+
"minecraft:savanna_plateau",
30+
"minecraft:badlands",
31+
"minecraft:wooded_badlands",
32+
"minecraft:small_end_islands",
33+
"minecraft:end_midlands",
34+
"minecraft:end_highlands",
35+
"minecraft:end_barrens",
36+
"minecraft:warm_ocean",
37+
"minecraft:lukewarm_ocean",
38+
"minecraft:cold_ocean",
39+
"minecraft:deep_lukewarm_ocean",
40+
"minecraft:deep_cold_ocean",
41+
"minecraft:deep_frozen_ocean",
42+
"minecraft:the_void",
43+
"minecraft:sunflower_plains",
44+
"minecraft:windswept_gravelly_hills",
45+
"minecraft:flower_forest",
46+
"minecraft:ice_spikes",
47+
"minecraft:old_growth_birch_forest",
48+
"minecraft:old_growth_spruce_taiga",
49+
"minecraft:windswept_savanna",
50+
"minecraft:eroded_badlands",
51+
"minecraft:bamboo_jungle",
52+
"minecraft:soul_sand_valley",
53+
"minecraft:crimson_forest",
54+
"minecraft:warped_forest",
55+
"minecraft:basalt_deltas",
56+
"minecraft:dripstone_caves",
57+
"minecraft:lush_caves",
58+
"minecraft:deep_dark",
59+
"minecraft:meadow",
60+
"minecraft:grove",
61+
"minecraft:snowy_slopes",
62+
"minecraft:frozen_peaks",
63+
"minecraft:jagged_peaks",
64+
"minecraft:stony_peaks",
65+
"minecraft:cherry_grove",
66+
"minecraft:custom"
67+
]

0 commit comments

Comments
 (0)