✨ Add a system for creating task chains
This will make it easier to use the asynchronous coordinator.
This commit is contained in:
parent
8e52bf705c
commit
aaa6386ca3
13 changed files with 660 additions and 25 deletions
|
|
@ -1,6 +1,7 @@
|
|||
dependencies {
|
||||
api project(':cloud-core')
|
||||
api project(':cloud-brigadier')
|
||||
api project(':cloud-tasks')
|
||||
compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
|
||||
compileOnly 'me.lucko:commodore:1.9'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ import cloud.commandframework.bukkit.parsers.selector.MultiplePlayerSelectorArgu
|
|||
import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorArgument;
|
||||
import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorArgument;
|
||||
import cloud.commandframework.execution.CommandExecutionCoordinator;
|
||||
import cloud.commandframework.tasks.TaskFactory;
|
||||
import cloud.commandframework.tasks.TaskRecipe;
|
||||
import io.leangen.geantyref.TypeToken;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
|
|
@ -73,6 +75,9 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
|
|||
private final Function<CommandSender, C> commandSenderMapper;
|
||||
private final Function<C, CommandSender> backwardsCommandSenderMapper;
|
||||
|
||||
private final BukkitSynchronizer bukkitSynchronizer;
|
||||
private final TaskFactory taskFactory;
|
||||
|
||||
private boolean splitAliases = false;
|
||||
|
||||
/**
|
||||
|
|
@ -96,6 +101,9 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
|
|||
this.commandSenderMapper = commandSenderMapper;
|
||||
this.backwardsCommandSenderMapper = backwardsCommandSenderMapper;
|
||||
|
||||
this.bukkitSynchronizer = new BukkitSynchronizer(owningPlugin);
|
||||
this.taskFactory = new TaskFactory(this.bukkitSynchronizer);
|
||||
|
||||
/* Try to determine the Minecraft version */
|
||||
int version = -1;
|
||||
try {
|
||||
|
|
@ -142,6 +150,15 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
|
|||
new MultiplePlayerSelectorArgument.MultiplePlayerSelectorParser<>());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new task recipe. This can be used to create chains of synchronous/asynchronous method calls
|
||||
*
|
||||
* @return Task recipe
|
||||
*/
|
||||
public @NonNull TaskRecipe taskRecipe() {
|
||||
return this.taskFactory.recipe();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the plugin that owns the manager
|
||||
*
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
//
|
||||
// MIT License
|
||||
//
|
||||
// Copyright (c) 2020 Alexander Söderberg & Contributors
|
||||
//
|
||||
// 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 cloud.commandframework.bukkit;
|
||||
|
||||
import cloud.commandframework.tasks.TaskConsumer;
|
||||
import cloud.commandframework.tasks.TaskFunction;
|
||||
import cloud.commandframework.tasks.TaskSynchronizer;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
final class BukkitSynchronizer implements TaskSynchronizer {
|
||||
|
||||
private final Plugin plugin;
|
||||
|
||||
BukkitSynchronizer(final @NonNull Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <I> CompletableFuture<Void> runSynchronous(final @NonNull I input, final @NonNull TaskConsumer<I> consumer) {
|
||||
final CompletableFuture<Void> future = new CompletableFuture<>();
|
||||
this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {
|
||||
consumer.accept(input);
|
||||
future.complete(null);
|
||||
});
|
||||
return future;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <I, O> CompletableFuture<O> runSynchronous(final @NonNull I input, final @NonNull TaskFunction<I, O> function) {
|
||||
final CompletableFuture<O> future = new CompletableFuture<>();
|
||||
this.plugin.getServer().getScheduler().runTask(this.plugin, () -> future.complete(function.apply(input)));
|
||||
return future;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <I> CompletableFuture<Void> runAsynchronous(final @NonNull I input, final @NonNull TaskConsumer<I> consumer) {
|
||||
final CompletableFuture<Void> future = new CompletableFuture<>();
|
||||
this.plugin.getServer().getScheduler().runTaskAsynchronously(this.plugin, () -> {
|
||||
consumer.accept(input);
|
||||
future.complete(null);
|
||||
});
|
||||
return future;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <I, O> CompletableFuture<O> runAsynchronous(final @NonNull I input, final @NonNull TaskFunction<I, O> function) {
|
||||
final CompletableFuture<O> future = new CompletableFuture<>();
|
||||
this.plugin.getServer().getScheduler().runTaskAsynchronously(this.plugin, () -> future.complete(function.apply(input)));
|
||||
return future;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue