Bundle built in modules with plugin

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
           distribution: 'adopt'
           cache: gradle
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew bundledJar
       - name: Publish to Maven Repository
         if: ${{ success() && github.repository == 'BattlePlugins/BattleArena' && github.ref_name == 'rewrite' }}
         run: ./gradlew publish

module/arena-restoration/build.gradle.kts

@@ -3,6 +3,5 @@ repositories {
 }
 
 dependencies {
-    compileOnlyApi(project(":plugin"))
     compileOnly(libs.worldedit)
 }

module/boundary-enforcer/build.gradle.kts

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnlyApi(project(":plugin"))
-}

module/build.gradle.kts

@@ -0,0 +1,14 @@
+subprojects {
+    dependencies {
+        compileOnlyApi(project(":plugin"))
+    }
+
+    tasks.jar {
+        from("src/main/java/resources") {
+            include("*")
+        }
+
+        archiveFileName.set("${project.name}.jar")
+        archiveClassifier.set("")
+    }
+}

module/classes/build.gradle.kts

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnlyApi(project(":plugin"))
-}

module/team-heads/build.gradle.kts

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnlyApi(project(":plugin"))
-}

module/tournaments/build.gradle.kts

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnlyApi(project(":plugin"))
-}

module/tournaments/src/main/java/org/battleplugins/arena/module/tournaments/Tournament.java

@@ -13,7 +13,7 @@
 import org.battleplugins.arena.options.Teams;
 import org.battleplugins.arena.team.ArenaTeam;
 import org.battleplugins.arena.util.IntRange;
-import org.battleplugins.arena.util.UnitUtil;
+import org.battleplugins.arena.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
@@ -211,7 +211,7 @@ public void onAdvance(List<Contestant> contestants) throws TournamentException {
             }, ticks);
 
             for (Player watchingPlayer : this.watchingPlayers) {
-                NEXT_ROUND_STARTING_IN.send(watchingPlayer, UnitUtil.toUnitString(watchingPlayer, advanceTime.toSeconds(), TimeUnit.SECONDS));
+                NEXT_ROUND_STARTING_IN.send(watchingPlayer, Util.toUnitString(advanceTime.toSeconds(), TimeUnit.SECONDS));
             }
         }
     }

module/vault-integration/build.gradle.kts

@@ -3,6 +3,5 @@ repositories {
 }
 
 dependencies {
-    compileOnlyApi(project(":plugin"))
     compileOnly("com.github.MilkBowl:VaultAPI:1.7")
 }

plugin/build.gradle.kts

