lang 21 rework

Dropped support for pre 1.8 rewards

.github/workflows/maven.yml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: 17
-        cache: 'maven'
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

.readthedocs.yml

@@ -21,5 +21,5 @@ sphinx:
 
 # Optionally declare the Python requirements required to build your docs
 python:
-   install:
-   - requirements: docs/source/requirements.txt
+  install:
+    - requirements: docs/source/requirements.txt

.travis.yml

@@ -5,7 +5,7 @@ notifications:
     secure: "drNgYCrHpXj/sSrnoRUpMUp4jq3Jq/EXV6llQ0JYo3qkRirUec7ZgVA59Ln57Higv+EG8qpbRT/dohzV7mqn0bb2inXPJCI7JJtUJZNNjo/fkDZaSPFHJAWa1XjtEfAnIbQCd7EtU9RnIAGn7IwXqfxZOLakP0ZpkpNOjfuTdcI2S3GEkZJSDrwB7Q7LlzGuAlZkx0BWHkoyb7zCUVJ94ftiwHPy3nT05EzlbXyQ3xUUe1Y+pGZ7oBWsN8k7LumHN3SMwTnFu7mvVoTN53BH2zD3I2mACKsnF2KIyk+6p4IUiFeYQc2z5lnX8YMFiWkUpFbWhetUwsnjNRUZ4TvtqBkOBaEHyBn82nigUiYbW8Ea8ZjzqrcBTxOaK9Qt8C/LC0CcclxyHFQD7fSrD4IYNv6/vC/jWB+CCoVPFF+ZaJLQhiN847p+wlU0EJuyewqrb57n3Xfzzk5AtIzYpculg62CCW2caCfXR4rEa8JdDATQr/c7tvnrx2XXwlKWA/crRPAOVCj6fA0FADNvC0W3QexLDGOpwobqKbN5z2Ouw4sISyPAhfCsgGVrbTz4HYtFf3riIzbW5lJcs63XhNZdaYI8eDL8PTpxtFwhhyOHtOR+p0ez5TSWO9N2e6+HOGMm7rG0ykNY+Vs2Pri2FwRLjq/sQLLdyJpejkgrrIF/vzE="
 cache:
   directories:
-  - $HOME/.m2
+    - $HOME/.m2
 env:
   matrix:
     - PROFILE=BUKKIT

Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java

