v1.1.1 - Refined data snapshot, new swap algorithm, bugfixes, use team's name

.github/workflows/artifact-builder.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
-          
+
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2
         with:

.github/workflows/release.yml

@@ -2,24 +2,24 @@ name: Release
 
 on:
   release:
-    types: [published]
+    types: [ published ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected]
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '8'
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
-      with:
+      - uses: actions/[email protected]
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '8'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+        with:
           arguments: shadowJar
-    - name: Upload jar
-      uses: AButler/[email protected]
-      with:
-        files: ${{ github.workspace }}/build/libs/*.jar
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload jar
+        uses: AButler/[email protected]
+        with:
+          files: ${{ github.workspace }}/build/libs/*.jar
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -6,35 +6,36 @@ plugins {
 }
 
 group = "io.tofpu"
-version = "1.0.3"
+version = "1.1.1-SNAPSHOT"
 
 repositories {
     mavenLocal()
     mavenCentral()
     // for brigadier
-	maven("https://libraries.minecraft.net")
+    maven("https://libraries.minecraft.net")
     maven("https://jitpack.io")
     maven("https://oss.sonatype.org/content/groups/public/")
     maven("https://repo.andrei1058.dev/releases/")
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://repo.codemc.io/repository/nms/")
 }
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
 
-    // depending on the bedwars implementation of the bedwars api
-    compileOnly("com.github.Tofpu.bedwars1058-wrapper:bedwars-plugin:wrapper-SNAPSHOT")
+    compileOnly("com.andrei1058.bedwars:bedwars-plugin:23.7-SNAPSHOT")
+    compileOnly("com.andrei1058.bedwars:bedwars-api:23.7-SNAPSHOT")
 
-    compileOnly("com.andrei1058.bedwars:bedwars-api:22.3.4")
     implementation("org.spongepowered:configurate-yaml:4.1.2")
 
     implementation("com.github.tofpu:dynamic-message:1.0.6")
     implementation("com.github.Tofpu:message-presenter:1.0.0")
 
-    implementation("net.kyori:adventure-api:4.10.1")
-    implementation("net.kyori:adventure-platform-bukkit:4.1.0")
-    implementation("net.kyori:adventure-text-minimessage:4.10.1")
-    implementation("net.kyori:adventure-text-minimessage:4.10.1")
+    implementation("net.kyori:adventure-api:4.14.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.1")
+    implementation("net.kyori:adventure-text-minimessage:4.14.0")
+    implementation("net.kyori:adventure-text-serializer-legacy:4.14.0")
+
     implementation("com.github.Revxrsal.Lamp:common:3.0.4")
     implementation("com.github.Revxrsal.Lamp:bukkit:3.0.4")
 
@@ -45,7 +46,14 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testImplementation("com.github.mockbukkit:MockBukkit:v1.16-SNAPSHOT")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation("org.mockito:mockito-core:3.+")
+
+    testImplementation("com.andrei1058.bedwars:bedwars-api:23.7-SNAPSHOT")
+    testImplementation("com.andrei1058.bedwars:bedwars-plugin:23.7-SNAPSHOT")
+
+    testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.0")
 }
 
 //sourceSets {
@@ -60,9 +68,9 @@ dependencies {
 //}
 
 java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(8))
-  }
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/tofpu/bedwarsswapaddon/plugin/BedwarsSwapAddonPlugin.java → src/main/java/io/tofpu/bedwarsswapaddon/BedwarsSwapAddonPlugin.java

@@ -1,6 +1,5 @@
-package io.tofpu.bedwarsswapaddon.plugin;
+package io.tofpu.bedwarsswapaddon;
 
-import io.tofpu.bedwarsswapaddon.BedwarsSwapBootstrap;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
@@ -14,8 +13,7 @@ public BedwarsSwapAddonPlugin() {
         super();
     }
 
-    protected BedwarsSwapAddonPlugin(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file)
-    {
+    protected BedwarsSwapAddonPlugin(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
         super(loader, description, dataFolder, file);
         bootstrap.setUnitTest(true);
     }

src/main/java/io/tofpu/bedwarsswapaddon/BedwarsSwapBootstrap.java

@@ -1,20 +1,19 @@
 package io.tofpu.bedwarsswapaddon;
 
 import com.andrei1058.bedwars.api.BedWars;
+import io.tofpu.bedwarsswapaddon.command.CommandHandler;
+import io.tofpu.bedwarsswapaddon.command.presenter.HelpPresenterHolder;
+import io.tofpu.bedwarsswapaddon.configuration.handler.ConfigurationHandler;
 import io.tofpu.bedwarsswapaddon.listener.BedwarsListener;
-import io.tofpu.bedwarsswapaddon.model.command.CommandHandler;
-import io.tofpu.bedwarsswapaddon.model.command.presenter.HelpPresenterHolder;
-import io.tofpu.bedwarsswapaddon.model.configuration.handler.ConfigurationHandler;
-import io.tofpu.bedwarsswapaddon.model.meta.adventure.AdventureHolder;
-import io.tofpu.bedwarsswapaddon.model.meta.log.LogHandler;
-import io.tofpu.bedwarsswapaddon.model.meta.message.MessageHolder;
-import io.tofpu.bedwarsswapaddon.model.reload.MainReloadHandler;
-import io.tofpu.bedwarsswapaddon.model.reload.ReloadHandlerBase;
-import io.tofpu.bedwarsswapaddon.model.swap.SwapHandlerGame;
-import io.tofpu.bedwarsswapaddon.model.swap.pool.SwapPoolHandlerBase;
-import io.tofpu.bedwarsswapaddon.model.swap.pool.SwapPoolHandlerGame;
-import io.tofpu.bedwarsswapaddon.model.swap.rejoin.MainRejoinProvider;
-import io.tofpu.bedwarsswapaddon.model.swap.rejoin.RejoinProviderBase;
+import io.tofpu.bedwarsswapaddon.message.BukkitMessageService;
+import io.tofpu.bedwarsswapaddon.message.MessageServiceHolder;
+import io.tofpu.bedwarsswapaddon.reload.MainReloadHandler;
+import io.tofpu.bedwarsswapaddon.reload.ReloadHandlerBase;
+import io.tofpu.bedwarsswapaddon.swap.game.SwapHandlerGame;
+import io.tofpu.bedwarsswapaddon.swap.game.pool.SwapPoolHandlerBase;
+import io.tofpu.bedwarsswapaddon.swap.game.pool.SwapPoolHandlerGame;
+import io.tofpu.bedwarsswapaddon.swap.game.rejoin.MainRejoinProvider;
+import io.tofpu.bedwarsswapaddon.swap.game.rejoin.RejoinProviderBase;
 import io.tofpu.bedwarsswapaddon.util.UpdateChecker;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -76,7 +75,7 @@ public void onEnable() {
         }
 
         LogHandler.get().log("Hooking into adventure...");
-        AdventureHolder.init(javaPlugin);
+        MessageServiceHolder.init(new BukkitMessageService(javaPlugin));
 
         LogHandler.get().log("Initializing the commands...");
         CommandHandler.init(javaPlugin, reloadHandler);
@@ -117,7 +116,7 @@ private void registerListeners() {
     public void onDisable() {
         LogHandler.get().log("Unhooking from adventure...");
         try {
-            AdventureHolder.get().close();
+            MessageServiceHolder.get().close();
         } catch (Exception e) {
             // ignore
         }

src/main/java/io/tofpu/bedwarsswapaddon/model/meta/log/LogHandler.java → src/main/java/io/tofpu/bedwarsswapaddon/LogHandler.java

@@ -1,39 +1,40 @@
-package io.tofpu.bedwarsswapaddon.model.meta.log;
+package io.tofpu.bedwarsswapaddon;
 
-import io.tofpu.bedwarsswapaddon.model.configuration.handler.ConfigurationHandler;
+import io.tofpu.bedwarsswapaddon.configuration.handler.ConfigurationHandler;
 import org.bukkit.plugin.Plugin;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.logging.Level;
 
 public class LogHandler {
     private static LogHandler instance;
 
     private Plugin plugin;
-    private ExecutorService executorService;
+    private final ExecutorService executorService;
     private boolean debug;
 
+    private LogHandler() {
+        this.executorService = Executors.newSingleThreadExecutor();
+        this.debug = false;
+    }
+
     public static LogHandler get() {
         if (instance == null) {
             throw new IllegalStateException("LogHandler is not initialized");
         }
         return instance;
     }
 
-    private LogHandler() {
-        this.executorService = Executors.newSingleThreadExecutor();
-        this.debug = false;
+    public static synchronized void init(final Plugin plugin) {
+        instance = new LogHandler();
+        instance.setPlugin(plugin);
     }
 
     public void reload() {
         init(plugin);
     }
 
-    public static synchronized void init(final Plugin plugin) {
-        instance = new LogHandler();
-        instance.setPlugin(plugin);
-    }
-
     public void load() {
         instance.setDebug(ConfigurationHandler.get()
                 .getSettingsHolder()
@@ -53,6 +54,11 @@ public void debug(final String message) {
         log("[DEBUG] " + message);
     }
 
+    public void warn(final String message, Exception exception) {
+        this.executorService.submit(() -> this.plugin.getLogger()
+                .log(Level.WARNING, message, exception));
+    }
+
     public void setPlugin(final Plugin plugin) {
         this.plugin = plugin;
     }

src/main/java/io/tofpu/bedwarsswapaddon/model/meta/message/MessageHolder.java → src/main/java/io/tofpu/bedwarsswapaddon/MessageHolder.java

@@ -1,4 +1,4 @@
-package io.tofpu.bedwarsswapaddon.model.meta.message;
+package io.tofpu.bedwarsswapaddon;
 
 import io.tofpu.dynamicmessage.DynamicMessage;
 import io.tofpu.dynamicmessage.holder.meta.SkipMessage;
@@ -10,37 +10,37 @@
 public class MessageHolder extends io.tofpu.dynamicmessage.holder.MessageHolder {
     @SkipMessage
     private static MessageHolder instance;
-
-    public static void init() {
-        instance = DynamicMessage.get()
-                .create(MessageHolder.class);
-    }
-
-    public static MessageHolder get() {
-        return instance;
-    }
-
     public String swapTitleAnnouncement =
             wrap("<yellow>", wrap("<obf>", "00 ")) + wrap("<green>", "SWAPPAGE ") +
             wrap("<yellow>", wrap("<obf>", "00")) + "\n" + wrap("<gold>", "New team") + ": %team%";
-
     public String swapMessageAnnouncement =
             wrap("<yellow>", "Your team swapped to ") + "%team%<yellow>!";
-
     // commands
     public String defaultCommand =
             "<yellow>This is the default command. Type " + command("/swap help") +
             " for more info!";
-
     public String awaitReload = "<yellow>Reloading the plugin...";
     public String reload = "<yellow>The plugin has been reloaded!";
     public String reloadError = "<red>Something went wrong while reloading the " +
                                 "configuration! Check the console for more information.";
-
     public MessageHolder() {
         super(new File(ADDON_DIRECTORY, "messages.yml"));
     }
 
+    public static void init() {
+        instance = DynamicMessage.get()
+                .create(MessageHolder.class);
+    }
+
+    public static void clear() {
+//        DynamicMessage.get().unload(MessageHolder.class);
+//        instance = null;
+    }
+
+    public static MessageHolder get() {
+        return instance;
+    }
+
     private String command(final String command) {
         return "<hover:show_text:'<yellow>Click to run " +
                "%command%'><click:run_command:'%command%'><gold>%command%".replace(

src/main/java/io/tofpu/bedwarsswapaddon/model/command/CommandHandler.java → src/main/java/io/tofpu/bedwarsswapaddon/command/CommandHandler.java

@@ -1,7 +1,7 @@
-package io.tofpu.bedwarsswapaddon.model.command;
+package io.tofpu.bedwarsswapaddon.command;
 
-import io.tofpu.bedwarsswapaddon.model.meta.adventure.AdventureHolder;
-import io.tofpu.bedwarsswapaddon.model.reload.ReloadHandlerBase;
+import io.tofpu.bedwarsswapaddon.message.MessageServiceHolder;
+import io.tofpu.bedwarsswapaddon.reload.ReloadHandlerBase;
 import org.bukkit.plugin.Plugin;
 import revxrsal.commands.bukkit.BukkitCommandHandler;
 import revxrsal.commands.bukkit.core.BukkitActor;
@@ -24,7 +24,7 @@ public void create(final Plugin plugin, final ReloadHandlerBase reloadHandler) {
 
             final BukkitActor bukkitActor = (BukkitActor) actor;
 
-            AdventureHolder.get()
+            MessageServiceHolder.get()
                     .message(bukkitActor.getSender(), response);
         });
 

src/main/java/io/tofpu/bedwarsswapaddon/model/command/CommandHandlerBase.java → src/main/java/io/tofpu/bedwarsswapaddon/command/CommandHandlerBase.java

@@ -1,13 +1,13 @@
-package io.tofpu.bedwarsswapaddon.model.command;
+package io.tofpu.bedwarsswapaddon.command;
 
-import io.tofpu.bedwarsswapaddon.model.reload.ReloadHandlerBase;
+import io.tofpu.bedwarsswapaddon.reload.ReloadHandlerBase;
 import org.bukkit.plugin.Plugin;
 
 public abstract class CommandHandlerBase {
     /**
      * This method registers the command.
      *
-     * @param plugin The plugin instance
+     * @param plugin        The plugin instance
      * @param reloadHandler The reload handler
      */
     public abstract void create(final Plugin plugin, final ReloadHandlerBase reloadHandler);

src/main/java/io/tofpu/bedwarsswapaddon/model/command/CommandHolder.java → src/main/java/io/tofpu/bedwarsswapaddon/command/CommandHolder.java

@@ -1,12 +1,12 @@
-package io.tofpu.bedwarsswapaddon.model.command;
+package io.tofpu.bedwarsswapaddon.command;
 
-import io.tofpu.bedwarsswapaddon.model.meta.adventure.AdventureHolder;
-import io.tofpu.bedwarsswapaddon.model.command.presenter.HelpPresenterHolder;
-import io.tofpu.bedwarsswapaddon.model.configuration.ConfigurationHolder;
-import io.tofpu.bedwarsswapaddon.model.configuration.handler.ConfigurationHandler;
-import io.tofpu.bedwarsswapaddon.model.meta.log.LogHandler;
-import io.tofpu.bedwarsswapaddon.model.meta.message.MessageHolder;
-import io.tofpu.bedwarsswapaddon.model.reload.ReloadHandlerBase;
+import io.tofpu.bedwarsswapaddon.LogHandler;
+import io.tofpu.bedwarsswapaddon.MessageHolder;
+import io.tofpu.bedwarsswapaddon.command.presenter.HelpPresenterHolder;
+import io.tofpu.bedwarsswapaddon.configuration.ConfigurationHolder;
+import io.tofpu.bedwarsswapaddon.configuration.handler.ConfigurationHandler;
+import io.tofpu.bedwarsswapaddon.message.MessageServiceHolder;
+import io.tofpu.bedwarsswapaddon.reload.ReloadHandlerBase;
 import org.bukkit.entity.Player;
 import revxrsal.commands.annotation.Command;
 import revxrsal.commands.annotation.Default;
@@ -47,7 +47,7 @@ public String reload(final Player player) {
                         if (error.getMessage() != null) {
                             player.sendMessage(error.getMessage());
                         }
-                        AdventureHolder.get()
+                        MessageServiceHolder.get()
                                 .message(player, MessageHolder.get().reloadError);
 
                         error.printStackTrace();
@@ -72,7 +72,7 @@ public String reload(final Player player) {
                                         settings.getMaximumInterval()));
                     }
 
-                    AdventureHolder.get()
+                    MessageServiceHolder.get()
                             .message(player, MessageHolder.get().reload);
                 });
         return MessageHolder.get().awaitReload;