Claude/optimize paper server hbj la

build.gradle.kts

@@ -72,7 +72,7 @@ tasks {
     // 1.17           = Java 16
     // 1.18 - 1.20.4  = Java 17
     // 1-20.5+        = Java 21
-    val version = "1.21.8"
+    val version = "1.21.11"
     val javaVersion = JavaLanguageVersion.of(21)
 
     val jvmArgsExternal = listOf(
@@ -82,7 +82,7 @@ tasks {
     val sharedPlugins = runPaper.downloadPluginsSpec {
         url("https://github.com/ViaVersion/ViaVersion/releases/download/5.8.1/ViaVersion-5.8.1.jar")
         url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.8.1/ViaBackwards-5.8.1.jar")
-        url("https://ci.athion.net/job/FastAsyncWorldEdit/1214/artifact/artifacts/FastAsyncWorldEdit-Bukkit-2.14.1-SNAPSHOT-1214.jar") // Not folia compatible
+        url("https://ci.athion.net/job/FastAsyncWorldEdit/1214/artifact/artifacts/FastAsyncWorldEdit-Bukkit-2.14.1-SNAPSHOT-1214.jar")
     }
 
     runServer {
@@ -99,19 +99,4 @@ tasks {
 
         jvmArgs = jvmArgsExternal
     }
-
-    runPaper.folia.registerTask {
-        minecraftVersion(version)
-        runDirectory = rootDir.resolve("run/folia/$version")
-
-        javaLauncher = project.javaToolchains.launcherFor {
-            languageVersion = javaVersion
-        }
-
-        downloadPlugins {
-            from(sharedPlugins)
-        }
-
-        jvmArgs = jvmArgsExternal
-    }
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-paper-api = "1.21-R0.1-SNAPSHOT"
+paper-api = "1.21.11-R0.1-SNAPSHOT"
 lombok = "1.18.44"
 placeholderapi = "2.12.2"
 shadow = "9.4.1"

src/main/java/me/david/EventCore.java

@@ -12,8 +12,10 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Difficulty;
 import org.bukkit.GameRule;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,77 +27,99 @@ public class EventCore extends JavaPlugin {
 
     @Getter
     private static EventCore instance;
+
     private MapManager mapManager;
     private GameManager gameManager;
     private KitManager kitManager;
+    private UpdateChecker updateChecker;
 
     @Override
     public void onEnable() {
-        saveDefaultConfig();
         instance = this;
 
-        new UpdateChecker(instance, "DavidArchive", "EventCore").check();
+        saveDefaultConfig();
+        ConfigCache.reload();
+        BorderUtil.reload();
+
+        updateChecker = new UpdateChecker(this, "DavidArchive", "EventCore");
+        updateChecker.check();
 
         mapManager = new MapManager();
         gameManager = new GameManager();
         kitManager = new KitManager();
         EventCoreAPI.initialize(this);
 
-        new AnnouncementCommand(instance);
-        new EventCommand(instance);
-        new KitCommand(instance);
+        new AnnouncementCommand(this);
+        new EventCommand(this);
+        new KitCommand(this);
         new ReviveCommand();
-        new SpawnCommand(instance);
-
-        Bukkit.getPluginManager().registerEvents(new BlockBreakListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new BlockExplodeListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new BlockPlaceListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new CreatureSpawnListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new EntityDamageByEntityListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new EntityDamageListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new EntityExplodeListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerDeathListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerDropItemListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerInteractListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerJoinListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerPickupItemListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerQuitListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerRespawnListener(), instance);
-        Bukkit.getPluginManager().registerEvents(new PlayerTeleportListener(), instance);
-
-        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
+        new SpawnCommand(this);
+
+        final PluginManager pm = Bukkit.getPluginManager();
+        pm.registerEvents(new BlockBreakListener(), this);
+        pm.registerEvents(new BlockExplodeListener(), this);
+        pm.registerEvents(new BlockPlaceListener(), this);
+        pm.registerEvents(new CreatureSpawnListener(), this);
+        pm.registerEvents(new EntityDamageByEntityListener(), this);
+        pm.registerEvents(new EntityDamageListener(), this);
+        pm.registerEvents(new EntityExplodeListener(), this);
+        pm.registerEvents(new PlayerDeathListener(), this);
+        pm.registerEvents(new PlayerDropItemListener(), this);
+        pm.registerEvents(new PlayerInteractListener(), this);
+        pm.registerEvents(new PlayerJoinListener(), this);
+        pm.registerEvents(new PlayerPickupItemListener(), this);
+        pm.registerEvents(new PlayerQuitListener(), this);
+        pm.registerEvents(new PlayerRespawnListener(), this);
+        pm.registerEvents(new PlayerTeleportListener(), this);
+
+        if (pm.getPlugin("PlaceholderAPI") != null) {
             new PlaceholderHook().register();
         }
 
+        // Border check runs async every 10 ticks (0.5s) – negligible cost, and the
+        // actual world border mutation happens on the sync scheduler.
         Scheduler.timerAsync(new BorderUtil(), 20, 10);
-        Scheduler.timerAsync(new AutoBroadcast(), 20, 20 * getConfig().getLong("AutoBroadcast.Interval", 60));
-        Scheduler.wait(() -> {
-            World world = mapManager.getSpawnLocation().getWorld();
-            world.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
-            world.setDifficulty(Difficulty.PEACEFUL);
-            world.getWorldBorder().setSize(BorderUtil.borderDefault);
-            world.getWorldBorder().setDamageBuffer(BorderUtil.borderDamageBuffer);
-            world.getWorldBorder().setDamageAmount(BorderUtil.borderDamageAmount);
-        }, 2);
-
-        if (getConfig().getBoolean("Messages.Actionbar.Enabled")) {
-            Scheduler.timerAsync(() -> {
-                String raw = getConfig().getString("Messages.Actionbar.Message", "&aYou are playing the best Event!");
-                for (Player player : Bukkit.getOnlinePlayers()) {
-                    String parsed = PlaceholderAPI.setPlaceholders(player, raw);
-                    player.sendActionBar(MessageUtil.translateColorCodes(parsed));
-                }
-            }, 0, 20);
+
+        // AutoBroadcast period comes from the cached config value
+        Scheduler.timerAsync(new AutoBroadcast(), 20, 20L * ConfigCache.autoBroadcastInterval);
+
+        Scheduler.wait(this::applyWorldDefaults, 2);
+
+        if (ConfigCache.actionBarEnabled) {
+            Scheduler.timerAsync(this::tickActionBar, 0, 20);
         }
 
         new Metrics(this, 28277);
     }
 
     @Override
     public void onDisable() {
-        if (gameManager.isRunning()) {
+        if (gameManager != null && gameManager.isRunning()) {
             gameManager.stop(null);
         }
     }
 
+    @SuppressWarnings("removal") // GameRule.ANNOUNCE_ADVANCEMENTS is still the only API to toggle this
+    private void applyWorldDefaults() {
+        final Location spawn = mapManager.getSpawnLocation();
+        if (spawn == null) return;
+        final World world = spawn.getWorld();
+        if (world == null) return;
+
+        world.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
+        world.setDifficulty(Difficulty.PEACEFUL);
+        world.getWorldBorder().setSize(BorderUtil.borderDefault);
+        world.getWorldBorder().setDamageBuffer(BorderUtil.borderDamageBuffer);
+        world.getWorldBorder().setDamageAmount(BorderUtil.borderDamageAmount);
+    }
+
+    private void tickActionBar() {
+        final String raw = ConfigCache.actionBarMessage;
+        final boolean papiAvailable = ConfigCache.papiAvailable;
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            final String parsed = papiAvailable ? PlaceholderAPI.setPlaceholders(player, raw) : raw;
+            player.sendActionBar(MessageUtil.translateColorCodes(parsed));
+        }
+    }
+
 }

src/main/java/me/david/command/impl/AnnouncementCommand.java

@@ -2,6 +2,7 @@
 
 import me.david.EventCore;
 import me.david.command.BukkitCommand;
+import me.david.util.ConfigCache;
 import me.david.util.MessageUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.title.Title;
@@ -10,48 +11,50 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 public class AnnouncementCommand extends BukkitCommand {
 
-    private final EventCore plugin;
-
     public AnnouncementCommand(EventCore plugin) {
         super("annoucement", "event.command.annoucement", "announce");
-        this.plugin = plugin;
     }
 
     @Override
     public void onCommand(CommandSender sender, String label, String[] args) {
-        if (!(sender.hasPermission("event.command"))) return;
-
-        if (args.length >= 1) {
-            String message = String.join(" ", args);
-            var replacements = Map.of(
-                    "%prefix%", MessageUtil.getPrefix(),
-                    "%message%", MessageUtil.translateColorCodes(message)
-            );
-
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                player.sendMessage(MessageUtil.format("Messages.AnnoucementCommand.MessageFormat", replacements));
+        if (!sender.hasPermission("event.command")) return;
 
-                if (plugin.getConfig().getBoolean("Messages.AnnoucementCommand.Title.Enabled")) {
-                    Component titleComponent = MessageUtil.format("Messages.AnnoucementCommand.Title.Title", replacements);
-                    Component subTitleComponent = MessageUtil.format("Messages.AnnoucementCommand.Title.SubTitle", replacements);
+        if (args.length == 0) {
+            sender.sendMessage(MessageUtil.getPrefix().append(
+                    MessageUtil.translateColorCodes("Usage: §c/annoucement <message>")));
+            return;
+        }
 
-                    Title title = Title.title(titleComponent, subTitleComponent);
-                    player.showTitle(title);
-                }
+        final String message = String.join(" ", args);
+        final Map<String, Component> replacements = Map.of(
+                "%prefix%", MessageUtil.getPrefix(),
+                "%message%", MessageUtil.translateColorCodes(message)
+        );
+
+        final Component formatted = MessageUtil.format("Messages.AnnoucementCommand.MessageFormat", replacements);
+        final boolean titleEnabled = ConfigCache.announcementTitleEnabled;
+        final Title title = titleEnabled
+                ? Title.title(
+                    MessageUtil.format("Messages.AnnoucementCommand.Title.Title", replacements),
+                    MessageUtil.format("Messages.AnnoucementCommand.Title.SubTitle", replacements))
+                : null;
+
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            player.sendMessage(formatted);
+            if (title != null) {
+                player.showTitle(title);
             }
         }
-
-        sender.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("Usage: §c/annoucement <message>")));
     }
 
     @Override
     public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }

src/main/java/me/david/command/impl/EventCommand.java

@@ -3,8 +3,8 @@
 import me.david.EventCore;
 import me.david.command.BukkitCommand;
 import me.david.util.BorderUtil;
+import me.david.util.ConfigCache;
 import me.david.util.MessageUtil;
-import me.david.util.Scheduler;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -13,29 +13,30 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class EventCommand extends BukkitCommand {
 
+    private static final List<String> SUBCOMMANDS = List.of(
+            "start", "stop", "drop", "reset", "autoBorder",
+            "kickspec", "kickall", "clearall", "setSpawn", "reload"
+    );
+    private static final List<String> AUTO_BORDER_OPTIONS = List.of("on", "off");
+
     private final EventCore plugin;
 
     public EventCommand(EventCore plugin) {
         super("event", "event.command", "e");
         this.plugin = plugin;
     }
 
-    private String getSoftware() {
-        return Scheduler.isFOLIA() ? "Folia" : "PaperMC";
-    }
-
     @Override
     public void onCommand(CommandSender sender, String label, String[] args) {
         if (!(sender instanceof final Player player)) return;
 
         if (args.length == 0) {
             player.sendMessage(" ");
-            player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("§7Running §aEventCore §7v" + plugin.getPluginMeta().getVersion() + " §7on §a" + getSoftware())));
+            player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("§7Running §aEventCore §7v" + plugin.getPluginMeta().getVersion() + " §7on §aPaperMC")));
             player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("§7Download at §ahttps://github.com/VertrauterDavid")));
             player.sendMessage(" ");
         }
