use .replaceAll instead of .replace

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
+
+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
+    }
+  ]
+}

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

@@ -66,14 +66,14 @@ public class Base {
         if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
             for (String origin1 : config.blacklist.origins) {
                 if (matches(origin, origin1)) {
-                    setKickMessage(e, kick("origin", "website", origin));
+                    setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "origin");
                     return;
                 }
             }
         } else {
             if (origin != "null" || origin != null) {
-                setKickMessage(e, kick("origin", "website", origin));
+                setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
                 webhook(conn, "null", brand, "origin");
                 return;
             }
@@ -81,7 +81,7 @@ public class Base {
         if (brand != "null" && brand != null) {
             for (String brand1 : config.blacklist.brands) {
                 if (matches(brand, brand1)) {
-                    setKickMessage(e, kick("brand", "client", brand));
+                    setKickMessage(e, kick("brand", "client", brand, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "brand");
                     return;
                 }
@@ -104,9 +104,10 @@ public class Base {
             String origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
             List<String> m = List.of(config.messages.motd.text.split("\n")).stream()
                     .map(line -> line
-                        .replace("%blocktype%", "origin")
+                        .replaceAll("%blocktype%", "origin")
-                        .replace("%easyblocktype%", "website")
+                        .replaceAll("%easyblocktype%", "website")
-                        .replace("%blocked%", origin))
+                        .replaceAll("%blocked%", origin)
+                        .replaceAll("%host%", conn.getWebSocketHost()))
                     .map(line -> LegacyComponentSerializer.legacySection().serialize(
                         MiniMessage.miniMessage().deserialize(
                             line
@@ -160,12 +161,13 @@ public class Base {
         return text1.toLowerCase().matches(text2.replace(".", "\\.").replaceAll("\\*", ".*").toLowerCase());
     }
 
-    public static Component kick(String type, String easytype, String value) {
+    public static Component kick(String type, String easytype, String value, String host) {
         return MiniMessage.miniMessage().deserialize(
             config.messages.kick
-                .replace("%blocktype%", type)
+                .replaceAll("%blocktype%", type)
-                .replace("%easyblocktype%", easytype)
+                .replaceAll("%easyblocktype%", easytype)
-                .replace("%blocked%", value)
+                .replaceAll("%blocked%", value)
+                .replaceAll("%host%", host)
         );
     }
 
@@ -178,6 +180,7 @@ public class Base {
             ? (String.valueOf(plr.getRewindProtocolVersion()) != null ? String.valueOf(plr.getRewindProtocolVersion()) : "undefined")
             : (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";
 
@@ -187,11 +190,11 @@ public class Base {
           "embeds": [
             {
               "title": "Player Information",
-              "description": "🎮 **Name:** %s\\n🏠 **Address:** %s\\n🌄 **PVN:** %s\\n🌐 **Origin:** %s\\n🔋 **Brand:** %s\\n🧊 **User Agent:** %s\\n⏪ **Rewind:** %s"
+              "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"
             }
           ]
         }
-        """, type, plr.getAuthUsername(), addr, protocol, origin, brand, userAgent, rewind);
+        """, type, plr.getAuthUsername(), addr, protocol, origin, brand, host, userAgent, rewind);
 
         try {
             HttpURLConnection conn = (HttpURLConnection) new URL(webhook).openConnection();

src/main/resources/config.yml

@@ -3,6 +3,7 @@ messages:
   #   - %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>
@@ -63,7 +64,6 @@ discord:
 
 
 
-
 
 
 # :>