fix some logic

bin/main/bungee.yml

@@ -0,0 +1,7 @@
+name: OriginBlacklist
+version: ${version}
+main: dev.colbster937.originblacklist.bungee.OriginBlacklistBungee
+description: ${description}
+author: Colbster937
+depends:
+  - EaglercraftXServer

bin/main/config.yml

@@ -0,0 +1,69 @@
+messages:
+  # Valid Placeholders:
+  #   - %blocked% - The player's origin/brand that was blocked
+  #   - %blocktype% - Shows what the player was blocked for
+  #   - %easyblocktype% - Shows what the player was blocked for in an eagler-kid readable form
+  #   - %host% - The IP the player pinged
+
+  kick: |
+    <red>This %easyblocktype% is not allowed on the server!</red>
+    <dark_gray>»</dark_gray> <gray>%blocked%</gray> <dark_gray>«</dark_gray>
+    
+    <gray>Think this is a mistake? Join our discord:</gray>
+    <blue>discord.gg/changethisintheconfig</blue>
+
+  motd:
+    enabled: true
+    text: |
+      <red>This %easyblocktype% is not allowed!</red>
+      <dark_gray>»</dark_gray> <gray>%blocked%</gray> <dark_gray>«</dark_gray>
+    icon: "blacklisted.png"
+
+# Origin + Brand blacklist supports wildcards
+# Everything should be lowercase
+blacklist:
+  origins:
+    - "hack.example.com"
+  brands:
+    - "*dragonx*"
+    - "*piclient*"
+  missing_origin: false
+  blacklist_redirect: ""
+
+discord:
+  webhook: ""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# :>

bin/main/plugin.yml

@@ -0,0 +1,9 @@
+name: OriginBlacklist
+version: ${version}
+main: dev.colbster937.originblacklist.bukkit.OriginBlacklistBukkit
+description: ${description}
+author: Colbster937
+depend:
+  - EaglercraftXServer
+commands:
+  originblacklist:

bin/main/velocity-plugin.json

@@ -0,0 +1,14 @@
+{
+  "id": "originblacklist",
+  "name": "OriginBlacklist",
+  "version": "${version}",
+  "description": "${description}",
+  "main": "dev.colbster937.originblacklist.velocity.OriginBlacklistVelocity",
+  "authors": ["Colbster937"],
+  "dependencies": [
+    {
+      "id": "eaglerxserver",
+      "optional": false
+    }
+  ]
+}

build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 
 group = 'dev.colbster937'
-version = '1.0.4'
+version = '1.0.5'
 description = 'A reimplementation of OriginBlacklist for EaglerXServer'
 def targetJavaVersion = 17
 
