Skip to content

Commit 81b5c64

Browse files
KazzukKazzuk
committed
More registry fixes and updates
1 parent d51ba0e commit 81b5c64

File tree

8 files changed

+192
-94
lines changed

8 files changed

+192
-94
lines changed

‎api/src/main/java/org/cloudburstmc/api/level/biome/BiomeIds.java‎

Lines changed: 73 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,76 +5,91 @@
55

66
@UtilityClass
77
public class BiomeIds {
8-
//sorted by legacy ID
9-
public static final Identifier OCEAN = Identifier.parse("ocean");
10-
public static final Identifier PLAINS = Identifier.parse("plains");
11-
public static final Identifier DESERT = Identifier.parse("desert");
12-
public static final Identifier EXTREME_HILLS = Identifier.parse("extreme_hills");
13-
public static final Identifier FOREST = Identifier.parse("forest");
14-
public static final Identifier TAIGA = Identifier.parse("taiga");
15-
public static final Identifier SWAMPLAND = Identifier.parse("swampland");
16-
public static final Identifier RIVER = Identifier.parse("river");
17-
public static final Identifier HELL = Identifier.parse("hell");
18-
public static final Identifier THE_END = Identifier.parse("the_end");
19-
public static final Identifier LEGACY_FROZEN_OCEAN = Identifier.parse("legacy_frozen_ocean");
20-
public static final Identifier FROZEN_RIVER = Identifier.parse("frozen_river");
21-
public static final Identifier ICE_PLAINS = Identifier.parse("ice_plains");
22-
public static final Identifier ICE_MOUNTAINS = Identifier.parse("ice_mountains");
23-
public static final Identifier MUSHROOM_ISLAND = Identifier.parse("mushroom_island");
24-
public static final Identifier MUSHROOM_ISLAND_SHORE = Identifier.parse("mushroom_island_shore");
8+
public static final Identifier BAMBOO_JUNGLE = Identifier.parse("bamboo_jungle");
9+
public static final Identifier BAMBOO_JUNGLE_HILLS = Identifier.parse("bamboo_jungle_hills");
10+
public static final Identifier BASALT_DELTAS = Identifier.parse("basalt_deltas");
2511
public static final Identifier BEACH = Identifier.parse("beach");
26-
public static final Identifier DESERT_HILLS = Identifier.parse("desert_hills");
27-
public static final Identifier FOREST_HILLS = Identifier.parse("forest_hills");
28-
public static final Identifier TAIGA_HILLS = Identifier.parse("taiga_hills");
29-
public static final Identifier EXTREME_HILLS_EDGE = Identifier.parse("extreme_hills_edge");
30-
public static final Identifier JUNGLE = Identifier.parse("jungle");
31-
public static final Identifier JUNGLE_HILLS = Identifier.parse("jungle_hills");
32-
public static final Identifier JUNGLE_EDGE = Identifier.parse("jungle_edge");
33-
public static final Identifier DEEP_OCEAN = Identifier.parse("deep_ocean");
34-
public static final Identifier STONE_BEACH = Identifier.parse("stone_beach");
35-
public static final Identifier COLD_BEACH = Identifier.parse("cold_beach");
3612
public static final Identifier BIRCH_FOREST = Identifier.parse("birch_forest");
3713
public static final Identifier BIRCH_FOREST_HILLS = Identifier.parse("birch_forest_hills");
38-
public static final Identifier ROOFED_FOREST = Identifier.parse("roofed_forest");
14+
public static final Identifier BIRCH_FOREST_HILLS_MUTATED = Identifier.parse("birch_forest_hills_mutated");
15+
public static final Identifier BIRCH_FOREST_MUTATED = Identifier.parse("birch_forest_mutated");
16+
public static final Identifier CHERRY_GROVE = Identifier.parse("cherry_grove");
17+
public static final Identifier COLD_BEACH = Identifier.parse("cold_beach");
18+
public static final Identifier COLD_OCEAN = Identifier.parse("cold_ocean");
3919
public static final Identifier COLD_TAIGA = Identifier.parse("cold_taiga");
4020
public static final Identifier COLD_TAIGA_HILLS = Identifier.parse("cold_taiga_hills");
41-
public static final Identifier MEGA_TAIGA = Identifier.parse("mega_taiga");
42-
public static final Identifier MEGA_TAIGA_HILLS = Identifier.parse("mega_taiga_hills");
43-
public static final Identifier EXTREME_HILLS_PLUS_TREES = Identifier.parse("extreme_hills_plus_trees");
44-
public static final Identifier SAVANNA = Identifier.parse("savanna");
45-
public static final Identifier SAVANNA_PLATEAU = Identifier.parse("savanna_plateau");
46-
public static final Identifier MESA = Identifier.parse("mesa");
47-
public static final Identifier MESA_PLATEAU_STONE = Identifier.parse("mesa_plateau_stone");
48-
public static final Identifier MESA_PLATEAU = Identifier.parse("mesa_plateau");
49-
public static final Identifier WARM_OCEAN = Identifier.parse("warm_ocean");
50-
public static final Identifier DEEP_WARM_OCEAN = Identifier.parse("deep_warm_ocean");
51-
public static final Identifier LUKEWARM_OCEAN = Identifier.parse("lukewarm_ocean");
52-
public static final Identifier DEEP_LUKEWARM_OCEAN = Identifier.parse("deep_lukewarm_ocean");
53-
public static final Identifier COLD_OCEAN = Identifier.parse("cold_ocean");
21+
public static final Identifier COLD_TAIGA_MUTATED = Identifier.parse("cold_taiga_mutated");
22+
public static final Identifier CRIMSON_FOREST = Identifier.parse("crimson_forest");
5423
public static final Identifier DEEP_COLD_OCEAN = Identifier.parse("deep_cold_ocean");
55-
public static final Identifier FROZEN_OCEAN = Identifier.parse("frozen_ocean");
24+
public static final Identifier DEEP_DARK = Identifier.parse("deep_dark");
5625
public static final Identifier DEEP_FROZEN_OCEAN = Identifier.parse("deep_frozen_ocean");
57-
public static final Identifier BAMBOO_JUNGLE = Identifier.parse("bamboo_jungle");
58-
public static final Identifier BAMBOO_JUNGLE_HILLS = Identifier.parse("bamboo_jungle_hills");
59-
public static final Identifier SUNFLOWER_PLAINS = Identifier.parse("sunflower_plains");
26+
public static final Identifier DEEP_LUKEWARM_OCEAN = Identifier.parse("deep_lukewarm_ocean");
27+
public static final Identifier DEEP_OCEAN = Identifier.parse("deep_ocean");
28+
public static final Identifier DEEP_WARM_OCEAN = Identifier.parse("deep_warm_ocean");
29+
public static final Identifier DESERT = Identifier.parse("desert");
30+
public static final Identifier DESERT_HILLS = Identifier.parse("desert_hills");
6031
public static final Identifier DESERT_MUTATED = Identifier.parse("desert_mutated");
32+
public static final Identifier DRIPSTONE_CAVES = Identifier.parse("dripstone_caves");
33+
public static final Identifier EXTREME_HILLS = Identifier.parse("extreme_hills");
34+
public static final Identifier EXTREME_HILLS_EDGE = Identifier.parse("extreme_hills_edge");
6135
public static final Identifier EXTREME_HILLS_MUTATED = Identifier.parse("extreme_hills_mutated");
36+
public static final Identifier EXTREME_HILLS_PLUS_TREES = Identifier.parse("extreme_hills_plus_trees");
37+
public static final Identifier EXTREME_HILLS_PLUS_TREES_MUTATED = Identifier.parse("extreme_hills_plus_trees_mutated");
6238
public static final Identifier FLOWER_FOREST = Identifier.parse("flower_forest");
63-
public static final Identifier TAIGA_MUTATED = Identifier.parse("taiga_mutated");
64-
public static final Identifier SWAMPLAND_MUTATED = Identifier.parse("swampland_mutated");
39+
public static final Identifier FOREST = Identifier.parse("forest");
40+
public static final Identifier FOREST_HILLS = Identifier.parse("forest_hills");
41+
public static final Identifier FROZEN_OCEAN = Identifier.parse("frozen_ocean");
42+
public static final Identifier FROZEN_PEAKS = Identifier.parse("frozen_peaks");
43+
public static final Identifier FROZEN_RIVER = Identifier.parse("frozen_river");
44+
public static final Identifier GROVE = Identifier.parse("grove");
45+
public static final Identifier HELL = Identifier.parse("hell");
46+
public static final Identifier ICE_MOUNTAINS = Identifier.parse("ice_mountains");
47+
public static final Identifier ICE_PLAINS = Identifier.parse("ice_plains");
6548
public static final Identifier ICE_PLAINS_SPIKES = Identifier.parse("ice_plains_spikes");
66-
public static final Identifier JUNGLE_MUTATED = Identifier.parse("jungle_mutated");
49+
public static final Identifier JAGGED_PEAKS = Identifier.parse("jagged_peaks");
50+
public static final Identifier JUNGLE = Identifier.parse("jungle");
51+
public static final Identifier JUNGLE_EDGE = Identifier.parse("jungle_edge");
6752
public static final Identifier JUNGLE_EDGE_MUTATED = Identifier.parse("jungle_edge_mutated");
68-
public static final Identifier BIRCH_FOREST_MUTATED = Identifier.parse("birch_forest_mutated");
69-
public static final Identifier BIRCH_FOREST_HILLS_MUTATED = Identifier.parse("birch_forest_hills_mutated");
70-
public static final Identifier ROOFED_FOREST_MUTATED = Identifier.parse("roofed_forest_mutated");
71-
public static final Identifier COLD_TAIGA_MUTATED = Identifier.parse("cold_taiga_mutated");
72-
public static final Identifier REDWOOD_TAIGA_MUTATED = Identifier.parse("redwood_taiga_mutated");
53+
public static final Identifier JUNGLE_HILLS = Identifier.parse("jungle_hills");
54+
public static final Identifier JUNGLE_MUTATED = Identifier.parse("jungle_mutated");
55+
public static final Identifier LEGACY_FROZEN_OCEAN = Identifier.parse("legacy_frozen_ocean");
56+
public static final Identifier LUKEWARM_OCEAN = Identifier.parse("lukewarm_ocean");
57+
public static final Identifier LUSH_CAVES = Identifier.parse("lush_caves");
58+
public static final Identifier MANGROVE_SWAMP = Identifier.parse("mangrove_swamp");
59+
public static final Identifier MEADOW = Identifier.parse("meadow");
60+
public static final Identifier MEGA_TAIGA = Identifier.parse("mega_taiga");
61+
public static final Identifier MEGA_TAIGA_HILLS = Identifier.parse("mega_taiga_hills");
62+
public static final Identifier MESA = Identifier.parse("mesa");
63+
public static final Identifier MESA_BRYCE = Identifier.parse("mesa_bryce");
64+
public static final Identifier MESA_PLATEAU = Identifier.parse("mesa_plateau");
65+
public static final Identifier MESA_PLATEAU_MUTATED = Identifier.parse("mesa_plateau_mutated");
66+
public static final Identifier MESA_PLATEAU_STONE = Identifier.parse("mesa_plateau_stone");
67+
public static final Identifier MESA_PLATEAU_STONE_MUTATED = Identifier.parse("mesa_plateau_stone_mutated");
68+
public static final Identifier MUSHROOM_ISLAND = Identifier.parse("mushroom_island");
69+
public static final Identifier MUSHROOM_ISLAND_SHORE = Identifier.parse("mushroom_island_shore");
70+
public static final Identifier OCEAN = Identifier.parse("ocean");
71+
public static final Identifier PALE_GARDEN = Identifier.parse("pale_garden");
72+
public static final Identifier PLAINS = Identifier.parse("plains");
7373
public static final Identifier REDWOOD_TAIGA_HILLS_MUTATED = Identifier.parse("redwood_taiga_hills_mutated");
74-
public static final Identifier EXTREME_HILLS_PLUS_TREES_MUTATED = Identifier.parse("extreme_hills_plus_trees_mutated");
74+
public static final Identifier REDWOOD_TAIGA_MUTATED = Identifier.parse("redwood_taiga_mutated");
75+
public static final Identifier RIVER = Identifier.parse("river");
76+
public static final Identifier ROOFED_FOREST = Identifier.parse("roofed_forest");
77+
public static final Identifier ROOFED_FOREST_MUTATED = Identifier.parse("roofed_forest_mutated");
78+
public static final Identifier SAVANNA = Identifier.parse("savanna");
7579
public static final Identifier SAVANNA_MUTATED = Identifier.parse("savanna_mutated");
80+
public static final Identifier SAVANNA_PLATEAU = Identifier.parse("savanna_plateau");
7681
public static final Identifier SAVANNA_PLATEAU_MUTATED = Identifier.parse("savanna_plateau_mutated");
77-
public static final Identifier MESA_BRYCE = Identifier.parse("mesa_bryce");
78-
public static final Identifier MESA_PLATEAU_STONE_MUTATED = Identifier.parse("mesa_plateau_stone_mutated");
79-
public static final Identifier MESA_PLATEAU_MUTATED = Identifier.parse("mesa_plateau_mutated");
80-
}
82+
public static final Identifier SNOWY_SLOPES = Identifier.parse("snowy_slopes");
83+
public static final Identifier SOUL_SAND_VALLEY = Identifier.parse("soulsand_valley");
84+
public static final Identifier STONE_BEACH = Identifier.parse("stone_beach");
85+
public static final Identifier STONY_PEAKS = Identifier.parse("stony_peaks");
86+
public static final Identifier SUNFLOWER_PLAINS = Identifier.parse("sunflower_plains");
87+
public static final Identifier SWAMPLAND = Identifier.parse("swampland");
88+
public static final Identifier SWAMPLAND_MUTATED = Identifier.parse("swampland_mutated");
89+
public static final Identifier TAIGA = Identifier.parse("taiga");
90+
public static final Identifier TAIGA_HILLS = Identifier.parse("taiga_hills");
91+
public static final Identifier TAIGA_MUTATED = Identifier.parse("taiga_mutated");
92+
public static final Identifier THE_END = Identifier.parse("the_end");
93+
public static final Identifier WARM_OCEAN = Identifier.parse("warm_ocean");
94+
public static final Identifier WARPED_FOREST = Identifier.parse("warped_forest");
95+
}

