Merge pull request #179 from InfernalSuite/develop

Promote 1.21.8 to stable

Author: davidmayr

aspaper-api/build.gradle.kts.patch

@@ -38,7 +38,7 @@
  }
 @@ -166,7 +_,7 @@
 
- tasks.withType<Javadoc> {
+ tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
 -    options.overview = "src/main/javadoc/overview.html"
 +    options.overview = "../paper-api/src/main/javadoc/overview.html"

aspaper-server/build.gradle.kts.patch

@@ -49,7 +49,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -205,14 +_,14 @@
+@@ -200,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -69,7 +69,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -271,7 +_,7 @@
+@@ -266,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

aspaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkLoadTask.java.patch

@@ -5,7 +5,7 @@
 
      public final NewChunkHolder chunkHolder;
 -    private final ChunkDataLoadTask loadTask;
-+    private final com.infernalsuite.asp.level.CommonLoadTask loadTask; // ASP
++    private final com.infernalsuite.asp.level.moonrise.CommonLoadTask loadTask; // ASP
 
      private volatile boolean cancelled;
      private NewChunkHolder.GenericDataLoadTaskCallback entityLoadTask;
@@ -40,7 +40,7 @@
      private static record ReadChunk(ProtoChunk protoChunk, SerializableChunkData chunkData) {}
 
 -    private static final class ChunkDataLoadTask extends CallbackDataLoadTask<ReadChunk, ChunkAccess> {
-+    private static final class ChunkDataLoadTask extends CallbackDataLoadTask<ReadChunk, ChunkAccess> implements com.infernalsuite.asp.level.CommonLoadTask { // ASP
++    private static final class ChunkDataLoadTask extends CallbackDataLoadTask<ReadChunk, ChunkAccess> implements com.infernalsuite.asp.level.moonrise.CommonLoadTask { // ASP
          private ChunkDataLoadTask(final ChunkTaskScheduler scheduler, final ServerLevel world, final int chunkX,
                                    final int chunkZ, final Priority priority) {
              super(scheduler, world, chunkX, chunkZ, MoonriseRegionFileIO.RegionFileType.CHUNK_DATA, priority);

aspaper-server/paper-patches/features/0004-Delete-temp-folder-after-world-is-unloaded.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Delete temp folder after world is unloaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 09096a99c914b9ffe555e876559b02c437543f58..4ac6cc136824e43ac8a8677a1c45735a669882af 100644
+index 185bfb619767a2ce8b831b083d946e9f8e7bfb0c..a920263b6eef436abe113d1264a782e458748728 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1457,6 +1457,12 @@ public final class CraftServer implements Server {
+@@ -1460,6 +1460,12 @@ public final class CraftServer implements Server {
              handle.getChunkSource().close(save);
              io.papermc.paper.FeatureHooks.closeEntityManager(handle, save); // SPIGOT-6722: close entityManager // Paper - chunk system
              handle.levelStorageAccess.close();

aspaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1447,6 +_,8 @@
+@@ -1450,6 +_,8 @@
              return false;
          }
 

aspaper-server/src/main/java/com/infernalsuite/asp/Converter.java

@@ -56,7 +56,7 @@ public static <T extends BinaryTag> Tag convertTag(T tag) {
                 case Tag.TAG_STRING -> StringTag.valueOf(((StringBinaryTag) tag).value());
                 case Tag.TAG_LIST -> {
                     ListTag list = new ListTag();
-                    for (BinaryTag entry : ((ListBinaryTag) tag)) list.add(convertTag(entry));
+                    for (BinaryTag entry : ((ListBinaryTag) tag)) list.addAndUnwrap(convertTag(entry));
                     yield list;
                 }
                 case Tag.TAG_COMPOUND -> {

aspaper-server/src/main/java/com/infernalsuite/asp/SimpleDataFixerConverter.java

@@ -2,13 +2,12 @@
 
 import ca.spottedleaf.dataconverter.converters.DataConverter;
 import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
-import ca.spottedleaf.dataconverter.minecraft.datatypes.MCDataType;
 import ca.spottedleaf.dataconverter.minecraft.walkers.generic.WalkerUtils;
 import ca.spottedleaf.dataconverter.types.MapType;
 import ca.spottedleaf.dataconverter.types.nbt.NBTListType;
 import ca.spottedleaf.dataconverter.types.nbt.NBTMapType;
 import com.infernalsuite.asp.api.SlimeDataConverter;
-import com.infernalsuite.asp.level.SlimeChunkConverter;
+import com.infernalsuite.asp.level.chunk.SlimeChunkConverter;
 import com.infernalsuite.asp.serialization.SlimeWorldReader;
 import com.infernalsuite.asp.skeleton.SkeletonSlimeWorld;
 import com.infernalsuite.asp.skeleton.SlimeChunkSectionSkeleton;

aspaper-server/src/main/java/com/infernalsuite/asp/SlimeNMSBridgeImpl.java

@@ -198,14 +198,6 @@ private SlimeLevelInstance createCustomWorld(SlimeWorld world, @Nullable Resourc
             throw new RuntimeException(ex); // TODO do something better with this?
         }
 
-        // level.setReady(true);
-        level.setSpawnSettings(world.getPropertyMap().getValue(SlimeProperties.ALLOW_MONSTERS));
-
-        CompoundTag nmsExtraData = (CompoundTag) Converter.convertTag(CompoundBinaryTag.from(world.getExtraData()));
-
-        //Attempt to read PDC
-        if (nmsExtraData.get("BukkitValues") != null) level.getWorld().readBukkitValues(nmsExtraData.get("BukkitValues"));
-
         return level;
     }
 

aspaper-server/src/main/java/com/infernalsuite/asp/level/SlimeInMemoryWorld.java

@@ -7,6 +7,7 @@
 import com.infernalsuite.asp.api.exceptions.WorldAlreadyExistsException;
 import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import com.infernalsuite.asp.api.world.properties.SlimeProperties;
+import com.infernalsuite.asp.level.chunk.*;
 import com.infernalsuite.asp.pdc.AdventurePersistentDataContainer;
 import com.infernalsuite.asp.serialization.slime.SlimeSerializer;
 import com.infernalsuite.asp.skeleton.SkeletonCloning;
@@ -179,56 +180,27 @@ public SlimeWorld getSerializableCopy() {
             SlimeChunk clonedChunk = entry.getValue();
             // NMS "live" chunks need to be converted
             {
-                LevelChunk chunk = null;
+                NMSSlimeChunk chunk = null;
                 if (clonedChunk instanceof SafeNmsChunkWrapper safeNmsChunkWrapper) {
                     if (safeNmsChunkWrapper.shouldDefaultBackToSlimeChunk()) {
                         clonedChunk = safeNmsChunkWrapper.getSafety();
                     } else {
-                        chunk = safeNmsChunkWrapper.getWrapper().getChunk();
+                        chunk = safeNmsChunkWrapper.getWrapper();
                     }
                 } else if (clonedChunk instanceof NMSSlimeChunk nmsSlimeChunk) {
-                    chunk = nmsSlimeChunk.getChunk();
+                    chunk = nmsSlimeChunk;
                 }
 
-
-
                 if (chunk != null) {
-                    if (FastChunkPruner.canBePruned(world, chunk)) {
+                    if (FastChunkPruner.canBePruned(world, chunk.getChunk())) {
                         continue;
                     }
 
-                    // Serialize Bukkit Values (PDC)
-
-                    CompoundBinaryTag adventureTag = Converter.convertTag(chunk.persistentDataContainer.toTagCompound());
-                    clonedChunk.getExtraData().put("ChunkBukkitValues", adventureTag);
-
-                    ListBinaryTag blockTicks = null;
-                    ListBinaryTag fluidTicks = null;
-                    //Only save this data into memory when we actually want it there
-                    if(getPropertyMap().getValue(SlimeProperties.SAVE_BLOCK_TICKS) || getPropertyMap().getValue(SlimeProperties.SAVE_FLUID_TICKS)) {
-                        ChunkAccess.PackedTicks ticksForSerialization = chunk.getTicksForSerialization(this.instance.getGameTime());
-
-                        if(getPropertyMap().getValue(SlimeProperties.SAVE_BLOCK_TICKS)) {
-                            blockTicks = SlimeChunkConverter.convertSavedBlockTicks(ticksForSerialization.blocks());
-                        }
-                        if(getPropertyMap().getValue(SlimeProperties.SAVE_FLUID_TICKS)) {
-                            fluidTicks = SlimeChunkConverter.convertSavedFluidTicks(ticksForSerialization.fluids());
-                        }
-                    }
-
-
-                    clonedChunk = new SlimeChunkSkeleton(
-                            clonedChunk.getX(),
-                            clonedChunk.getZ(),
-                            clonedChunk.getSections(),
-                            clonedChunk.getHeightMaps(),
-                            clonedChunk.getTileEntities(),
-                            clonedChunk.getEntities(),
-                            clonedChunk.getExtraData(),
-                            clonedChunk.getUpgradeData(),
-                            clonedChunk.getPoiChunkSections(),
-                            blockTicks,
-                            fluidTicks
+                    clonedChunk = PartiallySerializedSlimeChunk.of(
+                            chunk,
+                            getPropertyMap().getValue(SlimeProperties.SAVE_BLOCK_TICKS),
+                            getPropertyMap().getValue(SlimeProperties.SAVE_FLUID_TICKS),
+                            getPropertyMap().getValue(SlimeProperties.SAVE_POI)
                     );
                 }
             }

aspaper-server/src/main/java/com/infernalsuite/asp/level/SlimeLevelInstance.java

@@ -7,16 +7,21 @@
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.task.ChunkLoadTask;
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.task.GenericDataLoadTask;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.infernalsuite.asp.Converter;
+import com.infernalsuite.asp.level.moonrise.ChunkDataLoadTask;
 import com.infernalsuite.asp.level.moonrise.SlimeEntityDataLoader;
 import com.infernalsuite.asp.level.moonrise.SlimePoiDataLoader;
 import com.infernalsuite.asp.serialization.slime.SlimeSerializer;
 import com.infernalsuite.asp.api.world.SlimeWorld;
 import com.infernalsuite.asp.api.world.SlimeWorldInstance;
 import com.infernalsuite.asp.api.world.properties.SlimeProperties;
 import com.infernalsuite.asp.api.world.properties.SlimePropertyMap;
+import net.kyori.adventure.nbt.BinaryTag;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
@@ -48,10 +53,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 
@@ -101,6 +103,12 @@ public SlimeLevelInstance(SlimeBootstrap slimeBootstrap, PrimaryLevelData primar
                 propertyMap.getValue(SlimeProperties.SPAWN_YAW));
         super.chunkSource.setSpawnSettings(propertyMap.getValue(SlimeProperties.ALLOW_MONSTERS), propertyMap.getValue(SlimeProperties.ALLOW_ANIMALS));
 
+        ConcurrentMap<String, BinaryTag> extraData = this.slimeInstance.getExtraData();
+        //Attempt to read PDC
+        if (extraData.containsKey("BukkitValues")) {
+            getWorld().readBukkitValues(Converter.convertTag(extraData.get("BukkitValues")));
+        }
+
         this.pvpMode = propertyMap.getValue(SlimeProperties.PVP);
 
         this.entityDataController = new SlimeEntityDataLoader(