.github/workflows/build.yml

@@ -1,76 +0,0 @@
-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,7 +1,6 @@
 **/.DS_Store
 .idea
 .gradle
-gradle
 build
 run
 gradlew

README.md

@@ -15,17 +15,16 @@ 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
 
 ### Download
-**[https://github.com/colbster937/originblacklist/releases/latest/](https://github.com/colbster937/originblacklist/releases/latest/)**
+**[https://github.com/colbster937/originblacklist/releases](https://github.com/colbster937/originblacklist/releases)**
 
 ### Building
 ```
 $ git clone https://github.com/colbster937/originblacklist.git
 $ cd originblacklist
 $ gradle wrapper
-$ ./gradlew shadowJar
+$ ./gradle.<bat|sh> shadowJar
 ```

build.gradle

@@ -8,9 +8,7 @@ plugins {
 
 
 group = 'dev.colbster937'
-version = '1.0.2'
+version = '1.0.1'
-description = 'A reimplementation of OriginBlacklist for EaglerXServer'
-def targetJavaVersion = 17
 
 repositories {
     mavenCentral()
@@ -49,36 +47,47 @@ 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'
-    archiveVersion.set('')
+    archiveClassifier.set('all')
-    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

@@ -0,0 +1,7 @@
+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,10 +1,11 @@
 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.*;
+import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
+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.event.IEaglercraftMOTDEvent;
 import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection;
 
@@ -45,30 +46,27 @@ public class Base {
         void error(String msg);
     }
 
-    public static void handleConnection(IEaglercraftLoginEvent e) {
+    public static void handleConnection(IEaglercraftInitializePlayerEvent e) {
-        IEaglerLoginConnection conn = e.getLoginConnection();
+        IEaglerPlayer plr = e.getPlayer();
-        String origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
+        String origin = plr.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
-        String brand = conn.getEaglerBrandString();
+        String brand = plr.getEaglerBrandString();
         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));
+                    plr.disconnect(kick("origin", "website", origin));
-                    webhook(conn, origin, brand, "origin");
+                    webhook(plr, origin, brand, "origin");
                     return;
                 }
             }
         } else {
-            if (origin != "null" || origin != null) {
+            plr.disconnect(kick("origin", "website", origin));
-                e.setKickMessage(kick("origin", "website", origin));
+            webhook(plr, "null", brand, "origin");
-                webhook(conn, "null", brand, "origin");
-                return;
-            }
         }
         if (brand != "null" && brand != null) {
             for (String brand1 : config.blacklist.brands) {
                 if (matches(brand, brand1)) {
-                    e.setKickMessage(kick("brand", "client", brand));
+                    plr.disconnect(kick("brand", "client", brand));
-                    webhook(conn, origin, brand, "brand");
+                    webhook(plr, origin, brand, "brand");
                     return;
                 }
             }
@@ -84,11 +82,9 @@ public class Base {
                             .replace("%blocktype%", "origin")
                             .replace("%easyblocktype%", "website")
                             .replace("%blocked%", origin))
-                    .map(line -> LegacyComponentSerializer.legacySection().serialize(
+                    .map(line -> LegacyComponentSerializer.legacySection()
-                            MiniMessage.miniMessage().deserialize(
+                            .serialize(MiniMessage.miniMessage().deserialize(line)))
-                                    line
+                    .collect(Collectors.toList());
-                            )
-                    )).collect(Collectors.toList());
             if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) {
                 for (String origin1 : config.blacklist.origins) {
                     if (matches(origin, origin1)) {
@@ -97,9 +93,7 @@ public class Base {
                     }
                 }
             } else {
-                if (origin != "null" || origin != null) {
+                setMOTD(conn, m);
-                    setMOTD(conn, m);
-                }
             }
         }
     }
@@ -137,16 +131,19 @@ public class Base {
         return text1.toLowerCase().matches(text2.replace(".", "\\.").replaceAll("\\*", ".*").toLowerCase());
     }
 
-    public static Component kick(String type, String easytype, String value) {
+    public static String kick(String type, String easytype, String value) {
-        return MiniMessage.miniMessage().deserialize(
+        return LegacyComponentSerializer.legacySection().serialize(
-                config.messages.kick
+                MiniMessage.miniMessage().deserialize(
-                        .replace("%blocktype%", type)
+                        config.messages.kick
-                        .replace("%easyblocktype%", easytype)
+                                .replace("%blocktype%", type)
-                        .replace("%blocked%", value)
+                                .replace("%easyblocktype%", easytype)
+                                .replace("%blocked%", value)
+                )
         );
     }
 
-    public static void webhook(IEaglerPendingConnection plr, String origin, String brand, String type) {
+
+    public static void webhook(IEaglerPlayer plr, String origin, String brand, String type) {
         String webhook = config.discord.webhook;
         if (webhook == null || webhook.isBlank()) return;
 
@@ -168,7 +165,7 @@ public class Base {
             }
           ]
         }
-        """, type, plr.getAuthUsername(), addr, protocol, origin, brand, userAgent, rewind);
+        """, type, plr.getUsername(), addr, protocol, origin, brand, userAgent, rewind);
 
         try {
             HttpURLConnection conn = (HttpURLConnection) new URL(webhook).openConnection();

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.EaglercraftLoginEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftInitializePlayerEvent;
 import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -29,7 +29,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftLoginEvent event) {
+    public void onLogin(EaglercraftInitializePlayerEvent 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.EaglercraftLoginEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftInitializePlayerEvent;
 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;
@@ -29,7 +29,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener {
     }
 
     @EventHandler
-    public void onLogin(EaglercraftLoginEvent event) {
+    public void onLogin(EaglercraftInitializePlayerEvent event) {
         Base.handleConnection(event);
     }
 

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

@@ -3,13 +3,24 @@ 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.EaglercraftLoginEvent;
+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.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;
@@ -36,12 +47,12 @@ public class OriginBlacklistVelocity {
     }
 
     @Subscribe
-    public void onLogin(EaglercraftLoginEvent event) {
+    public void onLogin(EaglercraftInitializePlayerEvent event) {
         Base.handleConnection(event);
     }
 
     @Subscribe
-    public void onMOTD(EaglercraftMOTDEvent event) {
+    public void onMOTD(IEaglercraftMOTDEvent event) {
         Base.handleMOTD(event);
     }
 }

src/main/resources/bungee.yml

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

src/main/resources/plugin.yml

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

src/main/resources/velocity-plugin.json

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