-Uses of Class
+Uses of Class
Uses of Class
co.aikar.commands.BukkitCommandManager
+Uses of Class
co.aikar.commands.FoliaCommandManager
Packages that use BukkitCommandManager
@@ -68,17 +68,17 @@ loadScripts(document, 'script');
-
diff --git a/docs/acf-bukkit/co/aikar/commands/class-use/BukkitRootCommand.html b/docs/acf-bukkit/co/aikar/commands/class-use/BukkitRootCommand.html
index 6a2120e6..1cf66745 100644
--- a/docs/acf-bukkit/co/aikar/commands/class-use/BukkitRootCommand.html
+++ b/docs/acf-bukkit/co/aikar/commands/class-use/BukkitRootCommand.html
@@ -90,7 +90,7 @@ loadScripts(document, 'script');
-
diff --git a/docs/acf-bukkit/deprecated-list.html b/docs/acf-bukkit/deprecated-list.html
index 4031eee0..49be7905 100644
--- a/docs/acf-bukkit/deprecated-list.html
+++ b/docs/acf-bukkit/deprecated-list.html
@@ -81,7 +81,7 @@ loadScripts(document, 'script');
-
+
diff --git a/docs/acf-bukkit/index-all.html b/docs/acf-bukkit/index-all.html
index 47d36337..c92ae155 100644
--- a/docs/acf-bukkit/index-all.html
+++ b/docs/acf-bukkit/index-all.html
@@ -55,7 +55,7 @@ loadScripts(document, 'script');
Constructor
Description
ACFBukkitHelpTopic(BukkitCommandManager manager,
+ACFBukkitHelpTopic(BukkitCommandManager manager,
BukkitRootCommand command)
-
+
-
+
-BukkitLocales(BukkitCommandManager manager)
+BukkitLocales(BukkitCommandManager manager)
Constructor
Description
ACFBukkitHelpTopic(BukkitCommandManager manager,
+ACFBukkitHelpTopic(BukkitCommandManager manager,
BukkitRootCommand command)
Use unregisterCommand(BaseCommand) - this will be visibility reduced later.
- ACFBukkitHelpTopic - Class in co.aikar.commands
- -
- ACFBukkitHelpTopic(BukkitCommandManager, BukkitRootCommand) - Constructor for class co.aikar.commands.ACFBukkitHelpTopic +
- ACFBukkitHelpTopic(BukkitCommandManager, BukkitRootCommand) - Constructor for class co.aikar.commands.ACFBukkitHelpTopic
- ACFBukkitUtil - Class in co.aikar.commands
- @@ -74,11 +74,11 @@ loadScripts(document, 'script');
- BukkitCommandCompletions - Class in co.aikar.commands
- -
- BukkitCommandCompletions(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitCommandCompletions +
- BukkitCommandCompletions(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitCommandCompletions
- BukkitCommandContexts - Class in co.aikar.commands
- -
- BukkitCommandContexts(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitCommandContexts +
- BukkitCommandContexts(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitCommandContexts
- BukkitCommandExecutionContext - Class in co.aikar.commands
- @@ -92,7 +92,7 @@ loadScripts(document, 'script');
- BukkitLocales - Class in co.aikar.commands
- -
- BukkitLocales(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitLocales +
- BukkitLocales(BukkitCommandManager) - Constructor for class co.aikar.commands.BukkitLocales
- BukkitMessageFormatter - Class in co.aikar.commands
- diff --git a/docs/acf-paper/co/aikar/commands/PaperCommandManager.html b/docs/acf-paper/co/aikar/commands/PaperCommandManager.html index 1bcad701..55bde463 100644 --- a/docs/acf-paper/co/aikar/commands/PaperCommandManager.html +++ b/docs/acf-paper/co/aikar/commands/PaperCommandManager.html @@ -72,7 +72,7 @@ loadScripts(document, 'script');
java.lang.Object
co.aikar.commands.CommandManager<org.bukkit.command.CommandSender,co.aikar.commands.BukkitCommandIssuer,org.bukkit.ChatColor,co.aikar.commands.BukkitMessageFormatter,co.aikar.commands.BukkitCommandExecutionContext,co.aikar.commands.BukkitConditionContext>
-
+extends co.aikar.commands.FoliaCommandManager
co.aikar.commands.BukkitCommandManager
+
@@ -80,7 +80,7 @@ loadScripts(document, 'script');
co.aikar.commands.FoliaCommandManager
co.aikar.commands.PaperCommandManager
+extends co.aikar.commands.FoliaCommandManager
-
@@ -89,7 +89,7 @@ loadScripts(document, 'script');
Field Summary
-
Fields inherited from class co.aikar.commands.BukkitCommandManager
+Fields inherited from class co.aikar.commands.FoliaCommandManager
autoDetectFromClient, completions, contexts, issuersLocaleString, knownCommands, locales, mcMinorVersion, mcPatchVersion, plugin, registeredCommandsFields inherited from class co.aikar.commands.CommandManager
@@ -133,7 +133,7 @@ loadScripts(document, 'script');
-
Methods inherited from class co.aikar.commands.BukkitCommandManager
+Methods inherited from class co.aikar.commands.FoliaCommandManager
createCommandContext, createCompletionContext, createConditionContext, createRegisteredCommand, createRootCommand, getCommandIssuer, getCommandPrefix, getLocales, getPlugin, getRegisteredRootCommands, getTimings, handleUncaughtException, hasRegisteredCommands, isCommandIssuer, log, registerCommand, registerCommand, setPlayerLocale, unregisterCommand, unregisterCommand, unregisterCommands, usePerIssuerLocaleMethods inherited from class co.aikar.commands.CommandManager
@@ -182,7 +182,7 @@ loadScripts(document, 'script');public co.aikar.commands.CommandContexts<co.aikar.commands.BukkitCommandExecutionContext> getCommandContexts()
- Overrides: -
getCommandContextsin classco.aikar.commands.BukkitCommandManager
+getCommandContextsin classco.aikar.commands.FoliaCommandManager
public co.aikar.commands.CommandCompletions<co.aikar.commands.BukkitCommandCompletionContext> getCommandCompletions()
- Overrides: -
getCommandCompletionsin classco.aikar.commands.BukkitCommandManager
+getCommandCompletionsin classco.aikar.commands.FoliaCommandManager
-
-
- co.aikar.commands.BukkitCommandManager +
- co.aikar.commands.FoliaCommandManager
- co.aikar.commands.PaperCommandManager
- co.aikar.commands.CommandManager<IT,
I, FT, MF, CEC, CC> -
-
- co.aikar.commands.BukkitCommandManager +
- co.aikar.commands.FoliaCommandManager
- co.aikar.commands.PaperCommandManager
+ diff --git a/folia/src/main/java/co/aikar/commands/ACFFoliaScheduler.java b/folia/src/main/java/co/aikar/commands/ACFFoliaScheduler.java new file mode 100644 index 00000000..5d67e517 --- /dev/null +++ b/folia/src/main/java/co/aikar/commands/ACFFoliaScheduler.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2016-2023 Daniel Ennis (Aikar) - MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package co.aikar.commands; + +import io.papermc.paper.threadedregions.scheduler.AsyncScheduler; +import io.papermc.paper.threadedregions.scheduler.ScheduledTask; +import org.bukkit.Bukkit; +import org.bukkit.plugin.Plugin; + +import java.util.concurrent.TimeUnit; + +public class ACFFoliaScheduler extends ACFBukkitScheduler { + + private ScheduledTask scheduledTask; + + @Override + public void registerSchedulerDependencies(BukkitCommandManager manager) { + manager.registerDependency(AsyncScheduler.class, Bukkit.getAsyncScheduler()); + } + + @Override + public void createDelayedTask(Plugin plugin, Runnable task, long delay) { + //We divide by 20 because 20 ticks per second. + Bukkit.getAsyncScheduler().runDelayed(plugin, (scheduledTask)-> task.run(), (delay / 20), TimeUnit.SECONDS); + } + + @Override + public void createLocaleTask(Plugin plugin, Runnable task, long delay, long period) { + //We divide by 20 because 20 ticks per second. + this.scheduledTask = Bukkit.getAsyncScheduler().runAtFixedRate(plugin, (scheduledTask)-> task.run(), (delay/20), (period/20), TimeUnit.SECONDS); + } + + @Override + public void cancelLocaleTask() { + this.scheduledTask.cancel(); + } +} diff --git a/folia/src/main/java/co/aikar/commands/FoliaCommandManager.java b/folia/src/main/java/co/aikar/commands/FoliaCommandManager.java new file mode 100644 index 00000000..02c9e8d8 --- /dev/null +++ b/folia/src/main/java/co/aikar/commands/FoliaCommandManager.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016-2023 Daniel Ennis (Aikar) - MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package co.aikar.commands; + +import org.bukkit.plugin.Plugin; + +@SuppressWarnings("WeakerAccess") +public class FoliaCommandManager extends PaperCommandManager { + + public FoliaCommandManager(Plugin plugin) { + super(plugin, new ACFFoliaScheduler()); + } +} \ No newline at end of file diff --git a/paper/pom.xml b/paper/pom.xml index 6c324166..a279cc7a 100644 --- a/paper/pom.xml +++ b/paper/pom.xml @@ -64,5 +64,11 @@4.0.0 + ++ + +co.aikar +acf-parent +0.5.1-SNAPSHOT +../pom.xml +acf-folia +0.5.1-SNAPSHOT + +ACF (Folia) + ++ ++ +co.aikar +acf-paper +0.5.1-SNAPSHOT +compile ++ +co.aikar +acf-brigadier +0.5.1-SNAPSHOT +compile ++ +dev.folia +folia-api +1.19.4-R0.1-SNAPSHOT +provided +1.15.2-R0.1-SNAPSHOT provided ++ diff --git a/paper/src/main/java/co/aikar/commands/PaperCommandManager.java b/paper/src/main/java/co/aikar/commands/PaperCommandManager.java index 6de574ff..5c917d6b 100644 --- a/paper/src/main/java/co/aikar/commands/PaperCommandManager.java +++ b/paper/src/main/java/co/aikar/commands/PaperCommandManager.java @@ -32,7 +32,11 @@ public class PaperCommandManager extends BukkitCommandManager { // If we get anything Paper specific public PaperCommandManager(Plugin plugin) { - super(plugin); + this(plugin, new ACFBukkitScheduler()); + } + + public PaperCommandManager(Plugin plugin, ACFBukkitScheduler scheduler) { + super(plugin, scheduler); try { Class.forName("com.destroystokyo.paper.event.server.AsyncTabCompleteEvent"); plugin.getServer().getPluginManager().registerEvents(new PaperAsyncTabCompleteHandler(this), plugin); diff --git a/pom.xml b/pom.xml index d1a11023..37eb1565 100644 --- a/pom.xml +++ b/pom.xml @@ -206,5 +206,6 @@dev.folia +folia-api +1.19.4-R0.1-SNAPSHOT +provided +sponge jda velocity +folia