.
This commit is contained in:
parent
46978ae799
commit
ce56c6e105
53 changed files with 776 additions and 891 deletions
|
|
@ -2,10 +2,6 @@ package de.kentoj.scrow.bukkit;
|
|||
|
||||
import de.kentoj.scrow.bukkit.command.economy.CoinsCommand;
|
||||
import de.kentoj.scrow.bukkit.command.friends.FriendCommand;
|
||||
import de.kentoj.scrow.bukkit.command.instance.InstanceCache;
|
||||
import de.kentoj.scrow.bukkit.command.instance.InstanceCommand;
|
||||
import de.kentoj.scrow.bukkit.command.instance.LobbyCommand;
|
||||
import de.kentoj.scrow.bukkit.command.instance.PlayCommand;
|
||||
import de.kentoj.scrow.bukkit.internal.player.prefix.CachedPrefixProvider;
|
||||
import de.kentoj.scrow.bukkit.internal.player.prefix.LuckPermsPrefixSetter;
|
||||
import de.kentoj.scrow.bukkit.style.ChatStyleListener;
|
||||
|
|
@ -27,10 +23,6 @@ public final class CoreImplPlugin extends JavaPlugin {
|
|||
|
||||
ScrowAPI.playerCommands().register(new CoinsCommand().rootLiteral());
|
||||
ScrowAPI.playerCommands().register(new FriendCommand().rootLiteral());
|
||||
var instanceCache = new InstanceCache();
|
||||
ScrowAPI.commands().register(new InstanceCommand(instanceCache).rootLiteral());
|
||||
ScrowAPI.playerCommands().register(new PlayCommand().rootLiteral());
|
||||
ScrowAPI.playerCommands().register(new LobbyCommand().rootLiteral());
|
||||
|
||||
var luckperms = LuckPermsProvider.get();
|
||||
new LuckPermsPrefixSetter(luckperms, cachedPrefixProvider).init(this);
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||
import de.kentoj.scrowlib.instancemanager.ServerInstance;
|
||||
import org.bson.Document;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
public class InstanceCache {
|
||||
|
||||
private final ConcurrentMap<String, ServerInstance> cache = new ConcurrentHashMap<>();
|
||||
|
||||
public InstanceCache() {
|
||||
ScrowAPI.messageBroker().subscribe("event.instance.up", doc -> {
|
||||
var inst = toInstance(doc);
|
||||
cache.put(inst.handle(), inst);
|
||||
});
|
||||
ScrowAPI.messageBroker().subscribe("event.instance.down", doc ->
|
||||
cache.remove(doc.getString("handle")));
|
||||
}
|
||||
|
||||
public Collection<ServerInstance> getInstances() {
|
||||
return cache.values();
|
||||
}
|
||||
|
||||
public @Nullable ServerInstance getInstance(String handle) {
|
||||
return cache.get(handle);
|
||||
}
|
||||
|
||||
private ServerInstance toInstance(Document doc) {
|
||||
return new ServerInstance(
|
||||
doc.getString("handle"),
|
||||
doc.getString("template"),
|
||||
doc.getInteger("port")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.kencommandapi.api.literal.RootLiteral;
|
||||
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public final class InstanceCommand {
|
||||
|
||||
private final RootLiteral<CommandSender> rootLiteral;
|
||||
|
||||
public InstanceCommand(InstanceCache instanceCache) {
|
||||
rootLiteral = Literal.<CommandSender>builder("instance", "server-manager")
|
||||
.withLiteral(new InstanceListLiteral().literal())
|
||||
.withLiteral(new InstanceDeployLiteral().literal())
|
||||
.withLiteral(new InstanceDestroyLiteral(instanceCache).literal())
|
||||
.asRootLiteral(new ScrowMessageStyle("server-manager", NamedTextColor.RED));
|
||||
}
|
||||
|
||||
public RootLiteral<CommandSender> rootLiteral() {
|
||||
return rootLiteral;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
|
||||
import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
|
||||
import de.kentoj.kencommandapi.api.invocation.CommandContext;
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class InstanceDeployLiteral {
|
||||
|
||||
private final Literal<CommandSender> literal;
|
||||
private final CommandArgumentSpec<CommandSender, String> templateArg;
|
||||
|
||||
InstanceDeployLiteral() {
|
||||
templateArg = CommandArgumentSpec.builder("template", new StringArgumentType<CommandSender>())
|
||||
.build();
|
||||
literal = Literal.<CommandSender>builder("deploy")
|
||||
.withArgument(templateArg)
|
||||
.withExecutor(this::deployInstance)
|
||||
.build();
|
||||
}
|
||||
|
||||
private CompletableFuture<?> deployInstance(CommandContext<CommandSender> ctx) {
|
||||
var template = ctx.getArg(templateArg);
|
||||
ctx.sender().sendMessage(ctx.style().ok("Deploying instance... this may take a while."));
|
||||
return Tasks.supplyAsync(() ->
|
||||
ScrowAPI.instanceManager().deployInstance(template))
|
||||
.thenSync(instance -> {
|
||||
ctx.sender().sendMessage(ctx.style().ok("Deployed instance of " + template + " with handle " + instance.handle() + "."));
|
||||
// FIXME handle unknown server
|
||||
}).toFuture();
|
||||
}
|
||||
|
||||
public Literal<CommandSender> literal() {
|
||||
return literal;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
|
||||
import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
|
||||
import de.kentoj.kencommandapi.api.invocation.CommandContext;
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
||||
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
||||
import de.kentoj.scrowlib.instancemanager.ServerInstance;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class InstanceDestroyLiteral {
|
||||
|
||||
private final Literal<CommandSender> literal;
|
||||
private final CommandArgumentSpec<CommandSender, String> handleArg;
|
||||
|
||||
InstanceDestroyLiteral(InstanceCache cache) {
|
||||
handleArg = CommandArgumentSpec.builder("handle", new StringArgumentType<CommandSender>())
|
||||
.withSuggestionProvider((_, _) ->
|
||||
cache.getInstances().stream()
|
||||
.map(ServerInstance::handle)
|
||||
.toList())
|
||||
.build();
|
||||
literal = Literal.<CommandSender>builder("destroy")
|
||||
.withArgument(handleArg)
|
||||
.withExecutor(this::destroyInstance)
|
||||
.build();
|
||||
}
|
||||
|
||||
private CompletableFuture<?> destroyInstance(CommandContext<CommandSender> ctx) {
|
||||
var handle = ctx.getArg(handleArg);
|
||||
return Tasks.supplyAsync(() -> ScrowAPI.instanceManager().destroyInstance(handle))
|
||||
.thenSync(found -> {
|
||||
if (!found) {
|
||||
ctx.sender().sendMessage(ctx.style().err("No instance with that handle found."));
|
||||
return;
|
||||
}
|
||||
ctx.sender().sendMessage(ctx.style().ok("Destroyed server with handle " + handle + "."));
|
||||
}).toFuture();
|
||||
}
|
||||
|
||||
public Literal<CommandSender> literal() {
|
||||
return literal;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.kencommandapi.api.invocation.CommandContext;
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class InstanceListLiteral {
|
||||
|
||||
private final Literal<CommandSender> literal;
|
||||
|
||||
InstanceListLiteral() {
|
||||
this.literal = Literal.<CommandSender>builder("list")
|
||||
.withExecutor(this::displayInstanceList)
|
||||
.build();
|
||||
}
|
||||
|
||||
private CompletableFuture<?> displayInstanceList(CommandContext<CommandSender> ctx) {
|
||||
return Tasks.supplyAsync(() ->
|
||||
ScrowAPI.instanceManager().instances())
|
||||
.thenSync(instances -> {
|
||||
var msg = Component.text("Running instances:");
|
||||
for (var inst : instances) {
|
||||
msg = msg.appendNewline()
|
||||
.append(Component.text(" - " + inst.handle() + " on port " + inst.port()));
|
||||
}
|
||||
ctx.sender().sendMessage(ctx.style().ok(msg));
|
||||
}).toFuture();
|
||||
}
|
||||
|
||||
public Literal<CommandSender> literal() {
|
||||
return literal;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import com.leakyabstractions.result.api.Result;
|
||||
import com.leakyabstractions.result.core.Results;
|
||||
import de.kentoj.kencommandapi.api.invocation.CommandContext;
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.kencommandapi.api.literal.RootLiteral;
|
||||
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public final class LobbyCommand {
|
||||
|
||||
private final RootLiteral<Player> rootLiteral;
|
||||
|
||||
public LobbyCommand() {
|
||||
rootLiteral = Literal.<Player>builder("lobby", "l", "hub")
|
||||
.withSyncExecutor(this::sendToLobby)
|
||||
.asRootLiteral(ScrowMessageStyle.GENERIC);
|
||||
}
|
||||
|
||||
private void sendToLobby(CommandContext<Player> ctx) {
|
||||
Bukkit.dispatchCommand(ctx.sender(), "play lobby");
|
||||
}
|
||||
|
||||
public RootLiteral<Player> rootLiteral() {
|
||||
return rootLiteral;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
package de.kentoj.scrow.bukkit.command.instance;
|
||||
|
||||
import de.kentoj.kencommandapi.api.argument.CommandArgumentSpec;
|
||||
import de.kentoj.kencommandapi.api.argument.types.StringArgumentType;
|
||||
import de.kentoj.kencommandapi.api.invocation.CommandContext;
|
||||
import de.kentoj.kencommandapi.api.literal.Literal;
|
||||
import de.kentoj.kencommandapi.api.literal.RootLiteral;
|
||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
||||
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public final class PlayCommand {
|
||||
|
||||
private final RootLiteral<Player> rootLiteral;
|
||||
private final CommandArgumentSpec<Player, String> gamemodeArg;
|
||||
|
||||
public PlayCommand() {
|
||||
var style = ScrowMessageStyle.GENERIC;
|
||||
gamemodeArg = CommandArgumentSpec.builder("gamemode", new StringArgumentType<Player>()).build();
|
||||
rootLiteral = Literal.<Player>builder("play", "queue")
|
||||
.withArgument(gamemodeArg)
|
||||
.withExecutor(this::execute)
|
||||
.asRootLiteral(style);
|
||||
}
|
||||
|
||||
private CompletableFuture<?> execute(CommandContext<Player> ctx) {
|
||||
var gamemode = ctx.getArg(gamemodeArg);
|
||||
return Tasks.supplyAsync(() -> ScrowAPI.instanceManager().instances())
|
||||
.mapSync(instances -> {
|
||||
var instance = instances.stream()
|
||||
.filter(inst -> inst.template().equals(gamemode))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (instance == null) {
|
||||
ctx.sender().sendMessage(ctx.style().err("No instance for " + gamemode + " found."));
|
||||
return null;
|
||||
}
|
||||
|
||||
return instance.handle();
|
||||
})
|
||||
.yieldIf(Objects::isNull)
|
||||
.thenAsync(handle ->
|
||||
ScrowAPI.getPlayer(ctx.sender()).sendToInstance(handle)
|
||||
).toFuture();
|
||||
}
|
||||
|
||||
public RootLiteral<Player> rootLiteral() {
|
||||
return rootLiteral;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
name: "CoreBukkit"
|
||||
version: "${version}"
|
||||
version: "UNVERSIONED"
|
||||
depend: [ "LuckPerms" ]
|
||||
main: "de.kentoj.scrow.bukkit.CoreImplPlugin"
|
||||
api-version: "1.21"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue