remove temp files

.github/workflows/build.yml

@@ -0,0 +1,76 @@
+name: Build Plugin
+
+on:
+  push:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    if: ${{ github.ref == 'refs/heads/main' }}
+    concurrency:
+      group: ${{ github.workflow }}
+      cancel-in-progress: true
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Build Jar
+        run: |
+          gradle wrapper
+          ./gradlew shadowJar
+
+      - name: Publish Jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: OriginBlacklist
+          path: build/libs/OriginBlacklist.jar
+
+      - name: Extract Version
+        id: version
+        run: |
+          VERSION=$(grep "^version" build.gradle | head -n 1 | cut -d\' -f2)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Remove Existing Release
+        run: |
+          gh release delete v${{ steps.version.outputs.version }} -y || true
+          git push origin :refs/tags/v${{ steps.version.outputs.version }} || true
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ steps.version.outputs.version }}
+          name: ${{ steps.version.outputs.version }}
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./build/libs/OriginBlacklist.jar
+          asset_name: OriginBlacklist_${{ steps.version.outputs.version }}.jar
+          asset_content_type: application/java-archive
+
+      - uses: eregon/publish-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ steps.create_release.outputs.id }}

.gitignore

@@ -1,6 +1,7 @@
 **/.DS_Store
 .idea
 .gradle
+gradle
 build
 run
 gradlew

README.md

@@ -15,16 +15,18 @@ basically just a reimplementation of originblacklist but for eaglerxserver
   <br>_<sub><span style="color:gray">Bungee and Bukkit are should work, but have bugs.</span></sub>_
 - [x] Send blacklists to a discord webhook
 - [ ] Blacklist subscription URLs
+- [ ] Simple blacklist command
 - [ ] Blacklist -> Whitelist
 - [ ] IP blacklisting
+- [ ] Update system
 
 ### Download
