From eb8f59ed35acd3cd6779a02de8a45b93a2411ecf Mon Sep 17 00:00:00 2001 From: ChunghwaMC <92585552+ChunghwaMC@users.noreply.github.com> Date: Tue, 18 Feb 2025 20:52:42 +0800 Subject: [PATCH 1/5] add folia supported --- src/main/resources/plugin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1977c98..05c23c7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,7 +2,8 @@ name: WelcomeBack main: dev.hadimhz.welcome.WelcomePlugin version: 1.8 api-version: 1.13 +folia-supported: true commands: welcome: - aliases: [ wb ] \ No newline at end of file + aliases: [ wb ] From 82f0ae37368f0e210f0874833a6aeb73c09fb66b Mon Sep 17 00:00:00 2001 From: ChunghwaMC <92585552+ChunghwaMC@users.noreply.github.com> Date: Sat, 22 Feb 2025 23:54:25 +0800 Subject: [PATCH 2/5] add folia supported --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 99b092c..22820f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,12 +9,12 @@ version = "" repositories { mavenCentral() - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + maven("https://repo.papermc.io/repository/maven-public/") } dependencies { - compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT") + compileOnly("dev.folia:folia-api:1.21.4-R0.1-SNAPSHOT") implementation(files("./libs/config.jar")) -} \ No newline at end of file +} From 166e026cfdf14299960e23c98a3b3cd42ff3cade Mon Sep 17 00:00:00 2001 From: ChunghwaMC <92585552+ChunghwaMC@users.noreply.github.com> Date: Sun, 23 Feb 2025 00:13:04 +0800 Subject: [PATCH 3/5] add folia supported --- .../welcome/command/CommandHandler.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java b/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java index eaf78e1..c6d6670 100644 --- a/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java +++ b/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java @@ -19,6 +19,17 @@ public class CommandHandler implements CommandExecutor { private final PlayerListener listener; private final Config config; + private final boolean isFolia = classExist("io.papermc.paper.threadedregions.RegionizedServerInitEvent"); + + private static boolean classExist(String className) { + try { + Class.forName(className); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + public CommandHandler(Plugin plugin, PlayerListener listener, Config config) { this.plugin = plugin; this.listener = listener; @@ -56,7 +67,11 @@ public CommandHandler(Plugin plugin, PlayerListener listener, Config config) { if (config.displayFirstXWelcomeMessages == -1 || listener.getWelcomed().size() < config.displayFirstXWelcomeMessages) player.chat(config.firstJoin.get(random.nextInt(config.firstJoin.size())).replaceAll("%player%", listener.getPlayer().getName())); - for (String command : config.CommandsToExecuteOnFirstJoin) { + if(isFolia) + for (String command : config.CommandsToExecuteOnFirstJoin) { + Bukkit.getGlobalRegionScheduler().run(plugin, run -> Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), command.replaceAll("%player%", player.getName()))); + } + else for (String command : config.CommandsToExecuteOnFirstJoin) { Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), command.replaceAll("%player%", player.getName())); } @@ -64,7 +79,11 @@ public CommandHandler(Plugin plugin, PlayerListener listener, Config config) { if (config.displayFirstXWelcomeMessages == -1 || listener.getWelcomed().size() < config.displayFirstXWelcomeMessages) player.chat(config.joinBack.get(random.nextInt(config.joinBack.size())).replaceAll("%player%", listener.getPlayer().getName())); - for (String command : config.commandsToExecute) { + if(isFolia) + for (String command : config.commandsToExecute) { + Bukkit.getGlobalRegionScheduler().run(plugin, run -> Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), command.replaceAll("%player%", player.getName()))); + } + else for (String command : config.commandsToExecute) { Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), command.replaceAll("%player%", player.getName())); } } From e6713bee54592ad60649d29ae3b5a4cc4e05233e Mon Sep 17 00:00:00 2001 From: ChunghwaMC <92585552+ChunghwaMC@users.noreply.github.com> Date: Sun, 23 Feb 2025 00:14:02 +0800 Subject: [PATCH 4/5] add folia supported (java minversion 21 to 17) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 22820f3..1e35e46 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ repositories { } dependencies { - compileOnly("dev.folia:folia-api:1.21.4-R0.1-SNAPSHOT") + compileOnly("dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT") implementation(files("./libs/config.jar")) From 3079974da8a3f4b7742294d958ab36f8f1c02e59 Mon Sep 17 00:00:00 2001 From: ChunghwaMC <92585552+ChunghwaMC@users.noreply.github.com> Date: Sun, 23 Feb 2025 00:27:16 +0800 Subject: [PATCH 5/5] add folia supported --- .../java/dev/hadimhz/welcome/command/CommandHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java b/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java index c6d6670..1719d87 100644 --- a/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java +++ b/src/main/java/dev/hadimhz/welcome/command/CommandHandler.java @@ -23,10 +23,10 @@ public class CommandHandler implements CommandExecutor { private static boolean classExist(String className) { try { - Class.forName(className); - return true; + Class.forName(className); + return true; } catch (ClassNotFoundException e) { - return false; + return false; } }