‎api/src/main/java/org/cloudburstmc/api/level/gamerule/GameRules.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,43 @@
22

33

44
public class GameRules {
5-
65
public static final BooleanGameRule COMMAND_BLOCK_OUTPUT = BooleanGameRule.of("commandblockoutput", true);
76
public static final BooleanGameRule COMMAND_BLOCKS_ENABLED = BooleanGameRule.of("commandblocksenabled", true);
87
public static final BooleanGameRule DO_DAYLIGHT_CYCLE = BooleanGameRule.of("dodaylightcycle", true);
98
public static final BooleanGameRule DO_ENTITY_DROPS = BooleanGameRule.of("doentitydrops", true);
109
public static final BooleanGameRule DO_FIRE_TICK = BooleanGameRule.of("dofiretick", true);
1110
public static final BooleanGameRule DO_IMMEDIATE_RESPAWN = BooleanGameRule.of("doimmediaterespawn", false);
1211
public static final BooleanGameRule DO_INSOMNIA = BooleanGameRule.of("doinsomnia", true);
12+
public static final BooleanGameRule DO_LIMITED_CRAFTING = BooleanGameRule.of("dolimitedcrafting", false);
1313
public static final BooleanGameRule DO_MOB_LOOT = BooleanGameRule.of("domobloot", true);
1414
public static final BooleanGameRule DO_MOB_SPAWNING = BooleanGameRule.of("domobspawning", true);
1515
public static final BooleanGameRule DO_TILE_DROPS = BooleanGameRule.of("dotiledrops", true);
1616
public static final BooleanGameRule DO_WEATHER_CYCLE = BooleanGameRule.of("doweathercycle", true);
1717
public static final BooleanGameRule DROWNING_DAMAGE = BooleanGameRule.of("drowningdamage", true);
18-
public static final BooleanGameRule EXPERIMENTAL_GAME_PLAY = BooleanGameRule.of("experimentalgameplay", false);
1918
public static final BooleanGameRule FALL_DAMAGE = BooleanGameRule.of("falldamage", true);
2019
public static final BooleanGameRule FIRE_DAMAGE = BooleanGameRule.of("firedamage", true);
2120
public static final BooleanGameRule FREEZE_DAMAGE = BooleanGameRule.of("freezedamage", true);
22-
public static final IntegerGameRule FUNCTION_COMMAND_LIMIT = IntegerGameRule.of("functioncommandlimit", 10000);
2321
public static final BooleanGameRule KEEP_INVENTORY = BooleanGameRule.of("keepinventory", false);
24-
public static final IntegerGameRule MAX_COMMAND_CHAIN_LENGTH = IntegerGameRule.of("maxcommandchainlength", 65535);
22+
public static final BooleanGameRule LOCATOR_BAR = BooleanGameRule.of("locatorbar", true);
2523
public static final BooleanGameRule MOB_GRIEFING = BooleanGameRule.of("mobgriefing", true);
26-
public static final BooleanGameRule NATURAL_REGENERATION = BooleanGameRule.of("naturalregeneration", true);
24+
public static final BooleanGameRule NATURAL_REGENERATION = BooleanGameRule.of("maturalregeneration", true);
25+
public static final BooleanGameRule PROJECTILES_CAN_BREAK_BLOCKS = BooleanGameRule.of("projectilescanbreakblocks", true);
2726
public static final BooleanGameRule PVP = BooleanGameRule.of("pvp", true);
28-
public static final IntegerGameRule RANDOM_TICK_SPEED = IntegerGameRule.of("randomtickspeed", 1);
2927
public static final BooleanGameRule RESPAWN_BLOCKS_EXPLODE = BooleanGameRule.of("respawnblocksexplode", true);
3028
public static final BooleanGameRule SEND_COMMAND_FEEDBACK = BooleanGameRule.of("sendcommandfeedback", true);
3129
public static final BooleanGameRule SHOW_BORDER_EFFECT = BooleanGameRule.of("showbordereffect", true);
3230
public static final BooleanGameRule SHOW_COORDINATES = BooleanGameRule.of("showcoordinates", false);
31+
public static final BooleanGameRule SHOW_DAYS_PLAYED = BooleanGameRule.of("showdaysplayed", false);
3332
public static final BooleanGameRule SHOW_DEATH_MESSAGES = BooleanGameRule.of("showdeathmessages", true);
33+
public static final BooleanGameRule SHOW_RECIPE_MESSAGES = BooleanGameRule.of("showrecipemessages", true);
3434
public static final BooleanGameRule SHOW_TAGS = BooleanGameRule.of("showtags", true);
35-
public static final IntegerGameRule SPAWN_RADIUS = IntegerGameRule.of("spawnradius", 5);
3635
public static final BooleanGameRule TNT_EXPLODES = BooleanGameRule.of("tntexplodes", true);
36+
public static final BooleanGameRule TNT_EXPLOSION_DROP_DECAY = BooleanGameRule.of("tntexplosiondropdecay", false);
37+
public static final IntegerGameRule FUNCTION_COMMAND_LIMIT = IntegerGameRule.of("functioncommandlimit", 10000);
38+
public static final IntegerGameRule MAX_COMMAND_CHAIN_LENGTH = IntegerGameRule.of("maxcommandchainlength", 65535);
39+
public static final IntegerGameRule PLAYERS_SLEEPING_PERCENTAGE = IntegerGameRule.of("playerssleepingpercentage", 100);
40+
public static final IntegerGameRule RANDOM_TICK_SPEED = IntegerGameRule.of("randomtickspeed", 1);
41+
public static final IntegerGameRule SPAWN_RADIUS = IntegerGameRule.of("spawnradius", 10);
3742

3843
private GameRules() {
3944
throw new AssertionError("This class cannot be instantiated");

‎server/build.gradle.kts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,8 @@ tasks.register<JavaExec>("run") {
100100
workingDir = projectDir.resolve("run")
101101
workingDir.mkdir()
102102
classpath = sourceSets["main"].runtimeClasspath
103-
jvmArgs(
104-
"--enable-native-access=ALL-UNNAMED",
105-
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
106-
"--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED"
107-
)
108103
systemProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true")
109104
systemProperty("guice_bytecode_gen_option", "DISABLED")
110-
systemProperty("io.netty.noUnsafe", "true")
111105
}
112106

113107
abstract class GenerateGitPropertiesTask : DefaultTask() {

‎server/src/main/java/org/cloudburstmc/server/Bootstrap.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ public class Bootstrap {
5757
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true");
5858
// Disable Guice bytecode generation to avoid Unsafe.staticFieldBase deprecation warning
5959
System.setProperty("guice_bytecode_gen_option", "DISABLED");
60-
// Disable Netty Unsafe usage to avoid objectFieldOffset deprecation warning
61-
System.setProperty("io.netty.noUnsafe", "true");
6260
}
6361

6462
public final static Properties GIT_INFO = getGitInfo();

0 commit comments

Comments
 (0)