Merge pull request #183 from InfernalSuite/develop

Author: davidmayr

api/src/main/java/com/infernalsuite/asp/api/world/properties/SlimeProperties.java

@@ -99,8 +99,11 @@ public class SlimeProperties {
     );
 
     @ApiStatus.Experimental
+    @Deprecated(forRemoval = true)
     public static final SlimePropertyInt CHUNK_SECTION_MIN = SlimePropertyInt.create("chunkSectionMin", -4);
+
     @ApiStatus.Experimental
+    @Deprecated(forRemoval = true)
     public static final SlimePropertyInt CHUNK_SECTION_MAX = SlimePropertyInt.create("chunkSectionMax", 19);
 
     /**

api/src/main/java/com/infernalsuite/asp/api/world/properties/SlimePropertyMap.java

@@ -5,6 +5,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * A Property Map object.
@@ -35,6 +36,21 @@ public <T, Z extends BinaryTag> T getValue(final SlimeProperty<T, Z> property) {
         }
     }
 
+    /**
+     * Return the current value of the given property as an Optional
+     * Instead of returning the default value if the property is not set, it returns an empty Optional
+     *
+     * @param property The slime property
+     * @return An Optional containing the current value, or empty if not set
+     */
+    public <T, Z extends BinaryTag> Optional<T> getOptionalValue(final SlimeProperty<T, Z> property) {
+        if (this.properties.containsKey(property.getKey())) {
+            return Optional.of(property.readValue(property.cast(this.properties.get(property.getKey()))));
+        } else {
+            return Optional.empty();
+        }
+    }
+
     /**
      * Return the properties (CompoundMap)
      *

aspaper-api/build.gradle.kts.patch

@@ -1,14 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -40,6 +_,7 @@
+@@ -39,6 +_,7 @@
  }
 
  dependencies {
 +    api(project(":api")) //ASP
      // api dependencies are listed transitively to API consumers
      api("com.google.guava:guava:33.3.1-jre")
      api("com.google.code.gson:gson:2.11.0")
-@@ -90,7 +_,7 @@
+@@ -89,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
 
@@ -17,7 +17,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -100,6 +_,18 @@
+@@ -99,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -36,7 +36,7 @@
          }
      }
  }
-@@ -166,7 +_,7 @@
+@@ -165,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -45,7 +45,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -199,11 +_,11 @@
+@@ -198,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

aspaper-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -26,6 +_,17 @@
+@@ -23,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
 
@@ -17,8 +17,8 @@
 +
      spigot {
          enabled = true
-         buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
-@@ -107,7 +_,19 @@
+         buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
+@@ -104,7 +_,19 @@
      }
  }
 
@@ -39,17 +39,17 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -129,7 +_,8 @@
+@@ -127,7 +_,8 @@
  }
 
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":aspaper-api")) //ASP
 +    implementation(project(":core")) //ASP
-     implementation("ca.spottedleaf:concurrentutil:0.0.3")
+     implementation("ca.spottedleaf:concurrentutil:0.0.7")
      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
-@@ -200,14 +_,14 @@
+@@ -197,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,
-@@ -266,7 +_,7 @@
+@@ -263,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

aspaper-server/minecraft-patches/features/0001-Disable-dragon-battle.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable dragon battle
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 53ec0565a76663de74bb228c23c3d74a640a20f9..2c85ace929aeb9078fe868bcc56a2be08ac2f7ba 100644
+index efd599c516d89ebc5f040413b7c17c5bf0ad796c..fe30353d28cf7e35e7ba7267a8a630f2cffccd4a 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -684,7 +684,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -707,7 +707,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          );
          this.structureManager = new StructureManager(this, this.serverLevelData.worldGenOptions(), this.structureCheck); // CraftBukkit
          if (this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END

…atures/0003-Avoid-IO-call-for-UUID.patch …atures/0002-Avoid-IO-call-for-UUID.patchaspaper-server/minecraft-patches/features/0003-Avoid-IO-call-for-UUID.patch renamed to aspaper-server/minecraft-patches/features/0002-Avoid-IO-call-for-UUID.patch aspaper-server/minecraft-patches/features/0003-Avoid-IO-call-for-UUID.patch renamed to aspaper-server/minecraft-patches/features/0002-Avoid-IO-call-for-UUID.patch

@@ -5,15 +5,15 @@ Subject: [PATCH] Avoid IO call for UUID
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 2c85ace929aeb9078fe868bcc56a2be08ac2f7ba..939605ce630ab66b7236962dec3ae61ed23dc222 100644
+index 2c8e5d8bebb53c70c3180e72af738e87ec0f36f6..c394731283ee3344a8e21d3b2d0f75470e4f6bfd 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -612,7 +612,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-         super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
-         this.pvpMode = server.isPvpAllowed();
+@@ -636,7 +636,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         // CraftBukkit start
+         super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs & Async-Anti-Xray: Pass executor
          this.levelStorageAccess = levelStorageAccess;
 -        this.uuid = org.bukkit.craftbukkit.util.WorldUUID.getOrCreate(levelStorageAccess.levelDirectory.path().toFile());
 +        this.uuid = bootstrap == null ? org.bukkit.craftbukkit.util.WorldUUID.getOrCreate(levelStorageAccess.levelDirectory.path().toFile()) : java.util.UUID.randomUUID(); //ASP - avoid IO calls
+         this.levelLoadListener = new net.minecraft.server.level.progress.LoggingLevelLoadListener(false, this);
          // CraftBukkit end
          this.tickTime = tickTime;
-         this.server = server;

aspaper-server/minecraft-patches/features/0002-World-overrides.patch

@@ -5,23 +5,23 @@ Subject: [PATCH] Prevent config disk io on world load
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 939605ce630ab66b7236962dec3ae61ed23dc222..51cfeb87385b7e40922049a197a417a3892c2fce 100644
+index c394731283ee3344a8e21d3b2d0f75470e4f6bfd..db13c732fdea20e28130a89b40bbe8662d4873da 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -609,7 +609,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -634,7 +634,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      ) {
          //ASP end
          // CraftBukkit start
--        super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
-+        super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> bootstrap != null ? com.infernalsuite.asp.config.SlimePaperWorldConfig.initializeOrGet() : server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs; Async-Anti-Xray: Pass executor //ASP - Optimize world config
-         this.pvpMode = server.isPvpAllowed();
+-        super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs & Async-Anti-Xray: Pass executor
++        super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> bootstrap != null ? com.infernalsuite.asp.config.SlimePaperWorldConfig.initializeOrGet() : server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs & Async-Anti-Xray: Pass executor  //ASP - Optimize world config
          this.levelStorageAccess = levelStorageAccess;
          this.uuid = bootstrap == null ? org.bukkit.craftbukkit.util.WorldUUID.getOrCreate(levelStorageAccess.levelDirectory.path().toFile()) : java.util.UUID.randomUUID(); //ASP - avoid IO calls
+         this.levelLoadListener = new net.minecraft.server.level.progress.LoggingLevelLoadListener(false, this);
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index e4b9a564aad3d9b673808caa18265b06592ceab8..8bb30eba86b74f155ef9580dc6c01d761e23dd5a 100644
+index d225267b1b07854b76c88ce461d7817a86d023a0..de152aca205954d33cf2997043cb8c91b9587cdf 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -838,7 +838,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
+@@ -844,7 +844,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          this.maxSectionY = this.maxY >> 4;
          this.sectionsCount = this.maxSectionY - this.minSectionY + 1;
          // Paper end - getblock optimisations - cache world height/sections

…event-config-disk-io-on-world-load.patch …event-config-disk-io-on-world-load.patchaspaper-server/minecraft-patches/features/0004-Prevent-config-disk-io-on-world-load.patch renamed to aspaper-server/minecraft-patches/features/0003-Prevent-config-disk-io-on-world-load.patch aspaper-server/minecraft-patches/features/0004-Prevent-config-disk-io-on-world-load.patch renamed to aspaper-server/minecraft-patches/features/0003-Prevent-config-disk-io-on-world-load.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Read only dimension data store
 
 
 diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
-index 5d63bf024cbcbd2f627c64fee77553c9a512bd15..da169d319e9c09de2d5a34784af4e4c133b10f46 100644
+index 413f0673557b9e3f9177d15e9bef61bded209e34..ebc9373bb3a48ef41d54d445c1aa02fe06d83cff 100644
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
 @@ -210,7 +210,13 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
-             LOGGER.error("Failed to create dimension data storage directory", (Throwable)var15);
+             LOGGER.error("Failed to create dimension data storage directory", (Throwable)var14);
          }
 
 -        this.dataStorage = new DimensionDataStorage(new SavedData.Context(level), path, fixerUpper, level.registryAccess());

…005-Read-only-dimension-data-store.patch …004-Read-only-dimension-data-store.patchaspaper-server/minecraft-patches/features/0005-Read-only-dimension-data-store.patch renamed to aspaper-server/minecraft-patches/features/0004-Read-only-dimension-data-store.patch aspaper-server/minecraft-patches/features/0005-Read-only-dimension-data-store.patch renamed to aspaper-server/minecraft-patches/features/0004-Read-only-dimension-data-store.patch

@@ -1,6 +1,6 @@
 --- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
 +++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
-@@ -206,6 +_,7 @@
+@@ -214,6 +_,7 @@
 
      @Override
      public boolean forceNoSave(final ChunkAccess chunk) {