Merge pull request #38 from RagingTech/dev

Author: EarthCow

README.md

@@ -65,6 +65,7 @@ Buit-in placeholders are described below. As mentioned before, PlaceholderAPI pl
 |networkjoinmessages.spoof|Allows the use of the `/njoinspoof` command. The command will display a fake join/leave/swap message, based on the arguments given.|
 |networkjoinmessages.reload|Allows you to reload the configuration file with the `/njoinreload` command.|
 |networkjoinmessages.toggle|Allows the usage of the `/njointoggle` command, that lets users choose not to receive certain messages just for them.|
+|networkjoinmessages.toggle.others|Allows using the `/njointoggle` command against other players.|
 |networkjoinmessages.import|Allows importing users from backend servers' usercache.json files with the `/njoinimport` command.|
 
 ## Commands
@@ -75,7 +76,7 @@ Required arguments are enclosed with angle brackets (i.e. <this\>) and optional
 |---|---|
 |/njoinspoof <join \| leave \| swap \| toggle\> [<from\> <to\>\]|Displays a fake message using the issuer as the trigger player.|
 |/njoinreload|Reloads the configuration.|
-|/njointoggle <all \| join \| leave \| swap\> <on \| off\>|Toggles the issuers receiving of specific messages.|
+|/njointoggle <all \| join \| leave \| swap\> <on \| off\> [player\]|Toggles the issuer's or target player's receiving of specific messages. The `[player]` argument is required when running from console.|
 |/njoinimport <pathtousercache.json\> [pathtousercache.json...\]|Imports user's from backend servers' usercache.json files into the joined database so that they will not trigger first join messages. Useful for adding this plugin and using first join messages on an already running network.|
 
 ## Contributing

build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     `java`
-    `maven-publish`
     // Shade plugin
     id("com.gradleup.shadow") version "8.3.8"
     // Blossom plugin for Pebble templating
@@ -12,6 +11,14 @@ group = property("group") as String
 version = property("version") as String
 description = property("description") as String
 