@@ -62,11 +63,17 @@ public void onCommand(CommandSender sender, String label, String[] args) {
             }
 
             if (args[0].equalsIgnoreCase("reload")) {
-                double currentMS = System.currentTimeMillis();
+                final long startNanos = System.nanoTime();
                 plugin.reloadConfig();
-                double reloadMS = System.currentTimeMillis() - currentMS;
-
-                player.sendMessage(MessageUtil.getPrefix().append(MessageUtil.translateColorCodes("§aYou successfully reloaded the config within %ms%ms!").replaceText(b -> b.matchLiteral("%ms%").replacement(Component.text(String.valueOf(reloadMS))))));
+                ConfigCache.reload();
+                BorderUtil.reload();
+                plugin.getKitManager().loadAllKits();
+                final double reloadMS = (System.nanoTime() - startNanos) / 1_000_000.0;
+
+                player.sendMessage(MessageUtil.getPrefix().append(
+                        MessageUtil.translateColorCodes("§aYou successfully reloaded the config within %ms%ms!")
+                                .replaceText(b -> b.matchLiteral("%ms%")
+                                        .replacement(Component.text(String.format("%.2f", reloadMS))))));
                 return;
             }
 
@@ -167,19 +174,18 @@ public List<String> onTabComplete(CommandSender sender, String label, String[] a
 
         if (args.length == 2) {
             if (args[0].equalsIgnoreCase("stop")) {
-                list.addAll(Bukkit.getOnlinePlayers().stream().map(Player::getName).toList());
-            }
-
-            if (args[0].equalsIgnoreCase("autoBorder")) {
-                list.addAll(Arrays.asList("on", "off"));
+                for (Player online : Bukkit.getOnlinePlayers()) {
+                    list.add(online.getName());
+                }
+            } else if (args[0].equalsIgnoreCase("autoBorder")) {
+                list.addAll(AUTO_BORDER_OPTIONS);
             }
+        } else if (args.length == 1) {
+            list.addAll(SUBCOMMANDS);
         }
 
-        if (args.length == 1) {
-            list.addAll(Arrays.asList("start", "stop", "drop", "reset", "autoBorder", "kickspec", "kickall", "clearall", "setSpawn", "reload"));
-        }
-
-        return list.stream().filter(content -> content.toLowerCase().startsWith(args[args.length - 1].toLowerCase())).sorted().toList();
+        final String prefix = args[args.length - 1].toLowerCase();
+        return list.stream().filter(content -> content.toLowerCase().startsWith(prefix)).sorted().toList();
     }
 
 }