diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4b14e8..fab9922 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,59 +4,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
@@ -152,13 +145,7 @@
-
-
-
+
@@ -174,33 +161,34 @@
- {
+ "keyToString": {
+ "Gradle.Download Sources.executor": "Run",
+ "Gradle.core [build].executor": "Debug",
+ "Gradle.core [clean].executor": "Run",
+ "Gradle.core [publishAllPublicationsToScrowRepository].executor": "Run",
+ "Gradle.core [publishCoreLibPublicationToScrowRepository].executor": "Run",
+ "Gradle.core:core-bukkit-api [build].executor": "Run",
+ "Gradle.core:core-bukkit-api [clean].executor": "Run",
+ "Gradle.core:core-lib [publishAllPublicationsToScrowRepository].executor": "Run",
+ "Gradle.core:core-lib [publishCoreLibPublicationToMavenLocal].executor": "Run",
+ "Gradle.core:core-lib [publishCoreLibPublicationToScrowRepository].executor": "Run",
+ "ModuleVcsDetector.initialDetectionPerformed": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "git-widget-placeholder": "master",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "/home/a/src/scrow",
+ "project.structure.last.edited": "Project",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.6268199",
+ "settings.editor.selected.configurable": "preferences.pluginManager"
}
-}]]>
+}
+
@@ -388,6 +376,7 @@
-
+
+
\ No newline at end of file
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
index 2c66d03..a9219c5 100644
--- a/core-bukkit-api/build.gradle.kts
+++ b/core-bukkit-api/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
id("de.kentoj.scrow.scrow-repository")
id("de.kentoj.scrow.base-dependencies")
id("de.kentoj.scrow.java-library")
- id("de.kentoj.scrow.reactor")
+ id("de.kentoj.scrow.database")
}
group = "de.kentoj.scrow"
@@ -24,9 +24,9 @@ dependencies {
api("io.nats:jnats:2.25.2")
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.21")
+ api("de.kentoj.scrow:kencommandapi-core:0.22")
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-bukkit
- api("de.kentoj.scrow:kencommandapi-bukkit:0.21")
+ api("de.kentoj.scrow:kencommandapi-bukkit:0.22")
}
publishing {
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/PlayerManager.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/PlayerManager.java
deleted file mode 100644
index e19c90c..0000000
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/PlayerManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.kentoj.scrow.bukkit;
-
-import com.leakyabstractions.result.api.Result;
-
-import java.util.UUID;
-
-public interface PlayerManager {
-
- Result sendPlayer(UUID uuid, String instanceHandle);
-}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
index c1d70b0..127756b 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
@@ -3,24 +3,29 @@ package de.kentoj.scrow.bukkit;
import de.kentoj.kencommandapi.CommandAPI;
import de.kentoj.scrow.bukkit.friends.FriendRequestService;
import de.kentoj.scrow.bukkit.friends.FriendshipService;
+import de.kentoj.scrow.bukkit.misc.EconomyService;
+import de.kentoj.scrow.bukkit.misc.PlayerManager;
import de.kentoj.scrow.bukkit.region.RegionManager;
-import de.kentoj.scrowlib.connection.DatabaseConnectionFactory;
import de.kentoj.scrowlib.servermanager.InstanceManager;
import io.nats.client.Connection;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import org.bukkit.plugin.Plugin;
+import org.jdbi.v3.core.Jdbi;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
-import reactor.core.scheduler.Scheduler;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ScrowAPI {
+ /**
+ * Might be null in testing environments
+ */
@Getter
- private static DatabaseConnectionFactory dbConFactory;
- @Getter
- private static Scheduler minecraftScheduler;
+ private static @Nullable Jdbi jdbi;
+ @ApiStatus.Internal
+ public static Plugin plugin;
@Getter
private static EconomyService economyService;
@Getter
@@ -44,8 +49,8 @@ public class ScrowAPI {
}
@ApiStatus.Internal
- public static void setMinecraftScheduler(Scheduler minecraftScheduler) {
- ScrowAPI.minecraftScheduler = minecraftScheduler;
+ public static void setCorePlugin(Plugin plugin) {
+ ScrowAPI.plugin = plugin;
}
@ApiStatus.Internal
@@ -69,8 +74,8 @@ public class ScrowAPI {
}
@ApiStatus.Internal
- public static void setDbConFactory(@Nullable DatabaseConnectionFactory dbConFactory) {
- ScrowAPI.dbConFactory = dbConFactory;
+ public static void setJdbi(@Nullable Jdbi jdbi) {
+ ScrowAPI.jdbi = jdbi;
}
@ApiStatus.Internal
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendRequestService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendRequestService.java
index 3970f49..619a415 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendRequestService.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendRequestService.java
@@ -1,26 +1,23 @@
package de.kentoj.scrow.bukkit.friends;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
+import java.util.List;
import java.util.UUID;
public interface FriendRequestService {
- Flux<@NotNull FriendRequest> getFriendRequestsTo(UUID playerId);
+ List getFriendRequestsTo(UUID playerId);
- Flux<@NotNull FriendRequest> getFriendRequestsFrom(UUID playerId);
+ List getFriendRequestsFrom(UUID playerId);
- Mono<@NotNull FriendRequest> getFriendRequest(UUID from, UUID to);
+ FriendRequest getFriendRequest(UUID from, UUID to);
/**
* @return True if request saved, false if already existing request found.
*/
- Mono<@NotNull Boolean> saveFriendRequest(FriendRequest friendRequest);
+ boolean saveFriendRequest(FriendRequest friendRequest);
/**
* @return True if request deleted, false if none found.
*/
- Mono<@NotNull Boolean> deleteFriendRequest(UUID from, UUID to);
+ boolean deleteFriendRequest(UUID from, UUID to);
}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
index 6df937c..251a7ce 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
@@ -1,24 +1,21 @@
package de.kentoj.scrow.bukkit.friends;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
+import java.util.List;
import java.util.UUID;
public interface FriendshipService {
- Mono<@NotNull Friendship> getFriendship(UUID uuid1, UUID uuid2);
+ Friendship getFriendship(UUID uuid1, UUID uuid2);
- Flux<@NotNull Friendship> getFriendships(UUID playerId);
+ List getFriendships(UUID playerId);
/*
* @return True if friendship saved, false if friendship already exists
*/
- Mono<@NotNull Boolean> saveFriendship(Friendship playerIds);
+ boolean saveFriendship(Friendship playerIds);
/**
* @return True if friendship deleted, false if none found
*/
- Mono<@NotNull Boolean> deleteFriendship(UUID uuid1, UUID uuid2);
+ boolean deleteFriendship(UUID uuid1, UUID uuid2);
}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/EconomyService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/EconomyService.java
similarity index 60%
rename from core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/EconomyService.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/EconomyService.java
index 35a9d85..5709df2 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/EconomyService.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/EconomyService.java
@@ -1,7 +1,4 @@
-package de.kentoj.scrow.bukkit;
-
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Mono;
+package de.kentoj.scrow.bukkit.misc;
import java.util.UUID;
@@ -10,24 +7,24 @@ public interface EconomyService {
/**
* @throws IllegalArgumentException if amount is less than 0
*/
- Mono<@NotNull Integer> getCoins(UUID playerId);
+ int getCoins(UUID playerId);
/**
* @param playerId uuid of player
* @throws IllegalArgumentException if amount is less than 0
*/
- Mono<@NotNull Void> depositCoins(UUID playerId, int amount);
+ void depositCoins(UUID playerId, int amount);
/**
* @param playerId uuid of player
* @return true on success, false on insufficient funds
* @throws IllegalArgumentException if amount is less than 0
*/
- Mono<@NotNull Boolean> tryWithdrawCoins(UUID playerId, int amount);
+ boolean tryWithdrawCoins(UUID playerId, int amount);
/**
* @param playerId uuid of player
* @throws IllegalArgumentException if amount is less than 0
*/
- Mono<@NotNull Void> setCoins(UUID playerId, int amount);
+ void setCoins(UUID playerId, int amount);
}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/PlayerManager.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/PlayerManager.java
new file mode 100644
index 0000000..9469be5
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/misc/PlayerManager.java
@@ -0,0 +1,8 @@
+package de.kentoj.scrow.bukkit.misc;
+
+import java.util.UUID;
+
+public interface PlayerManager {
+
+ void sendPlayer(UUID uuid, String instanceHandle);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java
new file mode 100644
index 0000000..0911d78
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Task.java
@@ -0,0 +1,51 @@
+package de.kentoj.scrow.bukkit.scheduler;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public interface Task {
+
+ CompletableFuture asFuture();
+
+ default Task runSync(Runnable task) {
+ return mapSync(__ -> {
+ task.run();
+ return null;
+ });
+ }
+
+ default Task supplySync(Supplier supplier) {
+ return mapSync(__ -> supplier.get());
+ }
+
+ default Task thenSync(Consumer consumer) {
+ return mapSync(previous -> {
+ consumer.accept(previous);
+ return null;
+ });
+ }
+
+ Task mapSync(Function mapper);
+
+ default Task runAsync(Runnable task) {
+ return mapAsync(__ -> {
+ task.run();
+ return null;
+ });
+ }
+
+ default Task supplyAsync(Supplier supplier) {
+ return mapAsync(__ -> supplier.get());
+ }
+
+ default Task thenAsync(Consumer consumer) {
+ return mapAsync(previous -> {
+ consumer.accept(previous);
+ return null;
+ });
+ }
+
+ Task mapAsync(Function mapper);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java
new file mode 100644
index 0000000..f2f0f0f
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/TaskImpl.java
@@ -0,0 +1,56 @@
+package de.kentoj.scrow.bukkit.scheduler;
+
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.Bukkit;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * A Task runs entirely async, when sync is used, a subtask is run on the main thread and the async thread
+ * blocks until the subtask returns.
+ *
+ * @param type of computed result
+ */
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+public class TaskImpl implements Task {
+
+ private static final ExecutorService EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
+
+ private final Supplier compute;
+
+ @Override
+ public CompletableFuture asFuture() {
+ return CompletableFuture.supplyAsync(compute, EXECUTOR);
+ }
+
+ /**
+ * Maps the last result on the main thread
+ */
+ public Task mapSync(Function mapper) {
+ Supplier supplier = () -> {
+ try {
+ return Bukkit.getScheduler().callSyncMethod(ScrowAPI.plugin, () -> mapper.apply(compute.get())).get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ };
+ return new TaskImpl<>(supplier);
+ }
+
+ /**
+ * Maps the last result async
+ */
+ public Task mapAsync(Function mapper) {
+ return new TaskImpl<>(() -> mapper.apply(compute.get()));
+ }
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java
new file mode 100644
index 0000000..2c6e40f
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/scheduler/Tasks.java
@@ -0,0 +1,43 @@
+package de.kentoj.scrow.bukkit.scheduler;
+
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.bukkit.Bukkit;
+
+import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
+
+@NoArgsConstructor(access = AccessLevel.NONE)
+public class Tasks {
+ public static Task supplyAsync(Supplier supplier) {
+ return new TaskImpl<>(supplier);
+ }
+
+ public static Task runAsync(Runnable task) {
+ return supplyAsync(() -> {
+ task.run();
+ return null;
+ });
+ }
+
+ public static Task supplySync(Supplier supplier) {
+ return new TaskImpl<>(() -> {
+ try {
+ return Bukkit.getScheduler().callSyncMethod(ScrowAPI.plugin, supplier::get).get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeException(e);
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+
+ public static Task runSync(Runnable task) {
+ return supplySync(() -> {
+ task.run();
+ return null;
+ });
+ }
+}
diff --git a/core-bukkit-impl/build.gradle.kts b/core-bukkit-impl/build.gradle.kts
index 2bbf523..c936191 100644
--- a/core-bukkit-impl/build.gradle.kts
+++ b/core-bukkit-impl/build.gradle.kts
@@ -22,12 +22,7 @@ dependencies {
implementation(project(":core-bukkit-api"))
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- implementation("de.kentoj.scrow:kencommandapi-core:0.21")
-
- // TODO remove, we use postgres now
- // https://www.mongodb.com/docs/languages/java/reactive-streams-driver/current/get-started/download-and-install/
- implementation(platform("org.mongodb:mongodb-driver-bom:5.6.1"))
- implementation("org.mongodb:mongodb-driver-reactivestreams")
+ implementation("de.kentoj.scrow:kencommandapi-core:0.22")
}
tasks {
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
index f7fd99f..5eaa390 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
@@ -1,13 +1,13 @@
package de.kentoj.scrow.bukkit;
import de.kentoj.scrow.bukkit.crown.CrownCommand;
-import de.kentoj.scrow.bukkit.economy.CoinsCommand;
+import de.kentoj.scrow.bukkit.economy.command.CoinsCommand;
+import de.kentoj.scrow.bukkit.economy.command.CoinsSetLiteral;
import de.kentoj.scrow.bukkit.friends.command.FriendCommand;
import de.kentoj.scrow.bukkit.region.RegionPlayerTracker;
import de.kentoj.scrow.bukkit.region.RegionTask;
import de.kentoj.scrow.bukkit.server.LobbyCommand;
import de.kentoj.scrow.bukkit.server.PlayCommand;
-import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException;
@@ -26,8 +26,8 @@ public class CoreImplPlugin extends JavaPlugin {
ScrowAPISurface.initScrowAPI(this, ENABLE_DATABASE);
{
- ScrowAPI.getCommandApi().register(new FriendCommand().getRootNode());
ScrowAPI.getCommandApi().register(new CoinsCommand().getRootNode());
+ ScrowAPI.getCommandApi().register(new FriendCommand().getRootNode());
ScrowAPI.getCommandApi().register(new CrownCommand().getRootNode());
ScrowAPI.getCommandApi().register(new PlayCommand().getRootNode());
ScrowAPI.getCommandApi().register(new LobbyCommand().getRootNode());
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
index 97acb0e..c2b1eea 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
@@ -27,9 +27,7 @@ import java.io.IOException;
public class ScrowAPISurface {
public static void initScrowAPI(Plugin plugin, boolean enableDatabase) {
- ScrowAPI.setMinecraftScheduler(Schedulers.fromExecutor(cmd -> {
- Bukkit.getScheduler().runTask(plugin, cmd);
- }));
+ ScrowAPI.setCorePlugin(plugin);
try {
String natsHost = EnvUtils.envOrThrow("HOST_NATS");
@@ -44,23 +42,23 @@ public class ScrowAPISurface {
if (enableDatabase) {
ConnectionFactory factory = ConnectionFactories.get(EnvUtils.envOrThrow("HOST_POSTGRES"));
- ScrowAPI.setDbConFactory(new DatabaseConnectionFactoryImpl(factory));
+ ScrowAPI.setJdbi(new DatabaseConnectionFactoryImpl(factory));
}
ScrowAPI.setRegionManager(new RegionManagerImpl());
ScrowAPI.setCommandApi(new CommandAPI(plugin));
ScrowAPI.setInstanceManager(new InstanceManagerImpl(ScrowAPI.getNats()));
- ScrowAPI.setEconomyService(ScrowAPI.getDbConFactory() != null ?
- new PostgresEconomyService(ScrowAPI.getDbConFactory()) : new InMemoryEconomyService());
- ScrowAPI.setFriendRequestService(ScrowAPI.getDbConFactory() != null ?
- new PostgresFriendRequestService(ScrowAPI.getDbConFactory()) : new InMemoryFriendRequestService());
- ScrowAPI.setFriendshipService(ScrowAPI.getDbConFactory() != null ?
- new PostgresFriendshipService(ScrowAPI.getDbConFactory()) : new InMemoryFriendshipService());
+ ScrowAPI.setEconomyService(ScrowAPI.getJdbi() != null ?
+ new PostgresEconomyService(ScrowAPI.getJdbi()) : new InMemoryEconomyService());
+ ScrowAPI.setFriendRequestService(ScrowAPI.getJdbi() != null ?
+ new PostgresFriendRequestService(ScrowAPI.getJdbi()) : new InMemoryFriendRequestService());
+ ScrowAPI.setFriendshipService(ScrowAPI.getJdbi() != null ?
+ new PostgresFriendshipService(ScrowAPI.getJdbi()) : new InMemoryFriendshipService());
}
public static void destroyScrowAPI() {
try {
- ScrowAPI.getDbConFactory().close();
+ ScrowAPI.getJdbi().close();
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDeployServerLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDeployServerLiteral.java
index d51ea5b..22f1054 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDeployServerLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDeployServerLiteral.java
@@ -28,7 +28,7 @@ public class CrownDeployServerLiteral implements CommandExecutor
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var template = ctx.getArg(templateArg);
return ScrowAPI.getInstanceManager().deployInstance(template)
.map(server -> {
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDestroyServerLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDestroyServerLiteral.java
index 3c634da..06fe639 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDestroyServerLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownDestroyServerLiteral.java
@@ -38,7 +38,7 @@ public class CrownDestroyServerLiteral implements CommandExecutor
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var handle = ctx.getArg(handleArg);
return ScrowAPI.getInstanceManager().destroyInstance(handle)
.map(__ -> {
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownListServersLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownListServersLiteral.java
index aca4f2b..17753e9 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownListServersLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/crown/CrownListServersLiteral.java
@@ -25,7 +25,7 @@ public class CrownListServersLiteral implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
return ScrowAPI.getInstanceManager().getInstances()
.collectList()
.map(list -> style.list(Component.text("Running instances:"),
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/CoinsCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/CoinsCommand.java
deleted file mode 100644
index 4b3466c..0000000
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/CoinsCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package de.kentoj.scrow.bukkit.economy;
-
-import com.leakyabstractions.result.api.Result;
-import com.leakyabstractions.result.core.Results;
-import de.kentoj.kencommandapi.api.node.CommandNode;
-import de.kentoj.kencommandapi.api.argument.CommandArgument;
-import de.kentoj.kencommandapi.api.argument.types.IntegerArgumentType;
-import de.kentoj.kencommandapi.api.invocation.CommandContext;
-import com.leakyabstractions.result.api.Result;
-import com.leakyabstractions.result.api.Results;
-import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
-import de.kentoj.scrow.bukkit.ScrowAPI;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-import reactor.core.scheduler.Schedulers;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;
-
-public class CoinsCommand {
-
- @Getter
- private final CommandNode rootNode;
- private final CommandArgument playerArg;
- private final CommandArgument amountArg;
-
- public CoinsCommand() {
- this.rootNode = CommandNode.node("coins", "eco");
- this.playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance());
- this.amountArg = CommandArgument.arg("amount", new IntegerArgumentType<>());
-
- {
- CommandNode setLiteral = CommandNode.node("set");
- rootNode.addLiteral(setLiteral);
- setLiteral.addArgument(playerArg);
- setLiteral.addArgument(amountArg);
- setLiteral.setExecutor(this::setCoins);
- }
- {
- CommandNode getLiteral = CommandNode.node("get");
- rootNode.addLiteral(getLiteral);
- getLiteral.addArgument(playerArg);
- getLiteral.setExecutor(this::getCoins);
- }
- }
-
- private CompletableFuture> getCoins(CommandContext ctx) {
- var player = ctx.getArg(playerArg);
- return ScrowAPI.getEconomyService()
- .getCoins(player.getUniqueId())
- .subscribeOn(Schedulers.boundedElastic())
- .publishOn(ScrowAPI.getMinecraftScheduler())
- .map(amount -> {
- if (player == ctx.getSender()) {
- ctx.getSender().sendMessage("You have " + amount + "$");
- } else {
- ctx.getSender().sendMessage(player.getName() + " has " + amount + "$");
- }
- return Result.success();
- }).toFuture();
- }
-
- private CompletableFuture> setCoins(CommandContext ctx) {
- var player = ctx.getArg(playerArg);
- var amount = ctx.getArg(amountArg);
-
- return ScrowAPI.getEconomyService()
- .setCoins(player.getUniqueId(), amount)
- .subscribeOn(Schedulers.boundedElastic())
- .publishOn(ScrowAPI.getMinecraftScheduler())
- .map(__ -> {
- ctx.getSender().sendMessage(player.getName() + " now has " + amount + "$");
- return Results.success(null);
- }).toFuture();
- }
-}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
index f9207af..f9a3930 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
@@ -1,9 +1,7 @@
package de.kentoj.scrow.bukkit.economy;
import com.google.common.base.Preconditions;
-import de.kentoj.scrow.bukkit.EconomyService;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Mono;
+import de.kentoj.scrow.bukkit.misc.EconomyService;
import java.util.HashMap;
import java.util.Map;
@@ -14,34 +12,29 @@ public class InMemoryEconomyService implements EconomyService {
private final Map coins = new HashMap<>();
@Override
- public Mono<@NotNull Integer> getCoins(UUID playerId) {
- return Mono.fromSupplier(() -> coins.getOrDefault(playerId, 0));
+ public int getCoins(UUID playerId) {
+ return coins.getOrDefault(playerId, 0);
}
@Override
- public Mono<@NotNull Void> setCoins(UUID playerId, int amount) {
+ public void setCoins(UUID playerId, int amount) {
Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return Mono.fromSupplier(() -> coins.put(playerId, amount)).then();
+ coins.put(playerId, amount);
}
@Override
- public Mono<@NotNull Void> depositCoins(UUID playerId, int amount) {
+ public void depositCoins(UUID playerId, int amount) {
Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return Mono.fromRunnable(() -> {
- var cur = coins.getOrDefault(playerId, amount);
- coins.put(playerId, cur + amount);
- });
+ var cur = coins.getOrDefault(playerId, 0);
+ coins.put(playerId, cur + amount);
}
@Override
- public Mono<@NotNull Boolean> tryWithdrawCoins(UUID playerId, int amount) {
+ public boolean tryWithdrawCoins(UUID playerId, int amount) {
Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return Mono.fromSupplier(() -> {
- var cur = coins.getOrDefault(playerId, 0);
- if (cur < amount) return false;
-
- coins.put(playerId, cur - amount);
- return true;
- });
+ var cur = coins.getOrDefault(playerId, 0);
+ if (cur < amount) return false;
+ coins.put(playerId, cur - amount);
+ return true;
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java
deleted file mode 100644
index 96d2534..0000000
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package de.kentoj.scrow.bukkit.economy;
-
-import com.google.common.base.Preconditions;
-import com.mongodb.client.model.Filters;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.Updates;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.bukkit.EconomyService;
-import org.bson.Document;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Mono;
-
-import java.util.UUID;
-
-// TODO log
-public class MongoEconomyService implements EconomyService {
-
- private static final String COLLECTION_NAME = "economy";
- private final @NotNull MongoDatabase database;
-
- public MongoEconomyService(MongoDatabase database) {
- this.database = database;
- Mono.from(database.createCollection(COLLECTION_NAME)).block();
- }
-
- @Override
- public Mono<@NotNull Integer> getCoins(UUID playerId) {
- return Mono.from(
- getCollection().find(Filters.eq("_id", playerId)).first()
- ).map(result -> result.getInteger("coins")).defaultIfEmpty(0);
- }
-
- @Override
- public Mono<@NotNull Void> setCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
-
- return Mono.from(
- getCollection().updateOne(
- Filters.eq("_id", playerId),
- Updates.set("coins", amount),
- new UpdateOptions().upsert(true)
- )
- ).then();
- }
-
- @Override
- public Mono<@NotNull Void> depositCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
-
- return Mono.from(getCollection().updateOne(
- Filters.eq("_id", playerId),
- Updates.inc("coins", amount),
- new UpdateOptions().upsert(true)
- )).then();
- }
-
- @Override
- public Mono<@NotNull Boolean> tryWithdrawCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
-
- return Mono.from(getCollection().updateOne(
- Filters.and(
- Filters.eq("_id", playerId),
- Filters.gte("coins", amount)
- ),
- Updates.inc("coins", -1 * amount)
- )).map(result -> result.getModifiedCount() > 0);
- }
-
- private MongoCollection getCollection() {
- return database.getCollection(COLLECTION_NAME);
- }
-}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/PostgresEconomyService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/PostgresEconomyService.java
index a39a145..302ee6c 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/PostgresEconomyService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/PostgresEconomyService.java
@@ -1,46 +1,46 @@
package de.kentoj.scrow.bukkit.economy;
-import com.google.common.base.Preconditions;
-import de.kentoj.scrow.bukkit.EconomyService;
-import de.kentoj.scrowlib.connection.DatabaseConnectionFactory;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Mono;
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import de.kentoj.scrow.bukkit.misc.EconomyService;
+import org.jdbi.v3.core.Jdbi;
import java.util.UUID;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
// TODO log operations to separate table
public class PostgresEconomyService implements EconomyService {
- private final DatabaseConnectionFactory conFactory;
+ private final Jdbi jdbi;
- public PostgresEconomyService(DatabaseConnectionFactory conFactory) {
- this.conFactory = conFactory;
- conFactory.create().sql("""
+ public PostgresEconomyService() {
+ checkNotNull(ScrowAPI.getJdbi());
+ this.jdbi = ScrowAPI.getJdbi();
+ jdbi.withHandle(h -> h.execute("""
CREATE TABLE IF NOT EXISTS economy (
playerId UUID NOT NULL,
balance INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY(playerId)
)
- """).then().block();
+ """));
}
@Override
- public Mono<@NotNull Integer> getCoins(UUID playerId) {
- return conFactory.create()
- .sql("""
- SELECT balance
- FROM economy
- WHERE playerId = :playerId
- """)
+ public int getCoins(UUID playerId) {
+ return jdbi.withHandle(h -> h
+ .createQuery("SELECT balance FROM economy WHERE playerId = :playerId")
.bind("playerId", playerId)
- .map(row -> row.get("balance", Integer.class))
- .one();
+ .map(row -> row.getColumn("balance", Integer.class))
+ .findOne()
+ .orElse(0));
}
@Override
- public Mono<@NotNull Void> setCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return conFactory.create().sql("""
+ public void setCoins(UUID playerId, int amount) {
+ checkArgument(amount >= 0, "amount cannot be negative");
+ jdbi.withHandle(h -> h
+ .createUpdate("""
INSERT INTO economy (playerId, balance)
VALUES (:playerId, :amount)
ON CONFLICT (playerId)
@@ -50,13 +50,14 @@ public class PostgresEconomyService implements EconomyService {
""")
.bind("playerId", playerId)
.bind("amount", amount)
- .then();
+ .execute());
}
@Override
- public Mono<@NotNull Void> depositCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return conFactory.create().sql("""
+ public void depositCoins(UUID playerId, int amount) {
+ checkArgument(amount >= 0, "amount cannot be negative");
+ jdbi.withHandle(h -> h.
+ createUpdate("""
INSERT INTO economy (playerId, balance)
VALUES (:playerId, :amount)
ON CONFLICT (playerId)
@@ -66,21 +67,20 @@ public class PostgresEconomyService implements EconomyService {
""")
.bind("playerId", playerId)
.bind("amount", amount)
- .then();
+ .execute());
}
@Override
- public Mono<@NotNull Boolean> tryWithdrawCoins(UUID playerId, int amount) {
- Preconditions.checkArgument(amount >= 0, "amount can not be negative");
- return conFactory.create().sql("""
+ public boolean tryWithdrawCoins(UUID playerId, int amount) {
+ checkArgument(amount >= 0, "amount cannot be negative");
+ return jdbi.withHandle(h -> h
+ .createUpdate("""
UPDATE economy
SET balance = balance - :amount
WHERE playerId = :playerId
""")
.bind("playerId", playerId)
.bind("amount", amount)
- .fetch()
- .rowsUpdated()
- .map(updated -> updated > 0);
+ .execute() > 0);
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java
new file mode 100644
index 0000000..0c3da6c
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsCommand.java
@@ -0,0 +1,56 @@
+package de.kentoj.scrow.bukkit.economy.command;
+
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
+import de.kentoj.kencommandapi.api.invocation.CommandContext;
+import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
+import de.kentoj.kencommandapi.api.node.CommandNode;
+import de.kentoj.kencommandapi.api.node.RootCommandNode;
+import de.kentoj.kencommandapi.api.platform.MessageStyle;
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import de.kentoj.scrow.bukkit.ScrowAPISurface;
+import de.kentoj.scrow.bukkit.scheduler.Tasks;
+import de.kentoj.scrowlib.convention.ScrowMessageStyle;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+@NoArgsConstructor(access = AccessLevel.NONE)
+public class CoinsCommand implements CommandExecutor {
+ @Getter
+ private final RootCommandNode rootNode;
+ private final MessageStyle style;
+
+ public CoinsCommand() {
+ style = new ScrowMessageStyle("Coins", NamedTextColor.GOLD);
+ rootNode = CommandNode.rootNode(style, "coins", "bal", "balance");
+ rootNode.setPermission("command.coins.get.self");
+
+ var setLiteral = new CoinsSetLiteral(style).getLiteral();
+ setLiteral.setPermission("command.coins.set");
+ rootNode.addLiteral(setLiteral);
+
+ var getLiteral = new CoinsGetLiteral(style).getLiteral();
+ getLiteral.setPermission("command.coins.get.others");
+ rootNode.addLiteral(getLiteral);
+ }
+
+
+ @Override
+ public CompletableFuture> execute(CommandContext ctx) {
+ var player = ((Player) ctx.getSender());
+ return Tasks.supplyAsync(() ->
+ ScrowAPI.getEconomyService().getCoins(player.getUniqueId()))
+ .>mapSync(amount -> {
+ player.sendMessage(style.ok("You have " + amount + "$"));
+ return Results.success(Optional.empty());
+ }).asFuture();
+ }
+}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java
new file mode 100644
index 0000000..16a46ba
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsGetLiteral.java
@@ -0,0 +1,50 @@
+package de.kentoj.scrow.bukkit.economy.command;
+
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
+import de.kentoj.kencommandapi.api.argument.CommandArgument;
+import de.kentoj.kencommandapi.api.invocation.CommandContext;
+import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
+import de.kentoj.kencommandapi.api.node.CommandNode;
+import de.kentoj.kencommandapi.api.platform.MessageStyle;
+import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import de.kentoj.scrow.bukkit.scheduler.Tasks;
+import lombok.Getter;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public class CoinsGetLiteral implements CommandExecutor {
+
+ @Getter
+ private final CommandNode literal;
+
+ private final MessageStyle style;
+ private final CommandArgument playerArg;
+
+ public CoinsGetLiteral(MessageStyle style) {
+ this.style = style;
+
+ playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance());
+ playerArg.setDefaultValueProvider(sender -> (OfflinePlayer) sender);
+
+ literal = CommandNode.node("set");
+ literal.addArgument(playerArg);
+ literal.setExecutor(this);
+ }
+
+ @Override
+ public CompletableFuture> execute(CommandContext ctx) {
+ var player = ctx.getArg(playerArg);
+ return Tasks.supplyAsync(() ->
+ ScrowAPI.getEconomyService().getCoins(player.getUniqueId()))
+ .>mapSync(amount -> {
+ ctx.getSender().sendMessage(style.ok(player.getName() + " has " + amount + "$"));
+ return Results.success(Optional.empty());
+ }).asFuture();
+ }
+
+}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java
new file mode 100644
index 0000000..ea3fff6
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/command/CoinsSetLiteral.java
@@ -0,0 +1,53 @@
+package de.kentoj.scrow.bukkit.economy.command;
+
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
+import de.kentoj.kencommandapi.api.argument.CommandArgument;
+import de.kentoj.kencommandapi.api.argument.types.IntegerArgumentType;
+import de.kentoj.kencommandapi.api.invocation.CommandContext;
+import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
+import de.kentoj.kencommandapi.api.node.CommandNode;
+import de.kentoj.kencommandapi.api.platform.MessageStyle;
+import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
+import de.kentoj.scrow.bukkit.ScrowAPI;
+import de.kentoj.scrow.bukkit.scheduler.Tasks;
+import lombok.Getter;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public class CoinsSetLiteral implements CommandExecutor {
+
+ @Getter
+ private final CommandNode literal;
+
+ private final MessageStyle style;
+ private final CommandArgument playerArg;
+ private final CommandArgument amountArg;
+
+ public CoinsSetLiteral(MessageStyle style) {
+ this.style = style;
+
+ playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance());
+ amountArg = CommandArgument.arg("amount", new IntegerArgumentType<>());
+
+ literal = CommandNode.node("set");
+ literal.addArgument(playerArg);
+ literal.addArgument(amountArg);
+ literal.setExecutor(this);
+ }
+
+ @Override
+ public CompletableFuture> execute(CommandContext ctx) {
+ var player = ctx.getArg(playerArg);
+ var amount = ctx.getArg(amountArg);
+ return Tasks.runAsync(() ->
+ ScrowAPI.getEconomyService().setCoins(player.getUniqueId(), amount))
+ .>supplySync(() -> {
+ ctx.getSender().sendMessage(style.ok(player.getName() + " now has " + amount + "$"));
+ return Results.success(Optional.empty());
+ }).asFuture();
+ }
+}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java
index 9036ccb..fe81813 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendAddLiteral.java
@@ -36,7 +36,7 @@ public class FriendAddLiteral implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var self = (Player) ctx.getSender();
var other = ctx.getArg(playerArg);
return findAction(self, other)
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java
index a7fcc40..fef5ac2 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendCommand.java
@@ -3,20 +3,16 @@ package de.kentoj.scrow.bukkit.friends.command;
import de.kentoj.kencommandapi.api.node.CommandNode;
import de.kentoj.kencommandapi.api.node.RootCommandNode;
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
-import lombok.Getter;
-import net.kyori.adventure.text.Component;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.command.CommandSender;
+@NoArgsConstructor(access = AccessLevel.NONE)
public class FriendCommand {
-
- @Getter
- private final RootCommandNode rootNode;
-
- public FriendCommand() {
- var style = new ScrowMessageStyle(Component.text("Friends")
- .color(NamedTextColor.GREEN));
- this.rootNode = CommandNode.rootNode(style, "f", "friend");
+ public static RootCommandNode create() {
+ var style = new ScrowMessageStyle("Friends", NamedTextColor.GREEN);
+ var rootNode = CommandNode.rootNode(style, "f", "friend");
rootNode.addLiteral(new FriendListLiteral(style).getRootNode());
rootNode.addLiteral(new FriendAddLiteral(style).getRootNode());
rootNode.addLiteral(new FriendRemoveLiteral(style).getRootNode());
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java
index 172b891..c4bc6cc 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java
@@ -1,12 +1,15 @@
package de.kentoj.scrow.bukkit.friends.command;
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
import de.kentoj.kencommandapi.api.invocation.CommandContext;
import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import com.leakyabstractions.result.api.Result;
-import com.leakyabstractions.result.api.Results;
import de.kentoj.kencommandapi.api.node.CommandNode;
+import de.kentoj.kencommandapi.api.platform.MessageStyle;
import de.kentoj.scrow.bukkit.ScrowAPI;
import lombok.Getter;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
@@ -18,34 +21,42 @@ public class FriendListLiteral implements CommandExecutor {
@Getter
private final CommandNode rootNode;
+ private final MessageStyle style;
- public FriendListLiteral() {
+ public FriendListLiteral(MessageStyle style) {
+ this.style = style;
this.rootNode = CommandNode.node("list");
rootNode.setExecutor(this);
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var sender = (Player) ctx.getSender();
var ownUid = sender.getUniqueId();
- return ScrowAPI.getFriendshipService().getFriendships(ownUid)
- .map(friendship -> Bukkit.getOfflinePlayer(friendship.getUuids().getOther(ownUid)))
- .sort(this::compareByOnlineStatus)
- .collectList()
- .map(list -> {
- if (list.isEmpty()) return Result.error("You have no friends. Use /friend add ");
+ return CompletableFuture.supplyAsync(() ->
+ ScrowAPI.getFriendshipService().getFriendships(ownUid))
+ .thenApply(friendships -> ScrowAPI.getScheduler().sync(() -> {
+ var list = friendships.stream()
+ .map(friendship -> Bukkit.getOfflinePlayer(friendship.getUuids().getOther(ownUid)))
+ .sorted(this::compareByOnlineStatus)
+ .toList();
+ if (list.isEmpty()) return Results.failure("You have no friends. Use /friend add ");
- var msg = "§3§lFriends§r§7 ☆ You have §3" + list.size() + "§7 friend";
- if (list.size() > 1) msg += "s";
- msg += ":§r\n";
+ var message = "§7You have §3" + list.size() + "§7" + ("§" +
+ .append(Component.text(list.size() == 1 ? " friend:" : " friends:"));
for (var friend : list) {
- var status = friend.isOnline() ? "(§aonline§7)" : "(offline)";
- msg += "§c≫ §7" + friend.getName() + " " + status + "\n";
+ message = message.appendNewline();
+ var status = Component.text("(").append(
+ friend.isOnline()
+ ? Component.text("online").color(NamedTextColor.GRAY)
+ : Component.text("offline").color(NamedTextColor.RED))
+ .append(Component.text(")"));
+ message = message.append(Component.text("≫").color(NamedTextColor.AQUA));
}
sender.sendMessage(msg);
return Result.success();
- }).toFuture();
+ });
}
private int compareByOnlineStatus(OfflinePlayer p1, OfflinePlayer p2) {
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
index 0fa8cbf..42a1ce9 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
@@ -1,18 +1,20 @@
package de.kentoj.scrow.bukkit.friends.command;
-import de.kentoj.kencommandapi.api.node.CommandNode;
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
import de.kentoj.kencommandapi.api.argument.CommandArgument;
import de.kentoj.kencommandapi.api.invocation.CommandContext;
import de.kentoj.kencommandapi.api.invocation.CommandExecutor;
-import com.leakyabstractions.result.api.Result;
-import com.leakyabstractions.result.api.Results;
+import de.kentoj.kencommandapi.api.node.CommandNode;
import de.kentoj.kencommandapi.type.OfflinePlayerArgumentType;
import de.kentoj.scrow.bukkit.ScrowAPI;
+import de.kentoj.scrow.bukkit.scheduler.Tasks;
import lombok.Getter;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class FriendRemoveLiteral implements CommandExecutor {
@@ -20,6 +22,8 @@ public class FriendRemoveLiteral implements CommandExecutor {
private final CommandNode rootNode;
private final CommandArgument playerArg;
+ private final Scheduler scheduler = ScrowAPI.getScheduler();
+
public FriendRemoveLiteral() {
this.playerArg = CommandArgument.arg("player", OfflinePlayerArgumentType.getInstance());
this.rootNode = CommandNode.node("remove");
@@ -28,15 +32,16 @@ public class FriendRemoveLiteral implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var friend = ctx.getArg(playerArg);
var player = (Player) ctx.getSender();
- return ScrowAPI.getFriendshipService().deleteFriendship(friend.getUniqueId(), player.getUniqueId())
- .map(wasAdded -> wasAdded
- ? Result.success() : Result.error("You are not friends with " + friend.getName())
- ).doOnNext(success -> {
- if (success.isSuccess())
- ctx.getSender().sendMessage("You are no longer friends with " + friend.getName());
- }).toFuture();
+ return Tasks.supplyAsync(() ->
+ ScrowAPI.getFriendshipService().deleteFriendship(friend.getUniqueId(), player.getUniqueId()))
+ .>mapSync(deleted -> {
+ if (!deleted)
+ return Results.failure("You are not friends with " + friend.getName());
+ ctx.getSender().sendMessage("You have ended the friendship with " + friend.getName());
+ return Results.success(Optional.empty());
+ }).asFuture();
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java
index 769d731..9d49136 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java
@@ -24,7 +24,7 @@ public class FriendRequestsLiteral implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var sender = (Player) ctx.getSender();
return ScrowAPI.getFriendRequestService().getFriendRequestsTo(sender.getUniqueId())
.collectList()
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/InMemoryFriendshipService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/InMemoryFriendshipService.java
index 600fd6a..7e7b9cc 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/InMemoryFriendshipService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/InMemoryFriendshipService.java
@@ -1,13 +1,13 @@
package de.kentoj.scrow.bukkit.friends.friendship;
+import com.leakyabstractions.result.api.Result;
+import com.leakyabstractions.result.core.Results;
import de.kentoj.scrow.bukkit.friends.Friendship;
import de.kentoj.scrow.bukkit.friends.FriendshipService;
import de.kentoj.scrow.bukkit.friends.OrderedUUIDPair;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -16,24 +16,27 @@ public class InMemoryFriendshipService implements FriendshipService {
private final Map friendships = new HashMap<>();
@Override
- public Mono<@NotNull Friendship> getFriendship(UUID uuid1, UUID uuid2) {
- return Mono.justOrEmpty(friendships.get(new OrderedUUIDPair(uuid1, uuid2)));
+ public Result getFriendship(UUID uuid1, UUID uuid2) {
+ return Results.success(friendships.get(new OrderedUUIDPair(uuid1, uuid2)));
}
@Override
- public Flux<@NotNull Friendship> getFriendships(UUID playerId) {
- return Flux.fromStream(friendships.keySet().stream()
- .filter(pair -> pair.getFirst().equals(playerId) || pair.getSecond().equals(playerId))
- .map(friendships::get));
+ public Result, String> getFriendships(UUID playerId) {
+ return Results.success(friendships.entrySet().stream()
+ .filter(ent ->
+ ent.getKey().getFirst().equals(playerId) || ent.getKey().getSecond().equals(playerId)
+ )
+ .map(Map.Entry::getValue)
+ .toList());
}
@Override
- public Mono<@NotNull Boolean> saveFriendship(Friendship friendship) {
- return Mono.just(friendships.putIfAbsent(friendship.getUuids(), friendship) == null);
+ public Result saveFriendship(Friendship friendship) {
+ return Results.success(friendships.putIfAbsent(friendship.getUuids(), friendship) == null);
}
@Override
- public Mono<@NotNull Boolean> deleteFriendship(UUID uuid1, UUID uuid2) {
- return Mono.just(friendships.remove(new OrderedUUIDPair(uuid1, uuid2)) != null);
+ public Result deleteFriendship(UUID uuid1, UUID uuid2) {
+ return Results.success(friendships.remove(new OrderedUUIDPair(uuid1, uuid2)) != null);
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipService.java
deleted file mode 100644
index 7ea3daa..0000000
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package de.kentoj.scrow.bukkit.friends.friendship;
-
-import com.mongodb.ErrorCategory;
-import com.mongodb.MongoWriteException;
-import com.mongodb.client.model.Filters;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.client.model.Indexes;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.bukkit.friends.Friendship;
-import de.kentoj.scrow.bukkit.friends.FriendshipService;
-import de.kentoj.scrow.bukkit.friends.OrderedUUIDPair;
-import org.bson.Document;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.sql.Date;
-import java.util.UUID;
-
-public class MongoFriendshipService implements FriendshipService {
-
- private static final String COLLECTION_NAME = "friendships";
-
- private final MongoDatabase database;
-
- public MongoFriendshipService(MongoDatabase database) {
- this.database = database;
-
- Mono.when(
- database.createCollection(COLLECTION_NAME),
- collection().createIndex(
- Indexes.compoundIndex(
- Indexes.ascending("first"),
- Indexes.ascending("second")
- ),
- new IndexOptions().unique(true))
- ).block();
- }
-
- @Override
- public Mono<@NotNull Friendship> getFriendship(UUID uuid1, UUID uuid2) {
- var uuids = new OrderedUUIDPair(uuid1, uuid2);
- return Mono.from(collection()
- .find(Filters.and(
- Filters.eq("first", uuids.getFirst()),
- Filters.eq("second", uuids.getSecond())
- )))
- .map(this::fromDocument);
- }
-
- @Override
- public Flux<@NotNull Friendship> getFriendships(UUID playerId) {
- return Flux.from(collection()
- .find(Filters.or(
- Filters.eq("first", playerId),
- Filters.eq("second", playerId)
- )))
- .map(this::fromDocument);
- }
-
- @Override
- public Mono<@NotNull Boolean> saveFriendship(Friendship friendship) {
- return Mono.from(collection()
- .insertOne(toDocument(friendship)))
- .thenReturn(true)
- .onErrorResume(MongoWriteException.class, e ->
- e.getError().getCategory() == ErrorCategory.DUPLICATE_KEY
- ? Mono.just(Boolean.FALSE)
- : Mono.error(e)
- );
- }
-
- @Override
- public Mono<@NotNull Boolean> deleteFriendship(UUID uuid1, UUID uuid2) {
- var uuids = new OrderedUUIDPair(uuid1, uuid2);
- return Mono.from(collection()
- .deleteOne(Filters.and(
- Filters.eq("first", uuids.getFirst()),
- Filters.eq("second", uuids.getSecond())
- )))
- .map(res -> res.getDeletedCount() > 0);
- }
-
- private MongoCollection collection() {
- return database.getCollection(COLLECTION_NAME);
- }
-
- private Friendship fromDocument(Document doc) {
- return new FriendshipImpl(
- doc.get("first", UUID.class),
- doc.get("second", UUID.class),
- doc.getDate("createdAt").toInstant()
- );
- }
-
- private Document toDocument(Friendship friendship) {
- return new Document()
- .append("first", friendship.getUuids().getFirst())
- .append("second", friendship.getUuids().getSecond())
- .append("createdAt", Date.from(friendship.getCreatedAt()));
- }
-}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/PostgresFriendshipService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/PostgresFriendshipService.java
index e7c7abd..ce5f3f2 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/PostgresFriendshipService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/PostgresFriendshipService.java
@@ -30,7 +30,7 @@ public class PostgresFriendshipService implements FriendshipService {
}
@Override
- public Mono<@NotNull Friendship> getFriendship(UUID uuid1, UUID uuid2) {
+ public Result getFriendship(UUID uuid1, UUID uuid2) {
var uuids = new OrderedUUIDPair(uuid1, uuid2);
return dbConFactory.create().sql("""
@@ -49,7 +49,7 @@ public class PostgresFriendshipService implements FriendshipService {
}
@Override
- public Flux<@NotNull Friendship> getFriendships(UUID playerId) {
+ public Result, String> getFriendships(UUID playerId) {
return dbConFactory.create().sql("""
SELECT first_uuid, second_uuid, created_at
FROM friendships
@@ -65,7 +65,7 @@ public class PostgresFriendshipService implements FriendshipService {
}
@Override
- public Mono<@NotNull Boolean> saveFriendship(Friendship friendship) {
+ public Result saveFriendship(Friendship friendship) {
return dbConFactory.create().sql("""
INSERT INTO friendships (first_uuid, second_uuid, created_at)
VALUES (:first, :second, :createdAt)
@@ -80,7 +80,7 @@ public class PostgresFriendshipService implements FriendshipService {
}
@Override
- public Mono<@NotNull Boolean> deleteFriendship(UUID uuid1, UUID uuid2) {
+ public Result deleteFriendship(UUID uuid1, UUID uuid2) {
var uuids = new OrderedUUIDPair(uuid1, uuid2);
return dbConFactory.create().sql("""
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/InMemoryFriendRequestService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/InMemoryFriendRequestService.java
index 7d3b928..d0f929e 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/InMemoryFriendRequestService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/InMemoryFriendRequestService.java
@@ -2,11 +2,9 @@ package de.kentoj.scrow.bukkit.friends.request;
import de.kentoj.scrow.bukkit.friends.FriendRequest;
import de.kentoj.scrow.bukkit.friends.FriendRequestService;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.UUID;
@@ -15,34 +13,34 @@ public class InMemoryFriendRequestService implements FriendRequestService {
private final Set requests = new HashSet<>();
@Override
- public Flux<@NotNull FriendRequest> getFriendRequestsTo(UUID playerId) {
- return Flux.fromStream(requests.stream()
- .filter(req -> req.getTo().equals(playerId)));
+ public List getFriendRequestsTo(UUID playerId) {
+ return requests.stream()
+ .filter(req -> req.getTo().equals(playerId))
+ .toList();
}
@Override
- public Flux<@NotNull FriendRequest> getFriendRequestsFrom(UUID playerId) {
- return Flux.fromStream(requests.stream()
- .filter(req -> req.getFrom().equals(playerId)));
+ public List getFriendRequestsFrom(UUID playerId) {
+ return requests.stream()
+ .filter(req -> req.getFrom().equals(playerId))
+ .toList();
}
@Override
- public Mono<@NotNull FriendRequest> getFriendRequest(UUID from, UUID to) {
- return Mono.justOrEmpty(requests.stream()
- .filter(req -> req.getFrom().equals(from) && req.getTo().equals(to))
- .findFirst()
- .orElse(null));
+ public FriendRequest getFriendRequest(UUID from, UUID to) {
+ return requests.stream()
+ .filter(req -> req.getFrom().equals(from) && req.getTo().equals(to))
+ .findFirst()
+ .orElse(null);
}
@Override
- public Mono<@NotNull Boolean> saveFriendRequest(FriendRequest friendRequest) {
- return getFriendRequest(friendRequest.getFrom(), friendRequest.getTo())
- .map(__ -> false)
- .switchIfEmpty(Mono.fromRunnable(() -> requests.add(friendRequest)));
+ public boolean saveFriendRequest(FriendRequest friendRequest) {
+ return requests.add(friendRequest);
}
@Override
- public Mono<@NotNull Boolean> deleteFriendRequest(UUID from, UUID to) {
- return Mono.just(requests.removeIf(req -> req.getFrom().equals(from) && req.getTo().equals(to)));
+ public boolean deleteFriendRequest(UUID from, UUID to) {
+ return requests.removeIf(req -> req.getFrom().equals(from) && req.getTo().equals(to));
}
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestService.java
deleted file mode 100644
index c6d8e85..0000000
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package de.kentoj.scrow.bukkit.friends.request;
-
-import com.mongodb.ErrorCategory;
-import com.mongodb.MongoWriteException;
-import com.mongodb.client.model.Filters;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.client.model.Indexes;
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.bukkit.friends.FriendRequest;
-import de.kentoj.scrow.bukkit.friends.FriendRequestService;
-import org.bson.Document;
-import org.jetbrains.annotations.NotNull;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Date;
-import java.util.UUID;
-
-public class MongoFriendRequestService implements FriendRequestService {
-
- private static final String COLLECTION_NAME = "friend-requests";
-
- private final MongoDatabase database;
-
- public MongoFriendRequestService(MongoDatabase database) {
- this.database = database;
-
- Mono.when(
- database.createCollection(COLLECTION_NAME),
- collection().createIndex(
- Indexes.compoundIndex(
- Indexes.ascending("from"),
- Indexes.ascending("to")
- ),
- new IndexOptions().unique(true)
- )
- ).block();
- }
-
- @Override
- public Mono<@NotNull FriendRequest> getFriendRequest(UUID from, UUID to) {
- return Mono.from(collection()
- .find(Filters.and(
- Filters.eq("from", from),
- Filters.eq("to", to)
- )))
- .map(this::fromDocument);
- }
-
- @Override
- public Mono<@NotNull Boolean> saveFriendRequest(FriendRequest friendRequest) {
- return Mono.from(collection()
- .insertOne(toDocument(friendRequest))
- )
- .map(__ -> true)
- .onErrorResume(MongoWriteException.class, e ->
- e.getError().getCategory() == ErrorCategory.DUPLICATE_KEY ?
- Mono.just(false) :
- Mono.error(e)
- );
- }
-
- @Override
- public Flux<@NotNull FriendRequest> getFriendRequestsTo(UUID playerId) {
- return Flux.from(collection()
- .find(Filters.eq("to", playerId)))
- .map(this::fromDocument);
- }
-
- @Override
- public Flux<@NotNull FriendRequest> getFriendRequestsFrom(UUID playerId) {
- return Flux.from(collection()
- .find()
- .filter(Filters.eq("from", playerId)))
- .map(this::fromDocument);
- }
-
- @Override
- public Mono<@NotNull Boolean> deleteFriendRequest(UUID from, UUID to) {
- return Mono.from(collection()
- .deleteOne(Filters.and(
- Filters.eq("from", from),
- Filters.eq("to", to)
- )))
- .map(res -> res.getDeletedCount() > 0);
- }
-
- private MongoCollection collection() {
- return database.getCollection(COLLECTION_NAME);
- }
-
- private Document toDocument(FriendRequest req) {
- return new Document()
- .append("from", req.getFrom())
- .append("to", req.getTo())
- .append("createdAt", Date.from(req.getCreatedAt()));
- }
-
- private FriendRequest fromDocument(Document doc) {
- return new FriendRequestImpl(
- doc.get("from", UUID.class),
- doc.get("to", UUID.class),
- doc.getDate("createdAt").toInstant()
- );
- }
-}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/PostgresFriendRequestService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/PostgresFriendRequestService.java
index 17ea7c9..157db13 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/PostgresFriendRequestService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/PostgresFriendRequestService.java
@@ -31,7 +31,7 @@ public class PostgresFriendRequestService implements FriendRequestService {
}
@Override
- public Mono<@NotNull FriendRequest> getFriendRequest(UUID from, UUID to) {
+ public Result getFriendRequest(UUID from, UUID to) {
return conFactory.create().sql("""
SELECT *
FROM friend-requests
@@ -44,7 +44,7 @@ public class PostgresFriendRequestService implements FriendRequestService {
}
@Override
- public Mono<@NotNull Boolean> saveFriendRequest(FriendRequest friendRequest) {
+ public Result saveFriendRequest(FriendRequest friendRequest) {
return conFactory.create().sql("""
INSERT INTO friend-requests (from_uuid, to_uuid, created_at)
VALUES (:from, :to, :created_at)
@@ -57,7 +57,7 @@ public class PostgresFriendRequestService implements FriendRequestService {
}
@Override
- public Flux<@NotNull FriendRequest> getFriendRequestsTo(UUID playerId) {
+ public Result, String> getFriendRequestsTo(UUID playerId) {
return conFactory.create().sql("""
SELECT *
FROM friend-requests
@@ -69,7 +69,7 @@ public class PostgresFriendRequestService implements FriendRequestService {
}
@Override
- public Flux<@NotNull FriendRequest> getFriendRequestsFrom(UUID playerId) {
+ public Result, String> getFriendRequestsFrom(UUID playerId) {
return conFactory.create().sql("""
SELECT *
FROM friend-requests
@@ -81,7 +81,7 @@ public class PostgresFriendRequestService implements FriendRequestService {
}
@Override
- public Mono<@NotNull Boolean> deleteFriendRequest(UUID from, UUID to) {
+ public Result deleteFriendRequest(UUID from, UUID to) {
return conFactory.create().sql("""
DELETE
FROM friend-requests
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/playermanager/PlayerManagerImpl.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/playermanager/PlayerManagerImpl.java
index 0238f2f..7e35110 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/playermanager/PlayerManagerImpl.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/playermanager/PlayerManagerImpl.java
@@ -1,7 +1,7 @@
package de.kentoj.scrow.bukkit.playermanager;
import com.leakyabstractions.result.api.Result;
-import de.kentoj.scrow.bukkit.PlayerManager;
+import de.kentoj.scrow.bukkit.misc.PlayerManager;
import de.kentoj.scrowlib.messaging.MessageBroker;
import lombok.RequiredArgsConstructor;
import org.bson.Document;
@@ -14,7 +14,7 @@ public class PlayerManagerImpl implements PlayerManager {
private final MessageBroker messageBroker;
@Override
- public Result sendPlayer(UUID playerId, String instanceHandle) {
+ public Result sendPlayer(UUID playerId, String instanceHandle) {
return messageBroker.request("players.send", new Document()
.append("playerId", playerId)
.append("handle", instanceHandle))
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/LobbyCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/LobbyCommand.java
index c3513f9..dd94b67 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/LobbyCommand.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/LobbyCommand.java
@@ -22,7 +22,7 @@ public class LobbyCommand implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
Bukkit.dispatchCommand(ctx.getSender(), "play lobby");
return CompletableFuture.completedFuture(Results.success(null));
}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/PlayCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/PlayCommand.java
index ec2482c..8466bb3 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/PlayCommand.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/server/PlayCommand.java
@@ -28,7 +28,7 @@ public class PlayCommand implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var gamemode = ctx.getArg(gamemodeArg);
var player = (Player) ctx.getSender();
return CompletableFuture.supplyAsync(() -> ScrowAPI.getInstanceManager().getInstances()
diff --git a/core-lib/build.gradle.kts b/core-lib/build.gradle.kts
index 9aed3e7..8139e4c 100644
--- a/core-lib/build.gradle.kts
+++ b/core-lib/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
api("org.mongodb:bson:5.8.0")
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.21")
+ api("de.kentoj.scrow:kencommandapi-core:0.22")
}
publishing {
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManager.java b/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManager.java
index 22f930f..4a8611e 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManager.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManager.java
@@ -12,7 +12,7 @@ public interface InstanceManager {
*/
Result deployInstance(String template);
- Result destroyInstance(String handle);
+ Result destroyInstance(String handle);
/**
* @return Flux with handles of running servers
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManagerImpl.java b/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManagerImpl.java
index 9dfc538..5afb601 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManagerImpl.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/servermanager/InstanceManagerImpl.java
@@ -23,7 +23,7 @@ public class InstanceManagerImpl implements InstanceManager {
}
@Override
- public Result destroyInstance(String handle) {
+ public Result destroyInstance(String handle) {
var result = messageBroker.request("instance.destroy", new Document("handle", handle));
return result.mapSuccess(__ -> null);
}
diff --git a/core-velocity-api/build.gradle.kts b/core-velocity-api/build.gradle.kts
index 2911306..e760250 100644
--- a/core-velocity-api/build.gradle.kts
+++ b/core-velocity-api/build.gradle.kts
@@ -24,9 +24,9 @@ dependencies {
api("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-core
- api("de.kentoj.scrow:kencommandapi-core:0.21")
+ api("de.kentoj.scrow:kencommandapi-core:0.22")
// http://forge.kentoj.de/scrow/-/packages/maven/de.kentoj.scrow:kencommandapi-velocity
- api("de.kentoj.scrow:kencommandapi-velocity:0.21")
+ api("de.kentoj.scrow:kencommandapi-velocity:0.22")
}
publishing {
diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
index 6a34d18..9216215 100644
--- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
+++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/command/OnlineCommand.java
@@ -28,7 +28,7 @@ public class OnlineCommand implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
int cnt = server.getPlayerCount();
var msg = cnt != 1
? "There are currently " + cnt + " players online"
diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
index 3812ed4..18d4a04 100644
--- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
+++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/MsgCommand.java
@@ -37,7 +37,7 @@ public class MsgCommand implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var target = ctx.getArg(targetArg);
var msg = ctx.getArg(msgArg);
var sender = (Player)ctx.getSender();
diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
index 5aa38a8..d9d0c3e 100644
--- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
+++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/privmsg/ReplyCommand.java
@@ -34,7 +34,7 @@ public class ReplyCommand implements CommandExecutor {
}
@Override
- public CompletableFuture> execute(CommandContext ctx) {
+ public CompletableFuture> execute(CommandContext ctx) {
var sender = (Player)ctx.getSender();
var targetId = cache.getLastTarget(sender.getUniqueId());
var target = server.getPlayer(targetId).orElse(null);
diff --git a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/server/ServerRegisterWatchdog.java b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/server/ServerRegisterWatchdog.java
index d8f2cda..47e0477 100644
--- a/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/server/ServerRegisterWatchdog.java
+++ b/core-velocity-impl/src/main/java/de/kentoj/scrow/corevelocity/server/ServerRegisterWatchdog.java
@@ -39,7 +39,7 @@ public class ServerRegisterWatchdog {
.subscribe(null, e -> log.throwing(getClass().getName(), "listen", e));
}
- private @NotNull Mono<@NotNull Void> handleStateChange(SubscriptionContext ctx, String state, String handle) {
+ private @NotNull Result handleStateChange(SubscriptionContext ctx, String state, String handle) {
return switch (state) {
case "UP" -> instanceManager.getInfo(handle)
.doOnNext(instance ->