-**[https://github.com/colbster937/originblacklist/releases](https://github.com/colbster937/originblacklist/releases)**
+**[https://github.com/colbster937/originblacklist/releases/latest/](https://github.com/colbster937/originblacklist/releases/latest/)**
 
 ### Building
 ```
 $ git clone https://github.com/colbster937/originblacklist.git
 $ cd originblacklist
 $ gradle wrapper
-$ ./gradle.<bat|sh> shadowJar
+$ ./gradlew shadowJar
 ```

build.gradle

@@ -8,7 +8,9 @@ plugins {
 
 
 group = 'dev.colbster937'
-version = '1.0.1'
+version = '1.0.4'
+description = 'A reimplementation of OriginBlacklist for EaglerXServer'
+def targetJavaVersion = 17
 
 repositories {
     mavenCentral()
@@ -47,47 +49,36 @@ dependencies {
     compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0")
     compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0")
     implementation("org.yaml:snakeyaml:2.2")
-    implementation("net.kyori:adventure-api:4.20.0")
     implementation("net.kyori:adventure-text-serializer-legacy:4.20.0")
     implementation("net.kyori:adventure-text-minimessage:4.20.0")
 }
 
 tasks {
     runVelocity {
-        // Configure the Velocity version for our task.
-        // This is the only required configuration besides applying the plugin.
-        // Your plugin's jar (or shadowJar if present) will be used automatically.
         velocityVersion("3.3.0-SNAPSHOT")
     }
 }
 
-def targetJavaVersion = 17
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
 }
 
+processResources {
+    filesMatching(['plugin.yml', 'bungee.yml', 'velocity-plugin.json']) {
+        expand(
+                version: project.version,
+                description: project.description
+        )
+    }
+}
+
 shadowJar {
     relocate 'org.yaml.snakeyaml', 'dev.colbster937.shaded.snakeyaml'
-    archiveClassifier.set('all')
+    archiveVersion.set('')
+    archiveClassifier.set('')
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
     options.release.set(targetJavaVersion)
-}
-
-/*def templateSource = file('src/main/templates')
-def templateDest = layout.buildDirectory.dir('generated/sources/templates')
-def generateTemplates = tasks.register('generateTemplates', Copy) { task ->
-    def props = ['version': project.version]
-    task.inputs.properties props
-
-    task.from templateSource
-    task.into templateDest
-    task.expand props
-}
-
-sourceSets.main.java.srcDir(generateTemplates.map { it.outputs })
-
-project.idea.project.settings.taskTriggers.afterSync generateTemplates
-project.eclipse.synchronizationTasks(generateTemplates)*/
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

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

@@ -1,11 +1,10 @@
 package dev.colbster937.originblacklist.base;
 
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.IEaglerPlayer;
-import net.lax1dude.eaglercraft.backend.server.api.EnumWebSocketHeader;
-import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftInitializePlayerEvent;
+import net.lax1dude.eaglercraft.backend.server.api.*;
+import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftClientBrandEvent;
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
 import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection;
 
@@ -35,6 +34,20 @@ public class Base {
         api = api1;
     }
 
+    public static String apiVer = "1.0.2";
+
+    public static boolean checkVer(String v1, String v2) {
+        String[] c = v1.split("\\.");
+        String[] r = v2.split("\\.");
+        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) return true;
+        }
+        return true;
+    }    
+
     public static LoggerAdapter getLogger() {
         if (adapter == null) throw new IllegalStateException("Logger not initialized!");
         return adapter;
@@ -46,45 +59,60 @@ public class Base {
         void error(String msg);
     }
 
-    public static void handleConnection(IEaglercraftInitializePlayerEvent e) {
-        IEaglerPlayer plr = e.getPlayer();
-        String origin = plr.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
-        String brand = plr.getEaglerBrandString();
+    public static void handleConnection(IEaglercraftClientBrandEvent e) {
+        IEaglerPendingConnection conn = e.getPendingConnection();
+        String origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
+        String brand = conn.getEaglerBrandString();
         if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
             for (String origin1 : config.blacklist.origins) {
                 if (matches(origin, origin1)) {
-                    plr.disconnect(kick("origin", "website", origin));
-                    webhook(plr, origin, brand, "origin");
+                    setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
+                    webhook(conn, origin, brand, "origin");
                     return;
                 }
             }
         } else {
-            plr.disconnect(kick("origin", "website", origin));
-            webhook(plr, "null", brand, "origin");
+            if (origin != "null" || origin != null) {
+                setKickMessage(e, kick("origin", "website", origin, conn.getWebSocketHost()));
+                webhook(conn, "null", brand, "origin");
+                return;
+            }
         }
         if (brand != "null" && brand != null) {
             for (String brand1 : config.blacklist.brands) {
                 if (matches(brand, brand1)) {
-                    plr.disconnect(kick("brand", "client", brand));
-                    webhook(plr, origin, brand, "brand");
+                    setKickMessage(e, kick("brand", "client", brand, conn.getWebSocketHost()));
+                    webhook(conn, origin, brand, "brand");
                     return;
                 }
             }
         }
     }
 
+    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))
-                    .map(line -> LegacyComponentSerializer.legacySection()
-                            .serialize(MiniMessage.miniMessage().deserialize(line)))
-                    .collect(Collectors.toList());
+                        .replaceAll("%blocktype%", "origin")
+                        .replaceAll("%easyblocktype%", "website")
+                        .replaceAll("%blocked%", origin)
+                        .replaceAll("%host%", conn.getWebSocketHost()))
+                    .map(line -> LegacyComponentSerializer.legacySection().serialize(
+                        MiniMessage.miniMessage().deserialize(
+                            line
+                        )
+                    )).collect(Collectors.toList());
             if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
                 for (String origin1 : config.blacklist.origins) {
                     if (matches(origin, origin1)) {
@@ -93,7 +121,9 @@ public class Base {
                     }
                 }
             } else {
-                setMOTD(conn, m);
+                if (origin != "null" || origin != null) {
+                    setMOTD(conn, m);
+                }
             }
         }
     }
@@ -131,27 +161,26 @@ public class Base {
         return text1.toLowerCase().matches(text2.replace(".", "\\.").replaceAll("\\*", ".*").toLowerCase());
     }
 