@@ -64,7 +64,7 @@ java {
 }
 
 processResources {
-    filesMatching(['plugin.yml', 'bungee.yml', 'velocity-plugin.json']) {
+    filesMatching(['plugin.yml', 'bungee.yml', 'velocity-plugin.json', 'Base.java']) {
         expand(
                 version: project.version,
                 description: project.description

src/main/java/dev/colbster937/originblacklist/base/Base.java

@@ -5,20 +5,21 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.lax1dude.eaglercraft.backend.server.api.*;
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftClientBrandEvent;
+import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
 import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.File;
+import java.io.*;
-import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 public class Base {
@@ -42,46 +43,51 @@ public class Base {
         for (int i = 0; i < Math.max(c.length, r.length); i++) {
             int c1 = i < c.length ? Integer.parseInt(c[i]) : 0;
             int r1 = i < r.length ? Integer.parseInt(r[i]) : 0;
-            if (c1 < r1) return false;
+            if (c1 < r1)
-            if (c1 > r1) return true;
+                return false;
+            if (c1 > r1)
+                return true;
         }
         return true;
     }
 
     public static LoggerAdapter getLogger() {
-        if (adapter == null) throw new IllegalStateException("Logger not initialized!");
+        if (adapter == null)
+            throw new IllegalStateException("Logger not initialized!");
         return adapter;
     }
 
     public interface LoggerAdapter {
         void info(String msg);
+
         void warn(String msg);
+
         void error(String msg);
     }
 
-    public static void handleConnection(IEaglercraftClientBrandEvent e) {
+    public static void handleConnection(IEaglercraftLoginEvent e) {
-        IEaglerPendingConnection conn = e.getPendingConnection();
+        IEaglerLoginConnection conn = e.getLoginConnection();
         String origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
         String brand = conn.getEaglerBrandString();
-        if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
+
+        if (origin != null && !origin.equals("null") && !config.blacklist.missing_origin) {
             for (String origin1 : config.blacklist.origins) {
                 if (matches(origin, origin1)) {
-                    setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
+                    setKick(e, kick("origin", "website", origin, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "origin");
                     return;
                 }
             }
-        } else {
+        } else if (origin != null && !origin.equals("null")) {
-            if (origin != "null" || origin != null) {
+            setKick(e, kick("origin", "website", origin, conn.getWebSocketHost()));
-                setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
             webhook(conn, "null", brand, "origin");
             return;
         }
-        }
+
-        if (brand != "null" && brand != null) {
+        if (brand != null && !brand.equals("null")) {
             for (String brand1 : config.blacklist.brands) {
                 if (matches(brand, brand1)) {
-                    setKickMessage(e, kick("brand", "client", brand, conn.getWebSocketHost()));
+                    setKick(e, kick("brand", "client", brand, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "brand");
                     return;
                 }
@@ -89,9 +95,15 @@ public class Base {
         }
     }
 
-    public static void setKickMessage(IEaglercraftClientBrandEvent e, Component msg) {
+    public static void setKick(IEaglercraftLoginEvent e, Component msg) {
         try {
+            String redir = config.blacklist.blacklist_redirect;
+            if (redir.equals("") || redir.equals("null")) {
                 e.setKickMessage(msg);
+            } else {
+                e.setKickRedirect(redir);
+            }
+            getLogger().info("Kicked " + e.getProfileUsername());
         } catch (Throwable ignored) {
             String msg1 = LegacyComponentSerializer.legacySection().serialize(msg);
             e.setKickMessage(msg1);
@@ -109,37 +121,36 @@ public class Base {
                             .replaceAll("%blocked%", origin)
                             .replaceAll("%host%", conn.getWebSocketHost()))
                     .map(line -> LegacyComponentSerializer.legacySection().serialize(
-                        MiniMessage.miniMessage().deserialize(
+                            MiniMessage.miniMessage().deserialize(line)))
-                            line
+                    .collect(Collectors.toList());
-                        )
+
-                    )).collect(Collectors.toList());
+            if (origin != null && !origin.equals("null") && !config.blacklist.missing_origin) {
-            if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
                 for (String origin1 : config.blacklist.origins) {
                     if (matches(origin, origin1)) {
                         setMOTD(conn, m);
                         return;
                     }
                 }
-            } else {
+            } else if (origin != null && !origin.equals("null")) {
-                if (origin != "null" || origin != null) {
                 setMOTD(conn, m);
             }
         }
     }
-    }
 
     public static void setMOTD(IMOTDConnection conn, List<String> m) {
         conn.setServerMOTD(m);
         conn.setPlayerTotal(0);
         conn.setPlayerMax(0);
         conn.setPlayerList(List.of());
-        if (config.messages.motd.icon != null && !config.messages.motd.icon.isEmpty())
+
+        if (config.messages.motd.icon != null && !config.messages.motd.icon.isEmpty()) {
             try {
                 BufferedImage img = ImageIO.read(new File(config.messages.motd.icon));
                 if (img.getWidth() != 64 || img.getHeight() != 64) {
                     getLogger().warn("Icon must be 64x64");
                     return;
                 }
+
                 byte[] bytes = new byte[64 * 64 * 4];
                 for (int y = 0; y < 64; y++) {
                     for (int x = 0; x < 64; x++) {
@@ -156,6 +167,7 @@ public class Base {
                 getLogger().error(ex.toString());
             }
         }
+    }
 
     public static boolean matches(String text1, String text2) {
         return text1.toLowerCase().matches(text2.replace(".", "\\.").replaceAll("\\*", ".*").toLowerCase());
@@ -167,34 +179,36 @@ public class Base {
                         .replaceAll("%blocktype%", type)
                         .replaceAll("%easyblocktype%", easytype)
                         .replaceAll("%blocked%", value)
-                .replaceAll("%host%", host)
+                        .replaceAll("%host%", host));
-        );
     }
 
-    public static void webhook(IEaglerPendingConnection plr, String origin, String brand, String type) {
+    public static void webhook(IEaglerLoginConnection plr, String origin, String brand, String type) {
         String webhook = config.discord.webhook;
-        if (webhook == null || webhook.isBlank()) return;
+        if (webhook == null || webhook.isBlank())
+            return;
 
-        String addr = plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined";
+        CompletableFuture.runAsync(() -> {
-        String protocol = plr.isEaglerXRewindPlayer()
+            String addr = (plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined:undefined").split(":")[0];
-            ? (String.valueOf(plr.getRewindProtocolVersion()) != null ? String.valueOf(plr.getRewindProtocolVersion()) : "undefined")
+            int protocol = !plr.isEaglerXRewindPlayer() ? plr.getMinecraftProtocol() : plr.getRewindProtocolVersion();
-            : (String.valueOf(plr.getMinecraftProtocol()) != null ? String.valueOf(plr.getMinecraftProtocol()) : "undefined");
-        String rewind = plr.isEaglerXRewindPlayer() ? "Yes" : "No";
             String host = plr.getWebSocketHost();
             String userAgent = plr.getWebSocketHeader(EnumWebSocketHeader.HEADER_USER_AGENT);
-        if (userAgent == null || userAgent.isEmpty()) userAgent = "undefined";
+            Boolean rewind = plr.isEaglerXRewindPlayer();
+            if (userAgent == null || userAgent.isEmpty())
+                userAgent = "undefined";
 
-        String payload = String.format("""
+            String payload = String.format(
+                    """
                             {
                               "content": "Blocked a blacklisted %s from joining",
                               "embeds": [
                                 {
                                   "title": "Player Information",
-              "description": "🎮 **Name:** %s\\n🏠 **Address:** %s\\n🌄 **PVN:** %s\\n🌐 **Origin:** %s\\n🔋 **Brand:** %s\\n🪑 **Host:** %s\\n🧊 **User Agent:** %s\\n⏪ **Rewind:** %s"
+                                  "description": "🎮 **Name:** %s\\n🏠 **IP:** %s\\n🌄 **PVN:** %s\\n🌐 **Origin:** %s\\n🔋 **Brand:** %s\\n🪑 **Host:** %s\\n🧊 **User Agent:** %s\\n⏪ **Rewind:** %s"
                                 }
                               ]
                             }
-        """, type, plr.getAuthUsername(), addr, protocol, origin, brand, host, userAgent, rewind);
+                            """,
+                    type, plr.getUsername(), addr, protocol, origin, brand, plr.isWebSocketSecure() ? "wss://" : "ws://" + host, userAgent, rewind ? "Yes" : "No");
 
             try {
                 HttpURLConnection conn = (HttpURLConnection) new URL(webhook).openConnection();
@@ -212,6 +226,7 @@ public class Base {
             } catch (Exception e) {
                 getLogger().warn("Failed to send webhook: " + e);
             }
+        });
     }
 
     public static void init() {

src/main/java/dev/colbster937/originblacklist/base/ConfigManager.java

@@ -3,47 +3,73 @@ package dev.colbster937.originblacklist.base;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.constructor.Constructor;
-import java.io.File;
+import org.yaml.snakeyaml.DumperOptions;
-import java.io.InputStream;
+import java.io.*;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.List;
+import java.util.Map;
 
 public class ConfigManager {
     public Messages messages = new Messages();
-    public List<String> subscriptions;
+    public List<String> subscriptions = List.of();
     public Blacklist blacklist = new Blacklist();
     public Discord discord = new Discord();
 
     public static ConfigManager loadConfig(Base.LoggerAdapter logger) {
-        File conf = new File("plugins/originblacklist/config.yml");
+        File f = new File("plugins/originblacklist/config.yml");
 
         try {
-            if (!conf.exists()) {
+            if (!f.exists()) {
-                conf.getParentFile().mkdirs();
+                f.getParentFile().mkdirs();
                 try (InputStream in = ConfigManager.class.getResourceAsStream("/config.yml")) {
-                    if (in != null) {
+                    if (in != null) Files.copy(in, f.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                        Files.copy(in, conf.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                    }
                 }
             }
 
-            LoaderOptions options = new LoaderOptions();
+            Yaml y = new Yaml(new Constructor(ConfigManager.class, new LoaderOptions()));
-            Constructor constructor = new Constructor(ConfigManager.class, options);
+            ConfigManager l;
-            Yaml yaml = new Yaml(constructor);
+            try (InputStream in = new FileInputStream(f)) { l = y.load(in); }
-            return yaml.load(new FileInputStream(conf));
+
+            if (l == null) l = new ConfigManager();
+
+            Yaml raw = new Yaml();
+            Map<String, Object> u = raw.load(new FileInputStream(f));
+            Map<String, Object> d = raw.load(ConfigManager.class.getResourceAsStream("/config.yml"));
+            if (mergeConfig(u, d)) saveConfig(u, f);
+
+            return l;
         } catch (IOException e) {
             return new ConfigManager();
         }
     }
 
+    @SuppressWarnings("unchecked")
+    private static boolean mergeConfig(Map<String, Object> u, Map<String, Object> d) {
+        boolean c = false;
+        for (String k : d.keySet()) {
+            if (!u.containsKey(k)) {
+                u.put(k, d.get(k));
+                c = true;
+            } else if (u.get(k) instanceof Map && d.get(k) instanceof Map)
+                c |= mergeConfig((Map<String, Object>) u.get(k), (Map<String, Object>) d.get(k));
+        }
+        return c;
+    }
+
+    private static void saveConfig(Map<String, Object> m, File f) throws IOException {
+        DumperOptions o = new DumperOptions();
+        o.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        o.setPrettyFlow(true);
+        new Yaml(o).dump(m, new FileWriter(f));
+    }
+
     public static class Blacklist {
         public List<String> origins;
         public List<String> brands;
         public List<String> players;
         public boolean missing_origin;
+        public String blacklist_redirect;
     }
 
     public static class Discord {

src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java

@@ -2,7 +2,7 @@ package dev.colbster937.originblacklist.bukkit;
 
 import dev.colbster937.originblacklist.base.Base;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftClientBrandEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -42,7 +42,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftClientBrandEvent event) {
+    public void onLogin(EaglercraftLoginEvent event) {
         Base.handleConnection(event);
     }
 

src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java

@@ -2,7 +2,7 @@ package dev.colbster937.originblacklist.bungee;
 
 import dev.colbster937.originblacklist.base.Base;
 import net.lax1dude.eaglercraft.backend.server.api.bungee.EaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftClientBrandEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftMOTDEvent;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.Listener;
@@ -41,7 +41,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftClientBrandEvent event) {
+    public void onLogin(EaglercraftLoginEvent event) {
         Base.handleConnection(event);
     }
 

src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java

@@ -6,7 +6,7 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.proxy.ProxyServer;
 import dev.colbster937.originblacklist.base.Base;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.EaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftClientBrandEvent;
+import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent;
 import org.slf4j.Logger;
 
@@ -44,7 +44,7 @@ public class OriginBlacklistVelocity {
     }
 
     @Subscribe
-    public void onLogin(EaglercraftClientBrandEvent event) {
+    public void onLogin(EaglercraftLoginEvent event) {
         Base.handleConnection(event);
     }
 

src/main/resources/config.yml

@@ -28,6 +28,7 @@ blacklist:
     - "*dragonx*"
     - "*piclient*"
   missing_origin: false
+  blacklist_redirect: ""
 
 discord:
   webhook: ""
@@ -63,7 +64,6 @@ discord:
 
 
 
-
 
 
 # :>