Folia support

build.gradle.kts

@@ -2,6 +2,7 @@ import com.volmit.nmstools.NMSToolsExtension
 import com.volmit.nmstools.NMSToolsPlugin
 import de.undercouch.gradle.tasks.download.Download
 import xyz.jpenilla.runpaper.task.RunServer
+import xyz.jpenilla.runtask.service.DownloadsAPIService
 import kotlin.system.exitProcess
 
 /*
@@ -94,6 +95,9 @@ nmsBindings.forEach { key, value ->
             compileOnly(project(":core"))
             compileOnly(rootProject.libs.annotations)
             compileOnly(rootProject.libs.byteBuddy.core)
+            compileOnly(rootProject.libs.platformUtils) {
+                isTransitive = false
+            }
         }
     }
 
@@ -111,6 +115,22 @@ nmsBindings.forEach { key, value ->
         systemProperty("iris.suppressReporting", !errorReporting)
         jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
     }
+
+    tasks.register<RunServer>("runFolia-$key") {
+        group = "servers"
+        downloadsApiService = DownloadsAPIService.folia(project)
+        minecraftVersion(value.split("-")[0])
+        minHeapSize = serverMinHeap
+        maxHeapSize = serverMaxHeap
+        pluginJars(tasks.jar.flatMap { it.archiveFile })
+        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(jvmVersion.getOrDefault(key, 21))}
+        runDirectory.convention(layout.buildDirectory.dir("run/$key"))
+        systemProperty("disable.watchdog", "")
+        systemProperty("net.kyori.ansi.colorLevel", color)
+        systemProperty("com.mojang.eula.agree", true)
+        systemProperty("iris.suppressReporting", !errorReporting)
+        jvmArgs("-javaagent:${project(":core:agent").tasks.jar.flatMap { it.archiveFile }.get().asFile.absolutePath}")
+    }
 }
 
 tasks {
@@ -195,6 +215,7 @@ allprojects {
         maven("https://mvn.lumine.io/repository/maven-public/") // mythic
         maven("https://nexus.phoenixdevt.fr/repository/maven-public/") //MMOItems
         maven("https://repo.onarandombox.com/content/groups/public/") //Multiverse Core
+        maven("https://repo.thenextlvl.net/releases") //Worlds
     }
 
     dependencies {

core/build.gradle.kts

@@ -67,16 +67,21 @@ dependencies {
         isTransitive = false
     }
     compileOnly(libs.multiverseCore)
+    compileOnly(libs.worlds)
 
     // Shaded
     implementation(slimjarHelper("spigot"))
+    implementation(rootProject.libs.platformUtils) {
+        isTransitive = false
+    }
 
     // Dynamically Loaded
     slim(libs.paralithic)
     slim(libs.paperlib)
-    slim(libs.adventure.api)
     slim(libs.adventure.minimessage)
     slim(libs.adventure.platform)
+    slim(libs.adventure.gson)
+    slim(libs.adventure.legacy)
     slim(libs.bstats)
     slim(libs.sentry)
 
@@ -108,6 +113,11 @@ dependencies {
             slim(libs.mavenCore)
         }
     }
+
+    constraints {
+        slim(libs.gson)
+        compileOnly(libs.gson)
+    }
 }
 
 java {
@@ -131,8 +141,7 @@ slimJar {
     ))
 
     relocate("com.dfsek.paralithic", "$lib.paralithic")
-    relocate("io.papermc.lib", "$lib.paper")
-    relocate("net.kyori", "$lib.kyori")
+    relocate("net.kyori.audience", "$lib.audience")
     relocate("org.bstats", "$lib.metrics")
     relocate("io.sentry", "$lib.sentry")
     relocate("org.apache.maven", "$lib.maven")

core/src/main/java/com/volmit/iris/Iris.java

@@ -62,6 +62,8 @@
 import com.volmit.iris.util.scheduling.Queue;
 import com.volmit.iris.util.scheduling.ShurikenQueue;
 import lombok.NonNull;
+import de.crazydev22.platformutils.Platform;
+import de.crazydev22.platformutils.PlatformUtils;
 import org.bukkit.*;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.Command;
@@ -79,6 +81,7 @@
 import java.lang.annotation.Annotation;
 import java.net.URL;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -95,6 +98,7 @@ public class Iris extends VolmitPlugin implements Listener {
     public static MultiverseCoreLink linkMultiverseCore;
     public static IrisCompat compat;
     public static FileWatcher configWatcher;
+    public static Platform platform;
     private static VolmitSender sender;
     private static Thread shutdownHook;
 
@@ -313,15 +317,14 @@ public static void safeguard(String format, Object... args) {
     @SuppressWarnings("deprecation")
     public static void later(NastyRunnable object) {
         try {
-            Bukkit.getScheduler().scheduleAsyncDelayedTask(instance, () ->
-            {
+            platform.getAsyncScheduler().runDelayed(task -> {
                 try {
                     object.run();
                 } catch (Throwable e) {
                     e.printStackTrace();
                     Iris.reportError(e);
                 }
-            }, RNG.r.i(100, 1200));
+            }, RNG.r.i(5, 60), TimeUnit.SECONDS);
         } catch (IllegalPluginAccessException ignored) {
 
         }
@@ -441,6 +444,7 @@ public Iris() {
 
     private void enable() {
         services = new KMap<>();
+        platform = PlatformUtils.createPlatform(this);
         setupAudience();
         Bindings.setupSentry();
         initialize("com.volmit.iris.core.service").forEach((i) -> services.put((Class<? extends IrisService>) i.getClass(), (IrisService) i));
@@ -456,7 +460,7 @@ private void enable() {
         services.values().forEach(this::registerListener);
         addShutdownHook();
         J.s(() -> {
-            J.a(IrisSafeguard::suggestPaper);
+            //J.a(IrisSafeguard::suggestPaper); //TODO reimplement this
             J.a(() -> IO.delete(getTemp()));
             J.a(LazyPregenerator::loadLazyGenerators, 100);
             J.a(this::bstats);
@@ -506,8 +510,13 @@ public void checkForBukkitWorlds(Predicate<String> filter) {
                     WorldCreator c = new WorldCreator(s)
                             .generator(gen)
                             .environment(dim.getEnvironment());
-                    INMS.get().createWorld(c);
-                    Iris.info(C.LIGHT_PURPLE + "Loaded " + s + "!");
+                    INMS.get().createWorldAsync(c)
+                            .thenAccept(w -> Iris.info(C.LIGHT_PURPLE + "Loaded " + s + "!"))
+                            .exceptionally(e -> {
+                                Iris.error("Failed to load world " + s + "!");
+                                e.printStackTrace();
+                                return null;
+                            });
                 } catch (Throwable e) {
                     Iris.error("Failed to load world " + s + "!");
                     e.printStackTrace();
@@ -528,7 +537,7 @@ private void autoStartStudio() {
                     J.s(() -> {
                         for (Player i : getServer().getOnlinePlayers()) {
                             i.setGameMode(GameMode.SPECTATOR);
-                            i.teleport(new Location(w, 0, 200, 0));
+                            platform.teleportAsync(i, new Location(w, 0, 200, 0));
                         }
                     });
                 });
@@ -562,7 +571,6 @@ public void onEnable() {
 
     public void onDisable() {
         services.values().forEach(IrisService::onDisable);
-        Bukkit.getScheduler().cancelTasks(this);
         HandlerList.unregisterAll((Plugin) this);
         postShutdown.forEach(Runnable::run);
         super.onDisable();

core/src/main/java/com/volmit/iris/core/ServerConfigurator.java

@@ -179,11 +179,14 @@ public static void restart() {
             Iris.warn("New data pack entries have been installed in Iris! Restarting server!");
             Iris.warn("This will only happen when your pack changes (updates/first time setup)");
             Iris.warn("(You can disable this auto restart in iris settings)");
+            if (!Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart")) {
+                Iris.warn("Looks like the restart command didn't work. Stopping the server instead!");
+                Bukkit.shutdown();
+            }
             J.s(() -> {
                 Iris.warn("Looks like the restart command didn't work. Stopping the server instead!");
                 Bukkit.shutdown();
             }, 100);
-            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart");
         });
     }
 

core/src/main/java/com/volmit/iris/core/commands/CommandIris.java

@@ -42,7 +42,6 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.*;
 import java.util.List;
@@ -158,13 +157,8 @@ public void teleport(
             return;
         }
 
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                target.teleport(world.getSpawnLocation());
-                new VolmitSender(target).sendMessage(C.GREEN + "You have been teleported to " + world.getName() + ".");
-            }
-        }.runTask(Iris.instance);
+        Iris.platform.teleportAsync(target, world.getSpawnLocation()).thenRun(() ->
+                new VolmitSender(target).sendMessage(C.GREEN + "You have been teleported to " + world.getName() + "."));
     }
 
     @Decree(description = "Print version information")

core/src/main/java/com/volmit/iris/core/commands/CommandObject.java

@@ -128,7 +128,7 @@ public void setTile(int xx, int yy, int zz, TileData tile) {
             public Engine getEngine() {
                 return null;
             }
-        };
+        }.sync(world);
     }
 
     @Decree(description = "Check the composition of an object")