remove temp files

build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 
 group = 'dev.colbster937'
-version = '1.0.3'
+version = '1.0.4'
 description = 'A reimplementation of OriginBlacklist for EaglerXServer'
 def targetJavaVersion = 17
 

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)) {
-                    e.setKickMessage(kick("origin", "website", origin));
+                    setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "origin");
                     return;
                 }
             }
         } else {
             if (origin != "null" || origin != null) {
-                e.setKickMessage(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)) {
-                    e.setKickMessage(kick("brand", "client", brand));
+                    setKickMessage(e, kick("brand", "client", brand, conn.getWebSocketHost()));
                     webhook(conn, origin, brand, "brand");
                     return;
                 }
@@ -89,15 +89,25 @@ public class Base {
         }
     }
 
+    public static void setKickMessage(IEaglercraftClientBrandEvent e, Component msg) {
+        try {
+            e.setKickMessage(msg);
+        } catch (Throwable ignored) {
+            String msg1 = LegacyComponentSerializer.legacySection().serialize(msg);
+            e.setKickMessage(msg1);
+        }
+    }
+
     public static void handleMOTD(IEaglercraftMOTDEvent e) {
         if (config.messages.motd.enabled) {
             IMOTDConnection conn = e.getMOTDConnection();
             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")
-                            .replace("%easyblocktype%", "website")
-                            .replace("%blocked%", origin))
+                        .replaceAll("%blocktype%", "origin")
+                        .replaceAll("%easyblocktype%", "website")
+                        .replaceAll("%blocked%", origin)
+                        .replaceAll("%host%", conn.getWebSocketHost()))
                     .map(line -> LegacyComponentSerializer.legacySection().serialize(
                         MiniMessage.miniMessage().deserialize(
                             line
@@ -151,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)
-                        .replace("%easyblocktype%", easytype)
-                        .replace("%blocked%", value)
+                .replaceAll("%blocktype%", type)
+                .replaceAll("%easyblocktype%", easytype)
+                .replaceAll("%blocked%", value)
+                .replaceAll("%host%", host)
         );
     }
 
@@ -169,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";
 
@@ -178,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:
 
 
 
-
 
 
 # :>