Merge pull request #551 from VolmitSoftware/Development

1.16.10

Author: AvianAeternum

build.gradle

@@ -15,15 +15,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import xyz.jpenilla.runpaper.task.RunServer
+
 plugins {
     id 'java'
     id 'java-library'
     id "io.freefair.lombok" version "6.3.0"
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.9"
+    id "xyz.jpenilla.run-paper" version "2.3.1"
 }
 
-version '1.16.9-1.19.2-1.21.4'
+version '1.16.9-1.19.2-1.21.5'
 def apiVersion = '1.19'
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.adapt.Adapt'
@@ -51,6 +54,13 @@ def VERSIONS = Map.of(
         "v1_20_4", "1.20.4-R0.1-SNAPSHOT",
         "v1_19_2", "1.19.2-R0.1-SNAPSHOT"
 )
+def SUPPORTED = ["1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5"]
+def jdk = ["1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5"]
+
+def MIN_HEAP_SIZE = "2G"
+def MAX_HEAP_SIZE = "8G"
+//Valid values are: none, truecolor, indexed256, indexed16, indexed8
+def COLOR = "truecolor"
 
 VERSIONS.each {
     def key = it.key
@@ -65,6 +75,23 @@ VERSIONS.each {
         }
     }
 }
+SUPPORTED.forEach { version ->
+    tasks.register("runServer-$version", RunServer) {
+        group("servers")
+        minecraftVersion(version)
+        minHeapSize(MIN_HEAP_SIZE)
+        maxHeapSize(MAX_HEAP_SIZE)
+        systemProperty("disable.watchdog", "")
+        systemProperty("net.kyori.ansi.colorLevel", COLOR)
+        systemProperty("com.mojang.eula.agree", true)
+        pluginJars(tasks.shadowJar.archiveFile)
+        runDirectory.convention(layout.buildDirectory.dir("run/$version"))
+
+        if (jdk.contains(version)) {
+            javaLauncher = javaToolchains.launcherFor { it.languageVersion = JavaLanguageVersion.of(21)}
+        }
+    }
+}
 
 /**
  * Gradle is weird sometimes, we need to delete the plugin yml from the build folder to actually filter properly.
@@ -140,7 +167,7 @@ allprojects {
         compileOnly "com.github.angeschossen:ChestProtectAPI:3.9.1"
         compileOnly "com.github.TechFortress:GriefPrevention:16.18.1"
         implementation 'xyz.xenondevs:particle:1.8.4'
-        implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.3"
+        implementation "com.frengor:ultimateadvancementapi-shadeable:2.5.1"
         implementation 'com.jeff-media:custom-block-data:2.2.3'
         compileOnly 'com.griefdefender:api:2.1.0-SNAPSHOT'
         compileOnly 'io.netty:netty-all:4.1.68.Final'

gradle/wrapper/gradle-wrapper.properties

@@ -17,6 +17,6 @@
 #
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/volmit/adapt/Adapt.java

@@ -238,7 +238,7 @@ public static List<Object> initialize(String s) {
     }
 
     public static KList<Object> initialize(String s, Class<? extends Annotation> slicedClass) {
-        JarScanner js = new JarScanner(instance.jar(), s);
+        JarScanner js = new JarScanner(instance.getFile(), s);
         KList<Object> v = new KList<>();
         J.attempt(js::scan);
         for (Class<?> i : js.getClasses()) {

src/main/java/com/volmit/adapt/api/data/WorldData.java

@@ -48,7 +48,7 @@ public class WorldData extends TickedObject {
     public WorldData(World world) {
         super("world-data", world.getUID().toString(), 30_000);
         this.world = world;
-        mantle = new Mantle(Adapt.instance.getDataFolder("data", "mantle"), world.getMaxHeight());
+        mantle = new Mantle(Adapt.instance.getDataFolder("data", "mantle", world.getName()), world.getMaxHeight());
     }
 
     public static void stop() {
@@ -89,11 +89,13 @@ public void unregister() {
 
     @EventHandler
     public void on(WorldSaveEvent e) {
+        if (e.getWorld() != world) return;
         J.a(mantle::saveAll);
     }
 
     @EventHandler
     public void on(WorldUnloadEvent e) {
+        if (e.getWorld() != world) return;
         unregister();
     }