+// Dependency versions
+val lombokVersion = "1.18.42"
+val bstatsVersion = "3.0.2"
+val adventureVersion = "4.24.0"
+val gsonVersion = "2.13.2"
+val h2Version = "2.2.224"
+val velocityVersion = "3.4.0-SNAPSHOT"
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(21))
@@ -28,50 +35,45 @@ repositories {
     maven("https://jitpack.io")
     // William278
     maven("https://repo.william278.net/releases/")
-    // Elytrium
-    maven("https://maven.elytrium.net/repo/")
+    // Elytrium: local jar used as maven repo is down
+    flatDir { dirs("libs") }
     // SayanDevelopment
-    // Invalid SSL certificate local jar file utilized for the time being
-    flatDir {
-        dirs("libs")
+    maven("https://repo.sayandev.org/snapshots") {
         content {
             includeGroup("org.sayandev")
         }
     }
-//    maven("https://repo.sayandev.org/snapshots") {
-//        content {
-//            includeGroup("org.sayandev")
-//        }
-//    }
 }
 
 dependencies {
     // Proxy APIs
     compileOnly("net.md-5:bungeecord-api:1.21-R0.2")
-    compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
-    annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
-    compileOnly("com.velocitypowered:velocity-proxy:3.4.0-SNAPSHOT") {
+    compileOnly("com.velocitypowered:velocity-api:$velocityVersion")
+    annotationProcessor("com.velocitypowered:velocity-api:$velocityVersion")
+    compileOnly("com.velocitypowered:velocity-proxy:$velocityVersion") {
         exclude(group = "com.velocitypowered", module = "velocity-proxy-log4j2-plugin")
     }
 
+    // JDBC drivers
+    implementation("com.h2database:h2:${h2Version}")
+
     // bStats
-    implementation("org.bstats:bstats-bungeecord:3.0.2")
-    implementation("org.bstats:bstats-velocity:3.0.2")
+    implementation("org.bstats:bstats-bungeecord:$bstatsVersion")
+    implementation("org.bstats:bstats-velocity:$bstatsVersion")
 
     // Utilities
-    compileOnly("org.projectlombok:lombok:1.18.42")
-    annotationProcessor("org.projectlombok:lombok:1.18.42")
-    testCompileOnly("org.projectlombok:lombok:1.18.42")
-    testAnnotationProcessor("org.projectlombok:lombok:1.18.42")
+    compileOnly("org.projectlombok:lombok:$lombokVersion")
+    annotationProcessor("org.projectlombok:lombok:$lombokVersion")
+    testCompileOnly("org.projectlombok:lombok:$lombokVersion")
+    testAnnotationProcessor("org.projectlombok:lombok:$lombokVersion")
 
-    implementation("com.google.code.gson:gson:2.13.2")
+    implementation("com.google.code.gson:gson:$gsonVersion")
     implementation("org.jetbrains:annotations:16.0.1")
-    implementation("com.h2database:h2:2.2.224")
 
     // Adventure & MiniMessage
     implementation("net.kyori:adventure-platform-bungeecord:4.4.1")
-    implementation("net.kyori:adventure-text-minimessage:4.24.0")
-    implementation("net.kyori:adventure-text-serializer-plain:4.24.0")
+    implementation("net.kyori:adventure-text-minimessage:$adventureVersion")
+    implementation("net.kyori:adventure-text-serializer-plain:$adventureVersion")
 
     // MiniPlaceholders
     compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.0.1")
@@ -98,12 +100,8 @@ dependencies {
     testImplementation("org.mockito:mockito-core:5.19.0")
     testImplementation("org.mockito:mockito-junit-jupiter:5.19.0")
 
-    testImplementation("com.google.code.gson:gson:2.13.2")
-    testImplementation("org.jetbrains:annotations:16.0.1")
-    testImplementation("com.h2database:h2:2.2.224")
-
     testImplementation("net.luckperms:api:5.4")
-    testImplementation("net.kyori:adventure-text-serializer-plain:4.24.0")
+    testImplementation("net.kyori:adventure-text-serializer-plain:$adventureVersion")
     testImplementation("io.github.miniplaceholders:miniplaceholders-api:3.0.1")
 }
 
@@ -117,7 +115,8 @@ sourceSets {
     }
 }
 
-configurations.all {
+// Exclude legacy JUnit 4 from test runtime only
+configurations.testRuntimeClasspath {
     exclude(group = "junit", module = "junit")
 }
 
@@ -144,10 +143,6 @@ tasks.shadowJar {
     archiveClassifier.set("")
     relocate("org.bstats", "xyz.earthcow.networkjoinmessages.libs.bstats")
     relocate("dev.dejvokep.boostedyaml", "xyz.earthcow.networkjoinmessages.libs.boostedyaml")
-
-    dependencies {
-        exclude(dependency("io.github.miniplaceholders:miniplaceholders-api"))
-    }
 }
 
 tasks.build {

gradle.properties

@@ -1,6 +1,6 @@
 # Project metadata
 group=xyz.earthcow.networkjoinmessages
-version=3.4.0
+version=3.5.0
 description=A plugin handling join, leave and swap messages for proxy servers.
 
 # Plugin.yml metadata

libs/sayanvanish-api-1.7.0-SNAPSHOT.jar

@@ -1,33 +1,31 @@
 package xyz.earthcow.networkjoinmessages.bungee.abstraction;
 
 import net.md_5.bungee.api.config.ServerInfo;
+import org.jetbrains.annotations.NotNull;
 import xyz.earthcow.networkjoinmessages.bungee.BungeeMain;
 import xyz.earthcow.networkjoinmessages.common.abstraction.CoreBackendServer;
 import xyz.earthcow.networkjoinmessages.common.abstraction.CorePlayer;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class BungeeServer implements CoreBackendServer {
     private final ServerInfo bungeeServer;
 
-    public BungeeServer(ServerInfo bungeeServer) {
-        this.bungeeServer = bungeeServer;
+    public BungeeServer(@NotNull ServerInfo bungeeServer) {
+        this.bungeeServer = Objects.requireNonNull(bungeeServer, "bungeeServer must not be null");
     }
 
     @Override
     public String getName() {
-        if (bungeeServer == null) {
-            return null;
-        }
         return bungeeServer.getName();
     }
 
     @Override
     public List<CorePlayer> getPlayersConnected() {
-        if (bungeeServer == null) {
-            return null;
-        }
-        return bungeeServer.getPlayers().stream().map(proxiedPlayer -> BungeeMain.getInstance().getOrCreatePlayer(proxiedPlayer.getUniqueId())).collect(Collectors.toList());
+        return bungeeServer.getPlayers().stream()
+            .map(proxiedPlayer -> BungeeMain.getInstance().getOrCreatePlayer(proxiedPlayer.getUniqueId()))
+            .collect(Collectors.toList());
     }
 }

libs/velocity-proxy-3.4.0-SNAPSHOT.jar

@@ -4,63 +4,114 @@
 import org.bstats.charts.CustomChart;
 import xyz.earthcow.networkjoinmessages.common.abstraction.CorePlugin;
 import xyz.earthcow.networkjoinmessages.common.abstraction.PremiumVanish;
-import xyz.earthcow.networkjoinmessages.common.commands.CoreImportCommand;
-import xyz.earthcow.networkjoinmessages.common.commands.CoreReloadCommand;
-import xyz.earthcow.networkjoinmessages.common.commands.CoreSpoofCommand;
-import xyz.earthcow.networkjoinmessages.common.commands.CoreToggleJoinCommand;
+import xyz.earthcow.networkjoinmessages.common.broadcast.MessageFormatter;
+import xyz.earthcow.networkjoinmessages.common.broadcast.ReceiverResolver;
+import xyz.earthcow.networkjoinmessages.common.commands.*;
+import xyz.earthcow.networkjoinmessages.common.config.PluginConfig;
 import xyz.earthcow.networkjoinmessages.common.listeners.CorePlayerListener;
 import xyz.earthcow.networkjoinmessages.common.listeners.CorePremiumVanishListener;
 import xyz.earthcow.networkjoinmessages.common.modules.DiscordIntegration;
+import xyz.earthcow.networkjoinmessages.common.modules.DiscordWebhookBuilder;
 import xyz.earthcow.networkjoinmessages.common.modules.SayanVanishHook;
-import xyz.earthcow.networkjoinmessages.common.util.Formatter;
-import xyz.earthcow.networkjoinmessages.common.util.SpoofManager;
+import xyz.earthcow.networkjoinmessages.common.player.*;
+import xyz.earthcow.networkjoinmessages.common.storage.*;
+import xyz.earthcow.networkjoinmessages.common.util.*;
 
 import java.util.Collection;
 
+/**
+ * Composition root. Constructs and wires all plugin components together.
+ * The only class allowed to know about all components simultaneously.
+ */
 @Getter
 public class Core {
-    private final CorePlugin plugin;
 
+    private final CorePlugin plugin;
     private final Collection<CustomChart> customCharts;
 
     private final CorePlayerListener corePlayerListener;
     private final CoreImportCommand coreImportCommand;
     private final CoreSpoofCommand coreSpoofCommand;
     private final CoreReloadCommand coreReloadCommand;
     private final CoreToggleJoinCommand coreToggleJoinCommand;
-
     private final CorePremiumVanishListener corePremiumVanishListener;
 
     public Core(CorePlugin plugin, PremiumVanish premiumVanish) {
         this.plugin = plugin;
 
+        // Infrastructure
         ConfigManager configManager = new ConfigManager(plugin);
+        PluginConfig config = new PluginConfig(plugin, configManager);
 
-        SayanVanishHook sayanVanishHook;
+        // Optional third-party hooks
+        SayanVanishHook sayanVanishHook = null;
         if (plugin.isPluginLoaded("SayanVanish")) {
             sayanVanishHook = new SayanVanishHook();
             plugin.getCoreLogger().info("Successfully hooked into SayanVanish!");
-        } else {
-            sayanVanishHook = null;
         }
 
-        Storage storage = new Storage(plugin, configManager);
-        Formatter formatter = new Formatter(plugin, storage, storage.getPPBRequestTimeout());
-        MessageHandler messageHandler = new MessageHandler(plugin, storage, formatter, sayanVanishHook);
-        SpoofManager spoofManager = new SpoofManager(plugin, storage, messageHandler);
-        DiscordIntegration discordIntegration = new DiscordIntegration(plugin, storage, formatter, messageHandler, configManager.getDiscordConfig());
+        PlayerJoinTracker firstJoinTracker = null;
+        PlayerDataStore   playerDataStore  = null;
+
+        StorageType firstJoinType  = config.getFirstJoinStorageType();
+        StorageType playerDataType = config.getPlayerDataStorageType();
+
+        try {
+            ActiveStorageBackends backends = StorageInitializer.initialize(
+                firstJoinType,
+                playerDataType,
+                config.buildSqlConfig(),
+                plugin.getDataFolder().toPath(),
+                plugin.getCoreLogger());
+            firstJoinTracker = backends.joinTracker();
+            playerDataStore  = backends.playerDataStore();
+            plugin.getCoreLogger().info("Storage initialized — first-join: " + firstJoinType
+                + ", player-data: " + playerDataType + ".");
+        } catch (StorageInitializer.StorageInitializationException e) {
+            plugin.getCoreLogger().severe("Storage initialisation failed: " + e.getMessage()
+                + " — first-join tracking and persistent player data will be unavailable.");
+            plugin.getCoreLogger().debug("Exception: " + e);
+        }
+
+        // Core data / state
+        PlayerStateStore stateStore = new PlayerStateStore(plugin, config, playerDataStore);
+
+        // Placeholder resolution
+        PlaceholderResolver placeholderResolver = new PlaceholderResolver(plugin, config);
+
+        // Message building
+        MessageFormatter messageFormatter = new MessageFormatter(plugin, config, sayanVanishHook);
+        ReceiverResolver receiverResolver  = new ReceiverResolver(plugin, config);
+        MessageHandler   messageHandler    = new MessageHandler(plugin, config, stateStore, placeholderResolver, receiverResolver);
+
+        // Player event helpers
+        SilenceChecker         silenceChecker    = new SilenceChecker(plugin, config, stateStore, sayanVanishHook, premiumVanish);
+        LeaveMessageCache      leaveMessageCache = new LeaveMessageCache(plugin, config, messageFormatter, placeholderResolver);
+        LeaveJoinBufferManager leaveJoinBuffer   = new LeaveJoinBufferManager(plugin, config);
+
+        // Discord integration
+        DiscordWebhookBuilder  webhookBuilder      = new DiscordWebhookBuilder(plugin, configManager.getDiscordConfig());
+        DiscordIntegration     discordIntegration  = new DiscordIntegration(plugin, placeholderResolver, messageFormatter, webhookBuilder, configManager.getDiscordConfig());
 
-        this.customCharts = storage.getCustomCharts();
+        // Spoof
+        SpoofManager spoofManager = new SpoofManager(plugin, config, messageHandler, messageFormatter, placeholderResolver);
 
-        this.corePlayerListener = new CorePlayerListener(plugin, storage, messageHandler, sayanVanishHook, premiumVanish);
+        this.customCharts = config.getCustomCharts();
 
-        this.coreImportCommand = new CoreImportCommand(corePlayerListener.getPlayerJoinTracker());
-        this.coreSpoofCommand = new CoreSpoofCommand(storage, messageHandler, spoofManager);
-        this.coreReloadCommand = new CoreReloadCommand(plugin, configManager, storage, formatter, messageHandler, discordIntegration);
-        this.coreToggleJoinCommand = new CoreToggleJoinCommand(storage, messageHandler);
+        // Listeners
+        this.corePlayerListener = new CorePlayerListener(
+            plugin, config, stateStore, messageHandler, messageFormatter,
+            receiverResolver, silenceChecker, leaveMessageCache, leaveJoinBuffer,
+            placeholderResolver, firstJoinTracker
+        );
 
-        this.corePremiumVanishListener = premiumVanish == null ? null :
-                new CorePremiumVanishListener(plugin.getCoreLogger(), storage, spoofManager);
+        // Commands
+        this.coreImportCommand     = new CoreImportCommand(firstJoinTracker);
+        this.coreSpoofCommand      = new CoreSpoofCommand(config, stateStore, messageHandler, spoofManager);
+        this.coreReloadCommand     = new CoreReloadCommand(configManager, config, placeholderResolver, messageHandler, leaveMessageCache, discordIntegration);
+        this.coreToggleJoinCommand = new CoreToggleJoinCommand(config, stateStore, messageHandler, plugin, silenceChecker, playerDataStore);
 
+        this.corePremiumVanishListener = premiumVanish == null ? null
+            : new CorePremiumVanishListener(plugin.getCoreLogger(), config, spoofManager);
     }
-}
+}