Merge branch 'feuerFeatures' into paperMerged

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/BackendCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/DeleteCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemEnum.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/ScoreboardDisplay.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Team.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/LoadoutModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/TeamsModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/HierarchyRewardScheme.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/RewardSchemes.java # Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/StoredGameStats.java # Regions/src/main/java/au/com/mineauz/minigamesregions/Region.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionDisplayManager.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionNodeEditToolMode.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/MessageAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemAction.java
GreenSurvivors · Jan 29, 2024 · 57ab9c7 · 57ab9c7
2 parents ec92d64 + cd3cf0f
commit 57ab9c7
Show file tree

Hide file tree

Showing 25 changed files with 124 additions and 207 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java b/Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java
@@ -19,9 +19,6 @@
 import au.com.mineauz.minigames.stats.MinigameStats;
 import au.com.mineauz.minigames.stats.StatValueField;
 import au.com.mineauz.minigames.stats.StoredGameStats;
-import com.google.common.io.Closeables;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.ListenableFuture;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import net.milkbowl.vault.economy.Economy;
 import org.bstats.bukkit.Metrics;
@@ -39,13 +36,13 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 
 public class Minigames extends JavaPlugin {
@@ -382,15 +379,11 @@ public Economy getEconomy() {
     }
 
     private int checkVersion() {
-        final InputStream stream = this.getResource("minigame.properties");
         final Properties p = new Properties();
-        try {
+        try (final InputStream stream = this.getResource("minigame.properties")) {
             p.load(stream);
         } catch (final NullPointerException | IOException e) {
             this.getLogger().warning(e.getMessage());
-        } finally {
-            //noinspection UnstableApiUsage
-            Closeables.closeQuietly(stream);
         }
 
         if (p.containsKey("version")) {
@@ -476,27 +469,20 @@ public void addMetric(final CustomChart chart) {
     public void queueStatSave(final StoredGameStats saveData, final boolean winner) {
         MinigameMessageManager.debugMessage("Scheduling SQL data save for " + saveData);
 
-        final ListenableFuture<Long> winCountFuture = this.backend.loadSingleStat(saveData.getMinigame(), MinigameStats.Wins, StatValueField.Total, saveData.getPlayer().getUUID());
+        final CompletableFuture<Long> winCountFuture = this.backend.loadSingleStat(saveData.getMinigame(), MinigameStats.Wins, StatValueField.Total, saveData.getPlayer().getUUID());
         this.backend.saveStats(saveData);
 
-        this.backend.addServerThreadCallback(winCountFuture, new FutureCallback<>() {
-            @Override
-            public void onFailure(final @NotNull Throwable t) {
-            }
-
-            @Override
-            public void onSuccess(final Long winCount) {
-                final Minigame minigame = saveData.getMinigame();
-                final MinigamePlayer player = saveData.getPlayer();
+        winCountFuture.thenApply(winCount -> Bukkit.getScheduler().runTask(Minigames.getPlugin(), () -> {
+            final Minigame minigame = saveData.getMinigame();
+            final MinigamePlayer player = saveData.getPlayer();
 
-                // Do rewards
-                if (winner) {
-                    RewardsModule.getModule(minigame).awardPlayer(player, saveData, minigame, winCount == 0);
-                } else {
-                    RewardsModule.getModule(minigame).awardPlayerOnLoss(player, saveData, minigame);
-                }
+            // Do rewards
+            if (winner) {
+                RewardsModule.getModule(minigame).awardPlayer(player, saveData, minigame, winCount == 0);
+            } else {
+                RewardsModule.getModule(minigame).awardPlayerOnLoss(player, saveData, minigame);
             }
-        });
+        }));
     }
 
     public void toggleDebug() {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java
@@ -7,32 +7,25 @@
 import au.com.mineauz.minigames.minigame.Minigame;
 import au.com.mineauz.minigames.minigame.ScoreboardOrder;
 import au.com.mineauz.minigames.stats.*;
-import com.google.common.util.concurrent.*;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import java.util.concurrent.CompletableFuture;
 
 public class BackendManager {
     private final ComponentLogger logger;
-    private final ListeningExecutorService executorService;
-    private final Executor bukkitThreadExecutor;
     private boolean debug;
     private Backend backend;
 
     public BackendManager(ComponentLogger logger) {
         this.logger = logger;
         this.debug = false;
-
-        bukkitThreadExecutor = command -> Bukkit.getScheduler().runTask(Minigames.getPlugin(), command);
-
-        executorService = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
     }
 
     private Backend makeBackend(String type) {
@@ -143,10 +136,10 @@ public void shutdown() {
      * @param order    The order to retrieve in
      * @param offset   The offset to retrieve from
      * @param length   The number of stats to retrieve
-     * @return A ListenableFuture that returns the list of StoredStats loaded
+     * @return A CompletableFuture that returns the list of StoredStats loaded
      */
-    public ListenableFuture<List<StoredStat>> loadStats(final Minigame minigame, final MinigameStat stat, final StatValueField field, final ScoreboardOrder order, final int offset, final int length) {
-        return executorService.submit(() -> backend.loadStats(minigame, stat, field, order, offset, length));
+    public CompletableFuture<List<StoredStat>> loadStats(final Minigame minigame, final MinigameStat stat, final StatValueField field, final ScoreboardOrder order, final int offset, final int length) {
+        return CompletableFuture.supplyAsync(() -> backend.loadStats(minigame, stat, field, order, offset, length));
     }
 
     /**
@@ -158,18 +151,18 @@ public ListenableFuture<List<StoredStat>> loadStats(final Minigame minigame, fin
      * @param playerId The player that owns the stat
      * @return The value of the stat. If it is not set, 0 will be returned
      */
-    public ListenableFuture<Long> loadSingleStat(final Minigame minigame, final MinigameStat stat, final StatValueField field, final UUID playerId) {
-        return executorService.submit(() -> backend.getStat(minigame, playerId, stat, field));
+    public CompletableFuture<Long> loadSingleStat(final Minigame minigame, final MinigameStat stat, final StatValueField field, final UUID playerId) {
+        return CompletableFuture.supplyAsync(() -> backend.getStat(minigame, playerId, stat, field));
     }
 
     /**
      * Queues a task to save the stats to the backend. The stats will be saved asynchronously
      *
      * @param stats The stats to be saved
-     * @return A ListenableFuture that returns the inputted stats for chaining.
+     * @return A CompletableFuture that returns the inputted stats for chaining.
      */
-    public ListenableFuture<StoredGameStats> saveStats(final StoredGameStats stats) {
-        return executorService.submit(() -> {
+    public CompletableFuture<StoredGameStats> saveStats(final StoredGameStats stats) {
+        return CompletableFuture.supplyAsync(() -> {
             backend.saveGameStatus(stats);
             return stats;
         });
@@ -179,11 +172,10 @@ public ListenableFuture<StoredGameStats> saveStats(final StoredGameStats stats)
      * Retrieves the settings for all stats in a minigame. This is loaded asynchronously
      *
      * @param minigame The minigame to load settings for
-     * @return A ListenableFuture that returns a map of minigame stats and their settings
+     * @return A CompletableFuture that returns a map of minigame stats and their settings
      */
-    public ListenableFuture<Map<MinigameStat, StatSettings>> loadStatSettings(final Minigame minigame) {
-
-        return executorService.submit(() -> backend.loadStatSettings(minigame));
+    public CompletableFuture<Map<MinigameStat, StatSettings>> loadStatSettings(final Minigame minigame) {
+        return CompletableFuture.supplyAsync(() -> backend.loadStatSettings(minigame));
     }
 
     /**
@@ -193,27 +185,17 @@ public ListenableFuture<Map<MinigameStat, StatSettings>> loadStatSettings(final
      * @param settings The collection of settings to save
      * @return A ListenableFuture to get the status of the save
      */
-    public ListenableFuture<Void> saveStatSettings(final Minigame minigame, final Collection<StatSettings> settings) {
+    public @Nullable CompletableFuture<Void> saveStatSettings(final Minigame minigame, final Collection<StatSettings> settings) {
         if (backend instanceof TestBackEnd) {
             backend.saveStatSettings(minigame, settings);
             return null;
         }
-        return executorService.submit(() -> {
+        return CompletableFuture.supplyAsync(() -> {
             backend.saveStatSettings(minigame, settings);
             return null;
         });
     }
 
-    /**
-     * Adds a callback to the ListenableFuture that will be executed on the Minecraft server thread
-     *
-     * @param future   The future to add the callback to
-     * @param callback The callback to be added
-     */
-    public <T> void addServerThreadCallback(ListenableFuture<T> future, FutureCallback<T> callback) {
-        Futures.addCallback(future, callback, bukkitThreadExecutor);
-    }
-
     /**
      * Initializes an export to the target backend type.
      * The export can take a while and will prevent all other backend interactions while it goes on
@@ -224,7 +206,7 @@ public <T> void addServerThreadCallback(ListenableFuture<T> future, FutureCallba
      * @return A future to let you know when the process is finished
      * @throws IllegalArgumentException Thrown if the backend chosen cannot be used. Reason given in message
      */
-    public ListenableFuture<Void> exportTo(String type, ConfigurationSection config, final ExportNotifier notifier) throws IllegalArgumentException {
+    public CompletableFuture<Void> exportTo(String type, ConfigurationSection config, final ExportNotifier notifier) throws IllegalArgumentException {
         final Backend destination = makeBackend(type);
         if (destination == null) {
             throw new IllegalArgumentException("Invalid backend type");
@@ -238,7 +220,7 @@ public ListenableFuture<Void> exportTo(String type, ConfigurationSection config,
             throw new IllegalArgumentException("Failed to initialize destination backend");
         }
 
-        return executorService.submit(() -> backend.exportTo(destination, notifier), null);
+        return CompletableFuture.runAsync(() -> backend.exportTo(destination, notifier), null);
     }
 
     /**
@@ -250,7 +232,7 @@ public ListenableFuture<Void> exportTo(String type, ConfigurationSection config,
      * @param config The config to load settings from
      * @throws IllegalArgumentException Thrown if the backend chosen cannot be used. Reason given in message
      */
-    public ListenableFuture<Void> switchBackend(final String type, ConfigurationSection config) throws IllegalArgumentException {
+    public CompletableFuture<Void> switchBackend(final String type, ConfigurationSection config) throws IllegalArgumentException {
         final Backend newBackend = makeBackend(type);
         if (newBackend == null) {
             throw new IllegalArgumentException("Invalid backend type");
@@ -264,7 +246,7 @@ public ListenableFuture<Void> switchBackend(final String type, ConfigurationSect
             throw new IllegalArgumentException("Failed to initialize target backend");
         }
 
-        return executorService.submit(() -> {
+        return CompletableFuture.runAsync(() -> {
             backend.shutdown();
             backend = newBackend;
             logger.warn("Backend has been switched to " + type);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/ConnectionHandler.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/ConnectionHandler.java
@@ -2,12 +2,12 @@
 
 import au.com.mineauz.minigames.Minigames;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.IdentityHashMap;
 import java.util.Map;
 
 public class ConnectionHandler {
@@ -19,7 +19,7 @@ public class ConnectionHandler {
     public ConnectionHandler(Connection connection) {
         this.connection = connection;
 
-        preparedStatements = Maps.newIdentityHashMap();
+        preparedStatements = new IdentityHashMap<>();
     }
 
     public boolean lease() {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java
@@ -9,7 +9,6 @@
 import au.com.mineauz.minigames.minigame.ScoreboardOrder;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
 import au.com.mineauz.minigames.stats.*;
-import com.google.common.collect.Maps;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.configuration.ConfigurationSection;
 
@@ -199,7 +198,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
 
             int minigameId = getMinigameId(handler, minigame);
 
-            Map<MinigameStat, StatSettings> settings = Maps.newHashMap();
+            Map<MinigameStat, StatSettings> settings = new HashMap<>();
 
             try (ResultSet rs = handler.executeQuery(loadStatSettings, minigameId)) {
                 while (rs.next()) {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java
@@ -8,11 +8,11 @@
 import au.com.mineauz.minigames.stats.MinigameStat;
 import au.com.mineauz.minigames.stats.StatValueField;
 import au.com.mineauz.minigames.stats.StoredStat;
-import com.google.common.collect.Lists;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -90,7 +90,7 @@ private List<StoredStat> loadStats(ConnectionHandler handler, int minigameId, Mi
                 case DESCENDING -> getSingleDesc;
             };
 
-            List<StoredStat> stats = Lists.newArrayList();
+            List<StoredStat> stats = new ArrayList<>();
             try (ResultSet rs = handler.executeQuery(statement, minigameId, statName, offset, length)) {
                 while (rs.next()) {
                     stats.add(loadStat(rs));

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/FlatFileExporter.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/FlatFileExporter.java
@@ -3,9 +3,7 @@
 import au.com.mineauz.minigames.backend.BackendImportCallback;
 import au.com.mineauz.minigames.backend.ExportNotifier;
 import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -14,10 +12,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 public class FlatFileExporter {
     private final File file;
@@ -38,7 +33,7 @@ public FlatFileExporter(File file, BackendImportCallback callback, ExportNotifie
         this.notifier = notifier;
 
         config = new YamlConfiguration();
-        minigameIds = Maps.newHashMap();
+        minigameIds = new HashMap<>();
     }
 
     public boolean doExport() {
@@ -80,7 +75,7 @@ private void loadCompletions() {
 
     private void exportPlayers() {
         notifyNext("Exporting players...");
-        Set<UUID> uniquePlayers = Sets.newHashSet(completions.values());
+        Set<UUID> uniquePlayers = new HashSet<>(completions.values());
 
         for (UUID playerId : uniquePlayers) {
             // Attempt to get information about this player

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java
@@ -9,7 +9,6 @@
 import au.com.mineauz.minigames.minigame.ScoreboardOrder;
 import au.com.mineauz.minigames.objects.MinigamePlayer;
 import au.com.mineauz.minigames.stats.*;
-import com.google.common.collect.Maps;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.configuration.ConfigurationSection;
 
@@ -241,7 +240,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
 
             int minigameId = getMinigameId(handler, minigame);
 
-            Map<MinigameStat, StatSettings> settings = Maps.newHashMap();
+            Map<MinigameStat, StatSettings> settings = new HashMap<>();
 
             try (ResultSet rs = handler.executeQuery(loadStatSettings, minigameId)) {
                 while (rs.next()) {

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java b/Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java
@@ -8,11 +8,11 @@
 import au.com.mineauz.minigames.stats.MinigameStat;
 import au.com.mineauz.minigames.stats.StatValueField;
 import au.com.mineauz.minigames.stats.StoredStat;
-import com.google.common.collect.Lists;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -89,7 +89,7 @@ private List<StoredStat> loadStats(ConnectionHandler handler, int minigameId, Mi
             case DESCENDING -> getSingleDesc;
         };
 
-        List<StoredStat> stats = Lists.newArrayList();
+        List<StoredStat> stats = new ArrayList<>();
         try (ResultSet rs = handler.executeQuery(statement, minigameId, statName, offset, length)) {
             while (rs.next()) {
                 stats.add(loadStat(rs));