Commit 522ed8d
committed
feat(worlds): overhaul per-world storage architecture for 26.1
Previously, SpongeWorldManager created a separate LevelStorageAccess per
dimension via createLevelStorageAccess(), with bridge$setDedicated(true)
overriding getDimensionPath() to bypass vanilla's DimensionType.getStorageFolder().
This produced the old DIM-1/DIM1 directory layout with per-dimension level.dat
files containing a SpongeData compound (UUID, key, WeatherState, CustomBossEvents,
WorldOptions). Each dimension had its own session.lock and the SpongeData was
injected into level.dat during saveDataTag() and extracted during
getLevelDataAndDimensions() via bridge$readSpongeLevelData/writeSpongeLevelData.
Now, all dimensions share the server's single LevelStorageAccess. Vanilla's
DimensionType.getStorageFolder() handles path resolution, placing all dimensions
under dimensions/{namespace}/{path}/. Each ServerLevel's ServerChunkCache creates
an independent SavedDataStorage at getDimensionPath(dim)/data/, enabling per-world
data through vanilla's own SavedData mechanism.
Per-world features now use vanilla SavedDataType instances directly:
- WeatherData.TYPE (minecraft:weather) via ServerLevel.getWeatherData() override
- GameRuleMap.TYPE (minecraft:game_rules) via ServerLevel.getGameRules() override
- CustomBossEvents.TYPE via bridge$getBossBarManager() using per-dim storage
- WorldBorder already per-dimension in vanilla 26.1 (no override needed)
Sponge-specific identity (UUID, ResourceKey) is stored as SpongeRegistryData,
a custom SavedData at data/sponge/registry.dat per dimension. Global map/player
UUID indices are stored as SpongeMapUUIDData at data/sponge/map_uuids.dat in
the server-level SavedDataStorage.
level.dat no longer contains any SpongeData — it is pure vanilla format.
The SpongeData injection in LevelStorageSource_LevelStorageAccessMixin and
the read hooks in LevelStorageSourceMixin_Vanilla and PrimaryLevelDataMixin
are removed.
Migration from old Sponge format is handled by FileFixerUpperMixin, which
hooks into FileFixerUpper.fix() at HEAD to extract UUIDs from SpongeData in
level.dat and DIM-1/DIM1 level.dat files before vanilla's DimensionStorageFileFix
deletes those directories. Legacy SavedData files (random_sequences.dat, etc.)
left behind by vanilla's fixer are moved to the correct namespaced paths and
the old directories are cleaned up. Extracted identities are cached in
SpongeLevelMigration (static volatile, cross-thread from main to Server thread)
and written to per-dimension registry.dat during MinecraftServer.loadLevel()
HEAD inject, before any ServerLevel is created.
Additional fixes:
- SavedDataStorageMixin.readSpongeMapData() was returning null unconditionally,
breaking ALL SavedData persistence (return null -> return result)
- Weather hasCeiling() logic in advanceWeatherCycle was inverted, preventing
weather visual effects in overworld-type dimensions
- DedicatedServerMixin constructor signature updated for new Optional<GameRules>
parameter in 26.1-snapshot-6
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>1 parent 0d1f742 commit 522ed8d
22 files changed
Lines changed: 927 additions & 526 deletions
File tree
- src
- accessors/java/org/spongepowered/common/accessor
- server/bossevents
- world/entity/npc/wanderingtrader
- main/java/org/spongepowered/common
- bridge/world/level/storage
- map
- world/server
- mixins
- java/org/spongepowered/common/mixin
- api/minecraft/server
- level
- core
- commands
- server
- level
- util/filefix
- world/level
- levelgen
- storage
- resources
- vanilla/src/mixins/java/org/spongepowered/vanilla/mixin/core/world/level/storage
Lines changed: 24 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
1 | 25 | | |
2 | 26 | | |
3 | 27 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
| |||
Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 0 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | 28 | | |
30 | | - | |
31 | | - | |
32 | 29 | | |
33 | 30 | | |
34 | 31 | | |
| |||
67 | 64 | | |
68 | 65 | | |
69 | 66 | | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | 67 | | |
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | 38 | | |
40 | 39 | | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
| 123 | + | |
| 124 | + | |
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
Lines changed: 162 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
Lines changed: 92 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
0 commit comments