Add world system merging

Author: JustRed23

patches/minecraft/net/minecraft/server/Main.java.patch

@@ -62,7 +62,7 @@
 
           Path path = optionset.valueOf(optionspec14);
           if (path != null) {
-@@ -102,29 +_,52 @@
+@@ -102,29 +_,53 @@
              JvmProfiler.INSTANCE.start(Environment.SERVER);
           }
 
@@ -121,6 +121,7 @@
           LevelStorageSource levelstoragesource = LevelStorageSource.createDefault(file1.toPath());
 -         LevelStorageSource.LevelStorageAccess levelstoragesource$levelstorageaccess = levelstoragesource.validateAndCreateAccess(s);
 +         LevelStorageSource.LevelStorageAccess levelstoragesource$levelstorageaccess = levelstoragesource.validateAndCreateAccess(s, LevelStem.OVERWORLD);
++         levelstoragesource$levelstorageaccess.setReference(levelstoragesource); //Ketting
 +         levelstoragesource$levelstorageaccess.readAdditionalLevelSaveData();
           LevelSummary levelsummary = levelstoragesource$levelstorageaccess.getSummary();
           if (levelsummary != null) {

patches/minecraft/net/minecraft/server/MinecraftServer.java.patch

@@ -139,7 +139,7 @@
        if (!serverleveldata.isInitialized()) {
           try {
              setInitialSpawn(serverlevel, serverleveldata, worldoptions.generateBonusChest(), flag);
-@@ -373,9 +_,54 @@
+@@ -373,9 +_,57 @@
           if (resourcekey != LevelStem.OVERWORLD) {
              ResourceKey<Level> resourcekey1 = ResourceKey.create(Registries.DIMENSION, resourcekey.location());
              DerivedLevelData derivedleveldata = new DerivedLevelData(this.worldData, serverleveldata);
@@ -172,7 +172,10 @@
 +
 +            LevelStorageSource.LevelStorageAccess source;
 +            try {
-+               source = LevelStorageSource.createDefault(server.getWorldContainer().toPath()).validateAndCreateAccess(name, resourcekey);
++               if (org.kettingpowered.ketting.config.KettingConfig.getInstance().MERGE_WORLD_SYSTEMS.getValue())
++                  source = this.storageSource.reference.deriveFromSource(this.storageSource, resourcekey);
++               else
++                  source = LevelStorageSource.createDefault(server.getWorldContainer().toPath()).validateAndCreateAccess(name, resourcekey);
 +            } catch (IOException | net.minecraft.world.level.validation.ContentValidationException e) {
 +               throw new RuntimeException(e);
 +            }

patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch

@@ -43,7 +43,7 @@
        super(p_215002_, p_215003_, p_214999_.registryAccess(), p_215004_.type(), p_214999_::getProfiler, false, p_215006_, p_215007_, p_214999_.getMaxChainedNeighborUpdates());
 +      this.pvpMode = p_214999_.isPvpAllowed();
 +      convertable = p_215001_;
-+      uuid = org.bukkit.craftbukkit.v1_20_R1.util.WorldUUID.getUUID((p_215002_ instanceof net.minecraft.world.level.storage.DerivedLevelData ? p_215001_.levelDirectory.path() : p_215001_.getDimensionPath(p_215003_)).toFile()); //Ketting
++      uuid = org.bukkit.craftbukkit.v1_20_R1.util.WorldUUID.getUUID(p_215001_.getDimensionPath(p_215003_).toFile());
 +      // CraftBukkit end
        this.tickTime = p_215009_;
        this.server = p_214999_;

patches/minecraft/net/minecraft/world/level/storage/LevelStorageSource.java.patch

@@ -9,7 +9,7 @@
           return Pair.of(primaryleveldata, worlddimensions$complete);
        };
     }
-@@ -334,24 +_,46 @@
+@@ -334,24 +_,52 @@
     }
 
     public LevelStorageSource.LevelStorageAccess validateAndCreateAccess(String p_289980_) throws IOException, ContentValidationException {
@@ -26,6 +26,12 @@
 +         return new LevelStorageSource.LevelStorageAccess(p_289980_, path, dimensionType); // CraftBukkit
        }
     }
++
++   //Ketting start - try merging both world systems
++   public LevelStorageSource.LevelStorageAccess deriveFromSource(LevelStorageSource.LevelStorageAccess source, ResourceKey<LevelStem> dimensionType) throws IOException {
++      return new LevelStorageSource.LevelStorageAccess(source, dimensionType);
++   }
++   //Ketting end
 
     public LevelStorageSource.LevelStorageAccess createAccess(String p_78261_) throws IOException {
 +      return this.createAccess(p_78261_, null);
@@ -58,7 +64,7 @@
     public static record LevelCandidates(List<LevelStorageSource.LevelDirectory> levels) implements Iterable<LevelStorageSource.LevelDirectory> {
        public boolean isEmpty() {
           return this.levels.isEmpty();
-@@ -397,8 +_,18 @@
+@@ -397,9 +_,34 @@
        public final LevelStorageSource.LevelDirectory levelDirectory;
        private final String levelId;
        private final Map<LevelResource, Path> resources = Maps.newHashMap();
@@ -68,17 +74,33 @@
 +      public ResourceKey<LevelStem> dimensionType;
 +
 +      //Ketting start
++      public final Path dimensionPath;
++
 +      public void setDimensionType(ResourceKey<LevelStem> dimensionType) {
 +          this.dimensionType = dimensionType;
 +      }
 +      //Ketting end
 +
++      //Ketting start
++      LevelStorageAccess(LevelStorageAccess original, ResourceKey<LevelStem> dimensionType) {
++         this.dimensionType = dimensionType;
++
++         this.levelId = original.levelId;
++         this.dimensionPath = original.dimensionPath;
++         this.levelDirectory = original.levelDirectory;
++         this.lock = original.lock;
++         this.resources.putAll(original.resources);
++      }
++      //Ketting end
++
 +      LevelStorageAccess(String p_289967_, Path p_289988_, ResourceKey<LevelStem> dimensionType) throws IOException {
 +         this.dimensionType = dimensionType;
 +         // CraftBukkit end
           this.levelId = p_289967_;
++         this.dimensionPath = p_289988_; //Ketting
           this.levelDirectory = new LevelStorageSource.LevelDirectory(p_289988_);
           this.lock = DirectoryLock.create(p_289988_);
+       }
 @@ -413,7 +_,7 @@
        }
 
@@ -117,14 +139,27 @@
           try {
              File file2 = File.createTempFile("level", ".dat", file1);
              NbtIo.writeCompressed(compoundtag1, file2);
-@@ -469,6 +_,10 @@
- 
-       public Optional<Path> getIconFile() {
+@@ -471,6 +_,10 @@
           return !this.lock.isValid() ? Optional.empty() : Optional.of(this.levelDirectory.iconFile());
-+      }
-+
-+      public Path getWorldDir() {
-+         return baseDir;
        }
 
++      public Path getWorldDir() {
++         return baseDir;
++      }
++
        public void deleteLevel() throws IOException {
+          this.checkLock();
+          final Path path = this.levelDirectory.lockFile();
+@@ -569,6 +_,12 @@
+ 
+       public void close() throws IOException {
+          this.lock.close();
++      }
++
++      //Ketting start
++      public @Nullable LevelStorageSource reference;
++      public void setReference(LevelStorageSource levelstoragesource) {
++         this.reference = levelstoragesource;
+       }
+    }
+ }

src/main/java/org/kettingpowered/ketting/config/KettingConfig.java

@@ -40,5 +40,7 @@ public KettingConfig(@NotNull String fileName) {
     public final BooleanValue WARN_ON_NULL_NBT = new BooleanValue("debug.warn_on_null_nbt", true, "Print a warning to the console when something tries to set a null NBT tag.");
 
     public final BooleanValue OVERWRITE_FORGE_PERMISSIONS = new BooleanValue("forge.overwrite_forge_permissions", false, "--- WARNING - THIS WILL COMPLETELY DISABLE FORGE PERMISSION CHECKS ---  Overwrite Forge permissions with Bukkit permissions, makes it possible to use a permission manager plugin for modded commands. If true, Forge permissions will be set to 'forge.command.MODDEDCOMMAND' where MODDEDCOMMAND is the name of the modded command.");
+
+    public final BooleanValue MERGE_WORLD_SYSTEMS = new BooleanValue("ketting.merge_world_systems", false, "--- WARNING - THIS WILL BREAK EXISTING WORLDS ---  If true, this will attempt to merge both the Forge and Bukkit world system into one, making dimensions exist in the world folder, and Bukkit worlds in their own folder.");
     //End of config values
 }