-    public static String kick(String type, String easytype, String value) {
-        return LegacyComponentSerializer.legacySection().serialize(
-                MiniMessage.miniMessage().deserialize(
-                        config.messages.kick
-                                .replace("%blocktype%", type)
-                                .replace("%easyblocktype%", easytype)
-                                .replace("%blocked%", value)
-                )
+    public static Component kick(String type, String easytype, String value, String host) {
+        return MiniMessage.miniMessage().deserialize(
+            config.messages.kick
+                .replaceAll("%blocktype%", type)
+                .replaceAll("%easyblocktype%", easytype)
+                .replaceAll("%blocked%", value)
+                .replaceAll("%host%", host)
         );
     }
 
-
-    public static void webhook(IEaglerPlayer plr, String origin, String brand, String type) {
+    public static void webhook(IEaglerPendingConnection plr, String origin, String brand, String type) {
         String webhook = config.discord.webhook;
         if (webhook == null || webhook.isBlank()) return;
 
         String addr = plr.getPlayerAddress() != null ? plr.getPlayerAddress().toString().substring(1) : "undefined";
         String protocol = plr.isEaglerXRewindPlayer()
-                ? (String.valueOf(plr.getRewindProtocolVersion()) != null ? String.valueOf(plr.getRewindProtocolVersion()) : "undefined")
-                : (String.valueOf(plr.getMinecraftProtocol()) != null ? String.valueOf(plr.getMinecraftProtocol()) : "undefined");
+            ? (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";
 
@@ -161,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.getUsername(), 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/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java

@@ -2,16 +2,29 @@ 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.EaglercraftInitializePlayerEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftClientBrandEvent;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.Plugin;
 
 public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable() {
+        Plugin plugin = getServer().getPluginManager().getPlugin("EaglercraftXServer");
+        if (plugin != null) {
+            String version = plugin.getDescription().getVersion();
+            if (!Base.checkVer(version, Base.apiVer)) {
+                getLogger().severe("EaglerXServer " + Base.apiVer + " is required!");
+                throw new RuntimeException("Incompatible API version");
+            }
+        } else {
+            throw new RuntimeException("Missing EaglerXServer");
+        }
+
+
         Base.setLogger(new Base.LoggerAdapter() {
             @Override public void info(String msg)  { getLogger().info(msg); }
             @Override public void warn(String msg)  { getLogger().warning(msg); }
@@ -29,7 +42,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftInitializePlayerEvent event) {
+    public void onLogin(EaglercraftClientBrandEvent 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.EaglercraftInitializePlayerEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftClientBrandEvent;
 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;
@@ -12,6 +12,18 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
 
     @Override
     public void onEnable() {
+        Plugin plugin = getProxy().getPluginManager().getPlugin("EaglercraftXServer");
+        if (plugin != null) {
+            String version = plugin.getDescription().getVersion();
+            if (!Base.checkVer(version, Base.apiVer)) {
+                getLogger().severe("EaglerXServer " + Base.apiVer + " is required!");
+                throw new RuntimeException("Incompatible API version");
+            }
+        } else {
+            throw new RuntimeException("Missing EaglerXServer");
+        }
+
+
         Base.setLogger(new Base.LoggerAdapter() {
             @Override public void info(String msg)  { getLogger().info(msg); }
             @Override public void warn(String msg)  { getLogger().warning(msg); }
@@ -29,7 +41,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftInitializePlayerEvent event) {
+    public void onLogin(EaglercraftClientBrandEvent event) {
         Base.handleConnection(event);
     }
 

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

@@ -3,24 +3,13 @@ package dev.colbster937.originblacklist.velocity;
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.plugin.Plugin;
-import com.velocitypowered.api.plugin.Dependency;
 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.EaglercraftInitializePlayerEvent;
-import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
+import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftClientBrandEvent;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent;
 import org.slf4j.Logger;
 
-@Plugin(
-        id = "originblacklist",
-        name = "OriginBlacklist",
-        version = "1.0.1",
-        authors = {"Colbster937"},
-        description = "A reimplementation of OriginBlacklist for EaglerXServer",
-        dependencies = {@Dependency(id = "eaglerxserver")}
-)
 public class OriginBlacklistVelocity {
 
     private final ProxyServer proxy;
@@ -39,6 +28,14 @@ public class OriginBlacklistVelocity {
 
     @Subscribe
     public void onProxyInitialization(ProxyInitializeEvent event) {
+        proxy.getPluginManager().getPlugin("eaglerxserver").ifPresentOrElse(plugin -> {
+            if (!Base.checkVer(plugin.getDescription().getVersion().orElse("1.0.0"), Base.apiVer)) {
+                logger.error("EaglerXServer " + Base.apiVer + " is required!");
+                throw new RuntimeException("Incompatible api version");
+            }
+        }, () -> {
+            throw new RuntimeException("Missing EaglerXServer");
+        });
         Base.setApi(EaglerXServerAPI.instance());
         Base.reloadConfig();
         Base.init();
@@ -47,12 +44,12 @@ public class OriginBlacklistVelocity {
     }
 
     @Subscribe
-    public void onLogin(EaglercraftInitializePlayerEvent event) {
+    public void onLogin(EaglercraftClientBrandEvent event) {
         Base.handleConnection(event);
     }
 
     @Subscribe
-    public void onMOTD(IEaglercraftMOTDEvent event) {
+    public void onMOTD(EaglercraftMOTDEvent event) {
         Base.handleMOTD(event);
     }
 }

src/main/resources/bungee.yml

@@ -1,7 +1,7 @@
 name: OriginBlacklist
-version: 1.0.1
+version: ${version}
 main: dev.colbster937.originblacklist.bungee.OriginBlacklistBungee
-description: A reimplementation of OriginBlacklist for EaglerXServer
+description: ${description}
 author: Colbster937
 depends:
   - EaglercraftXServer

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:
 
 
 
-
 
 
 # :>

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: OriginBlacklist
-version: 1.0.1
+version: ${version}
 main: dev.colbster937.originblacklist.bukkit.OriginBlacklistBukkit
-description: A reimplementation of OriginBlacklist for EaglerXServer
+description: ${description}
 author: Colbster937
 depend:
   - EaglercraftXServer

src/main/resources/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
+    }
+  ]
+}