@@ -22,6 +22,8 @@ java {
 
 tasks {
     runServer {
+        dependsOn("bundledJar")
+
         minecraftVersion("1.20.6")
 
         // Set Java 21 (1.20.6 requires Java 21)
@@ -39,6 +41,21 @@ tasks {
         archiveClassifier.set("")
     }
 
+    create<Jar>("bundledJar") {
+        dependsOn(jar)
+        from(sourceSets.main.get().output)
+
+        // Bundle in our modules
+        project(":module").subprojects.forEach {
+            from(it.tasks.jar) {
+                into("modules")
+            }
+        }
+
+        archiveFileName.set("BattleArena.jar")
+        archiveClassifier.set("")
+    }
+
     javadoc {
         (options as CoreJavadocOptions).addBooleanOption("Xdoclint:none", true)
     }

plugin/src/main/java/org/battleplugins/arena/BattleArena.java

@@ -26,6 +26,7 @@
 import org.battleplugins.arena.team.ArenaTeams;
 import org.battleplugins.arena.util.CommandInjector;
 import org.battleplugins.arena.util.LoggerHolder;
+import org.battleplugins.arena.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.Configuration;
@@ -88,6 +89,8 @@ public void onLoad() {
         this.arenasPath = dataFolder.resolve("arenas");
         Path modulesPath = dataFolder.resolve("modules");
 
+        Util.copyDirectories(this.getFile(), modulesPath, "modules");
+
         this.moduleLoader = new ArenaModuleLoader(this, this.getClassLoader(), modulesPath);
         try {
             this.moduleLoader.loadModules();
@@ -130,12 +133,7 @@ private void enable() {
         this.debugMode = this.config.isDebugMode();
 
         if (Files.notExists(this.arenasPath)) {
-            this.saveResource("arenas/arena.yml", false);
-            this.saveResource("arenas/battlegrounds.yml", false);
-            this.saveResource("arenas/colosseum.yml", false);
-            this.saveResource("arenas/deathmatch.yml", false);
-            this.saveResource("arenas/ffa.yml", false);
-            this.saveResource("arenas/skirmish.yml", false);
+            Util.copyDirectories(this.getFile(), this.arenasPath, "arenas");
         }
 
         Path dataFolder = this.getDataFolder().toPath();
@@ -166,9 +164,6 @@ private void enable() {
         // Enable modules
         this.moduleLoader.enableModules();
 
-        // Load messages
-        MessageLoader.load(dataFolder.resolve("messages.yml"));
-
         // Register base command
         PluginCommand command = this.getCommand("battlearena");
         if (command == null) {
@@ -220,6 +215,9 @@ public void onServerLoad(ServerLoadEvent event) {
     }
 
     private void postInitialize() {
+        // Load messages
+        MessageLoader.load(this.getDataFolder().toPath().resolve("messages.yml"));
+
         // Load all arenas
         this.loadArenas();
 

plugin/src/main/java/org/battleplugins/arena/command/BACommandExecutor.java

@@ -11,7 +11,7 @@
 import org.battleplugins.arena.messages.Messages;
 import org.battleplugins.arena.util.InventoryBackup;
 import org.battleplugins.arena.util.OptionSelector;
-import org.battleplugins.arena.util.UnitUtil;
+import org.battleplugins.arena.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -179,7 +179,7 @@ public void reload(Player player) {
         }
 
         long end = System.currentTimeMillis();
-        Messages.RELOAD_COMPLETE.send(player, UnitUtil.toUnitString(player, end - start, TimeUnit.MILLISECONDS));
+        Messages.RELOAD_COMPLETE.send(player, Util.toUnitString(end - start, TimeUnit.MILLISECONDS));
     }
 
     public void sendHeader(CommandSender sender) {

plugin/src/main/java/org/battleplugins/arena/competition/map/LiveCompetitionMap.java

@@ -12,7 +12,7 @@
 import org.battleplugins.arena.config.ParseException;
 import org.battleplugins.arena.config.PostProcessable;
 import org.battleplugins.arena.util.BlockUtil;
-import org.battleplugins.arena.util.FieldUtil;
+import org.battleplugins.arena.util.Util;
 import org.battleplugins.arena.util.VoidChunkGenerator;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -249,7 +249,7 @@ public final Competition<?> createDynamicCompetition(Arena arena) {
         LiveCompetitionMap copy = arena.getMapFactory().create(this.name, arena, this.type, worldName, this.bounds, this.spawns);
         // Copy additional fields for custom maps
         if (copy.getClass() != LiveCompetitionMap.class) {
-            FieldUtil.copyFields(this, copy);
+            Util.copyFields(this, copy);
         }
 
         copy.mapWorld = world;

plugin/src/main/java/org/battleplugins/arena/competition/phase/phases/CountdownPhase.java

@@ -7,7 +7,7 @@
 import org.battleplugins.arena.event.ArenaEventHandler;
 import org.battleplugins.arena.event.player.ArenaLeaveEvent;
 import org.battleplugins.arena.messages.Messages;
-import org.battleplugins.arena.util.UnitUtil;
+import org.battleplugins.arena.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
@@ -63,7 +63,7 @@ private void onCountdown() {
         if (this.countdown % 60 == 0 || this.countdown == 30 || this.countdown == 15 || this.countdown == 10 || this.countdown <= 5) {
             for (ArenaPlayer arenaPlayer : this.getCompetition().getPlayers()) {
                 Player player = arenaPlayer.getPlayer();
-                String timeToStart = UnitUtil.toUnitString(player, this.countdown, TimeUnit.SECONDS);
+                String timeToStart = Util.toUnitString(this.countdown, TimeUnit.SECONDS);
 
                 Messages.ARENA_STARTS_IN.send(player, this.competition.getArena().getName(), timeToStart);
 

plugin/src/main/java/org/battleplugins/arena/config/context/EventContextProvider.java

@@ -83,9 +83,9 @@ public Map<ArenaEventType<?>, List<EventAction>> provideInstance(@Nullable Path
 
                 EventActionType<?> actionType = EventActionType.get(root.value());
                 if (actionType == null) {
-                    throw new ParseException("Unrecognized event action detected (" + key + ") when loading configuration section " + configurationSection.getName())
+                    throw new ParseException("Unrecognized event action detected (" + root.value() + ") when loading configuration section " + configurationSection.getName())
                             .context("Section", configuration.getName())
-                            .context("Provided action", key)
+                            .context("Provided action", root.value())
                             .context("Valid events", EventActionType.values().stream().map(EventActionType::getName).toList().toString())
                             .cause(ParseException.Cause.INVALID_VALUE)
                             .type(EventActionType.class)

plugin/src/main/java/org/battleplugins/arena/event/action/types/BroadcastAction.java

@@ -50,7 +50,7 @@ public void postProcess(Arena arena, Competition<?> competition, Resolvable reso
         };
 
         for (Player player : players) {
-            Component component = MiniMessage.miniMessage().deserialize(resolvable.resolve().resolveToString(message));
+            Component component = resolvable.resolve().resolveToComponent(MiniMessage.miniMessage().deserialize(message));
             switch (messageType) {
                 case CHAT -> player.sendMessage(component);
                 case ACTION_BAR -> player.sendActionBar(component);

plugin/src/main/java/org/battleplugins/arena/event/action/types/SendMessageAction.java

@@ -25,7 +25,7 @@ public void call(ArenaPlayer arenaPlayer, Resolvable resolvable) {
                 .toUpperCase(Locale.ROOT)
         );
 
-        Component component = MiniMessage.miniMessage().deserialize(resolvable.resolve().resolveToString(message));
+        Component component = resolvable.resolve().resolveToComponent(MiniMessage.miniMessage().deserialize(message));
         switch (messageType) {
             case CHAT -> arenaPlayer.getPlayer().sendMessage(component);
             case ACTION_BAR -> arenaPlayer.getPlayer().sendActionBar(component);

plugin/src/main/java/org/battleplugins/arena/resolver/Resolver.java

@@ -1,9 +1,13 @@
 package org.battleplugins.arena.resolver;
 
+import net.kyori.adventure.text.Component;
+
 public interface Resolver {
 
     String resolveToString(String string);
 
+    Component resolveToComponent(Component component);
+
     <T> T resolve(ResolverKey<T> key);
 
     boolean has(ResolverKey<?> key);

plugin/src/main/java/org/battleplugins/arena/resolver/ResolverImpl.java

@@ -1,5 +1,7 @@
 package org.battleplugins.arena.resolver;
 
+import net.kyori.adventure.text.Component;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,6 +22,16 @@ public String resolveToString(String string) {
         return string;
     }
 
+    @Override
+    public Component resolveToComponent(Component component) {
+        for (Map.Entry<ResolverKey<?>, ResolverProvider<?>> entry : this.results.entrySet()) {
+            String key = "%" + entry.getKey().getName().replace("-", "_") + "%";
+            component = component.replaceText(builder -> builder.matchLiteral(key).replacement(entry.getValue().toComponent(this)));
+        }
+
+        return component;
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public <T> T resolve(ResolverKey<T> key) {