@@ -12,13 +12,14 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
 public class MinigameTimer {
     private static final Minigames plugin = Minigames.getPlugin();
     private final Minigame minigame;
-    private final List<Integer> timeMsg = new ArrayList<>();
+    private final List<Long> timeMsg = new ArrayList<>();
     private long time = 0;
     private long otime = 0;
     private int taskID = -1;
@@ -28,7 +29,7 @@ public MinigameTimer(Minigame minigame, long time) {
         this.time = time;
         otime = time;
         this.minigame = minigame;
-        timeMsg.addAll(plugin.getConfig().getIntegerList("multiplayer.timerMessageInterval"));
+        timeMsg.addAll(plugin.getConfig().getLongList("multiplayer.timerMessageInterval"));
         startTimer();
     }
 
@@ -52,27 +53,28 @@ public void startTimer() {
     private void runTimer() {
         time--;
         if (minigame.isUsingXPBarTimer()) {
-            float timeper = ((Integer) time).floatValue() / ((Integer) otime).floatValue();
-            int level = 0;
-            if (time / 60 > 0)
+            float timeper = ((Long) time).floatValue() / ((Long) otime).floatValue();
+            long level = 0;
+            if (time / 60 > 0) {
                 level = time / 60;
-            else
+            } else {
                 level = time;
+            }
 
             for (MinigamePlayer mgPlayer : minigame.getPlayers()) {
                 if (timeper < 0) {
                     mgPlayer.getPlayer().setExp(0);
                     mgPlayer.getPlayer().setLevel(0);
                 } else {
                     mgPlayer.getPlayer().setExp(timeper);
-                    mgPlayer.getPlayer().setLevel(level);
+                    mgPlayer.getPlayer().setLevel((int) level);
                 }
             }
         }
         if (timeMsg.contains(time) && broadcastTime) {
             PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
             MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_TIMELEFT,
-                    Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(time))));
+                    Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(time)))));
         }
 
         if (time <= 0) {

Minigames/src/main/java/au/com/mineauz/minigames/MinigameUtils.java

@@ -133,7 +133,7 @@ public static Component convertTime(Duration duration, boolean small) { //todo m
             Component lastTimeComponent = timeComponents.pop();
             if (!timeComponents.isEmpty()) {
                 return Component.join(JoinConfiguration.commas(true), timeComponents).
-                        appendSpace().append(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_AND)).appendSpace().
+                        appendSpace().append(MinigameMessageManager.getMgMessage(MinigameLangKey.AND)).appendSpace().
                         append(lastTimeComponent);
             } else {
                 return lastTimeComponent;

Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java

@@ -16,8 +16,8 @@
 import au.com.mineauz.minigames.objects.ResourcePack;
 import au.com.mineauz.minigames.recorder.BasicRecorder;
 import au.com.mineauz.minigames.signs.SignBase;
-import au.com.mineauz.minigames.stats.MinigameStats;
-import au.com.mineauz.minigames.stats.StatValueField;
+import au.com.mineauz.minigames.stats.MinigameStatistics;
+import au.com.mineauz.minigames.stats.StatisticValueField;
 import au.com.mineauz.minigames.stats.StoredGameStats;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.FutureCallback;
@@ -137,19 +137,19 @@ public void onDisable() {
 
         final MinigameSave globalLoadouts = new MinigameSave("globalLoadouts");
         if (this.minigameManager.hasLoadouts()) {
-            for (final String loadout : this.minigameManager.getLoadouts()) {
-                for (final Integer slot : this.minigameManager.getLoadout(loadout).getItemSlots()) {
-                    globalLoadouts.getConfig().set(loadout + '.' + slot, this.minigameManager.getLoadout(loadout).getItem(slot));
+            for (final PlayerLoadout loadout : this.minigameManager.getGlobalLoadouts()) {
+                for (final Integer slot : loadout.getItemSlots()) {
+                    globalLoadouts.getConfig().set(loadout.getName() + '.' + slot, loadout.getItem(slot));
                 }
-                if (!this.minigameManager.getLoadout(loadout).getAllPotionEffects().isEmpty()) {
-                    for (final PotionEffect eff : this.minigameManager.getLoadout(loadout).getAllPotionEffects()) {
+                if (!loadout.getAllPotionEffects().isEmpty()) {
+                    for (final PotionEffect eff : loadout.getAllPotionEffects()) {
                         globalLoadouts.getConfig().set(loadout + ".potions." + eff.getType().getName() + ".amp", eff.getAmplifier());
                         globalLoadouts.getConfig().set(loadout + ".potions." + eff.getType().getName() + ".dur", eff.getDuration());
                     }
                 } else {
                     globalLoadouts.getConfig().set(loadout + ".potions", null);
                 }
-                if (this.minigameManager.getLoadout(loadout).getUsePermissions()) {
+                if (loadout.getUsePermissions()) {
                     globalLoadouts.getConfig().set(loadout + ".usepermissions", true);
                 } else {
                     globalLoadouts.getConfig().set(loadout + ".usepermissions", null);
@@ -481,7 +481,7 @@ 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 ListenableFuture<Long> winCountFuture = this.backend.loadSingleStat(saveData.getMinigame(), MinigameStatistics.Wins, StatisticValueField.Total, saveData.getPlayer().getUUID());
         this.backend.saveStats(saveData);
 
         this.backend.addServerThreadCallback(winCountFuture, new FutureCallback<>() {

Minigames/src/main/java/au/com/mineauz/minigames/backend/Backend.java

@@ -45,7 +45,7 @@ public abstract class Backend {
      * @param order    The order to get the stats in
      * @return A list of stats matching the requirements
      */
-    public abstract List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order);
+    public abstract List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order);
 
     /**
      * Loads player stats from the backend. This method is blocking.
@@ -58,7 +58,7 @@ public abstract class Backend {
      * @param length   the maximum amount of data to return
      * @return A list of stats matching the requirements
      */
-    public abstract List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length);
+    public abstract List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order, int offset, int length);
 
     /**
      * Gets the value of a stat for a player. This method is blocking
@@ -69,7 +69,7 @@ public abstract class Backend {
      * @param field    the field of the stat to load
      * @return The value of the stat
      */
-    public abstract long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatValueField field);
+    public abstract long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatisticValueField field);
 
     /**
      * Loads stat settings for the minigame

Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java

@@ -145,7 +145,7 @@ public void shutdown() {
      * @param length   The number of stats to retrieve
      * @return A ListenableFuture 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) {
+    public ListenableFuture<List<StoredStat>> loadStats(final Minigame minigame, final MinigameStat stat, final StatisticValueField field, final ScoreboardOrder order, final int offset, final int length) {
         return executorService.submit(() -> backend.loadStats(minigame, stat, field, order, offset, length));
     }
 
@@ -158,7 +158,7 @@ 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) {
+    public ListenableFuture<Long> loadSingleStat(final Minigame minigame, final MinigameStat stat, final StatisticValueField field, final UUID playerId) {
         return executorService.submit(() -> backend.getStat(minigame, playerId, stat, field));
     }
 

Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java

@@ -163,17 +163,17 @@ public void saveGameStatus(StoredGameStats stats) {
     }
 
     @Override
-    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order) {
+    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order) {
         return loadStats(minigame, stat, field, order, 0, Integer.MAX_VALUE);
     }
 
     @Override
-    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) {
+    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order, int offset, int length) {
         return loader.loadStatValues(minigame, stat, field, order, offset, length);
     }
 
     @Override
-    public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatValueField field) {
+    public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatisticValueField field) {
         return loader.loadSingleValue(minigame, stat, field, playerId);
     }
 
@@ -209,7 +209,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
                     String rawFormat = rs.getString("format");
                     Component displayName = MiniMessage.miniMessage().deserialize(rs.getString("display_name"));
 
-                    MinigameStat stat = MinigameStats.getStat(statName);
+                    MinigameStat stat = MinigameStatistics.getStat(statName);
                     if (stat == null) {
                         // Just ignore it
                         continue;

Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java

@@ -6,7 +6,7 @@
 import au.com.mineauz.minigames.minigame.Minigame;
 import au.com.mineauz.minigames.minigame.ScoreboardOrder;
 import au.com.mineauz.minigames.stats.MinigameStat;
-import au.com.mineauz.minigames.stats.StatValueField;
+import au.com.mineauz.minigames.stats.StatisticValueField;
 import au.com.mineauz.minigames.stats.StoredStat;
 import com.google.common.collect.Lists;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
@@ -35,7 +35,7 @@ public MySQLStatLoader(MySQLBackend backend, ComponentLogger logger) {
         getSingle = new StatementKey("SELECT `value` FROM `PlayerStats` WHERE `minigame_id`=? AND `player_id`=? AND `stat`=?;");
     }
 
-    public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) {
+    public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order, int offset, int length) {
         MinigameMessageManager.debugMessage("MySQL beginning stat load for " + minigame.getName() + ", " + stat + ", " + field);
         ConnectionHandler handler = null;
         try {
@@ -54,7 +54,7 @@ public List<StoredStat> loadStatValues(Minigame minigame, MinigameStat stat, Sta
         }
     }
 
-    public long loadSingleValue(Minigame minigame, MinigameStat stat, StatValueField field, UUID playerId) {
+    public long loadSingleValue(Minigame minigame, MinigameStat stat, StatisticValueField field, UUID playerId) {
         ConnectionHandler handler = null;
         try {
             handler = backend.getPool().getConnection();
@@ -81,7 +81,7 @@ public long loadSingleValue(Minigame minigame, MinigameStat stat, StatValueField
     }
 
     // Loads from the stats table
-    private List<StoredStat> loadStats(ConnectionHandler handler, int minigameId, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) throws SQLException {
+    private List<StoredStat> loadStats(ConnectionHandler handler, int minigameId, MinigameStat stat, StatisticValueField field, ScoreboardOrder order, int offset, int length) throws SQLException {
         String statName = stat.getName() + field.getSuffix();
 
         try {

Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatSaver.java

@@ -5,7 +5,7 @@
 import au.com.mineauz.minigames.managers.MinigameMessageManager;
 import au.com.mineauz.minigames.stats.MinigameStat;
 import au.com.mineauz.minigames.stats.StatFormat;
-import au.com.mineauz.minigames.stats.StatValueField;
+import au.com.mineauz.minigames.stats.StatisticValueField;
 import au.com.mineauz.minigames.stats.StoredGameStats;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 
@@ -35,10 +35,10 @@ public MySQLStatSaver(MySQLBackend backend, ComponentLogger logger) {
         insertStatMax = new StatementKey("INSERT INTO `PlayerStats` (`player_id`, `minigame_id`, `stat`, `value`, `entered`) VALUES (?, ?, ?, ?, Now()) ON DUPLICATE KEY UPDATE `value`=GREATEST(`value`, VALUES(`value`))");
 
         // Prepare lookup table
-        insertStatements[StatValueField.Last.ordinal()] = insertStat;
-        insertStatements[StatValueField.Min.ordinal()] = insertStatMin;
-        insertStatements[StatValueField.Max.ordinal()] = insertStatMax;
-        insertStatements[StatValueField.Total.ordinal()] = insertStatTotal;
+        insertStatements[StatisticValueField.Last.ordinal()] = insertStat;
+        insertStatements[StatisticValueField.Min.ordinal()] = insertStatMin;
+        insertStatements[StatisticValueField.Max.ordinal()] = insertStatMax;
+        insertStatements[StatisticValueField.Total.ordinal()] = insertStatTotal;
     }
 
     public void saveData(StoredGameStats data) {
@@ -96,7 +96,7 @@ private void saveStats(ConnectionHandler handler, StoredGameStats data, UUID pla
     }
 
     private void queueStat(ConnectionHandler handler, MinigameStat stat, long value, StatFormat format, UUID player, int minigameId) throws SQLException {
-        for (StatValueField field : format.getFields()) {
+        for (StatisticValueField field : format.getFields()) {
             handler.batchUpdate(insertStatements[field.ordinal()], player.toString(), minigameId, stat.getName() + field.getSuffix(), value);
         }
     }

Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java

@@ -195,17 +195,17 @@ public void saveGameStatus(StoredGameStats stats) {
     }
 
     @Override
-    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order) {
+    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order) {
         return loadStats(minigame, stat, field, order, 0, Integer.MAX_VALUE);
     }
 
     @Override
-    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatValueField field, ScoreboardOrder order, int offset, int length) {
+    public List<StoredStat> loadStats(Minigame minigame, MinigameStat stat, StatisticValueField field, ScoreboardOrder order, int offset, int length) {
         return loader.loadStatValues(minigame, stat, field, order, offset, length);
     }
 
     @Override
-    public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatValueField field) {
+    public long getStat(Minigame minigame, UUID playerId, MinigameStat stat, StatisticValueField field) {
         return loader.loadSingleValue(minigame, stat, field, playerId);
     }
 
@@ -251,7 +251,7 @@ public Map<MinigameStat, StatSettings> loadStatSettings(Minigame minigame) {
                     String rawFormat = rs.getString("format");
                     Component displayName = MiniMessage.miniMessage().deserialize(rs.getString("display_name"));
 
-                    MinigameStat stat = MinigameStats.getStat(statName);
+                    MinigameStat stat = MinigameStatistics.getStat(statName);
                     if (stat == null) {
                         // Just ignore it
                         continue;