From 7de763e640f74551ac4c1e48ff4356cc5a0c417b Mon Sep 17 00:00:00 2001 From: Colbster937 <96893162+colbychittenden@users.noreply.github.com> Date: Wed, 7 May 2025 13:56:06 -0500 Subject: [PATCH] 1.0.1 --- README.md | 15 +++- build.gradle | 2 +- .../originblacklist/base/Base.java | 79 ++++++++++++++++++ .../originblacklist/base/ConfigManager.java | 9 +- .../bukkit/OriginBlacklistBukkit.java | 7 ++ .../bungee/OriginBlacklistBungee.java | 7 ++ .../velocity/OriginBlacklistVelocity.java | 10 ++- src/main/resources/bungee.yml | 2 +- src/main/resources/config.yml | 14 ++-- src/main/resources/plugin.yml | 2 +- src/main/resources/server-blocked.png | Bin 0 -> 5380 bytes 11 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/server-blocked.png diff --git a/README.md b/README.md index 89fccd9..bcd3151 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,25 @@ basically just a reimplementation of originblacklist but for eaglerxserver > [!WARNING] > **Velocity is the main platform I'm developing this for, bungee & bukkit will still work but will probably have some bugs and will receive less support!** +### Features +- [x] Origin Blacklisting +- [x] Brand Blacklisting +- [x] Custom kick message +- [x] Custom blacklist MOTD +- [x] MiniMessage formatting for messages +- [x] Velocity, *Bungee, and *Bukkit support +
_Bungee and Bukkit are should work, but have bugs._ +- [x] Send blacklists to a discord webhook +- [ ] Blacklist subscription URLs +- [ ] Blacklist -> Whitelist +- [ ] IP blacklisting + ### Download **[https://github.com/colbster937/originblacklist/releases](https://github.com/colbster937/originblacklist/releases)** ### Building ``` -$ git clone https://github.com/colbster937/originblacklist +$ git clone https://github.com/colbster937/originblacklist.git $ cd originblacklist $ gradle wrapper $ ./gradle. shadowJar diff --git a/build.gradle b/build.gradle index 7b096dd..8cf2bbb 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { group = 'dev.colbster937' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/src/main/java/dev/colbster937/originblacklist/base/Base.java b/src/main/java/dev/colbster937/originblacklist/base/Base.java index d248bad..07cdcd4 100644 --- a/src/main/java/dev/colbster937/originblacklist/base/Base.java +++ b/src/main/java/dev/colbster937/originblacklist/base/Base.java @@ -6,9 +6,21 @@ 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.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.IOException; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; +import java.util.List; +import java.util.stream.Collectors; public class Base { private static LoggerAdapter adapter; @@ -61,6 +73,60 @@ public class Base { } } + public static void handleMOTD(IEaglercraftMOTDEvent e) { + if (config.messages.motd.enabled) { + IMOTDConnection conn = e.getMOTDConnection(); + String origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN); + List 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()); + if ((origin != "null" || origin != null) && !config.blacklist.missing_origin) { + for (String origin1 : config.blacklist.origins) { + if (matches(origin, origin1)) { + setMOTD(conn, m); + return; + } + } + } else { + setMOTD(conn, m); + } + } + } + + public static void setMOTD(IMOTDConnection conn, List 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()) + 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++) { + int pixel = img.getRGB(x, y); + int i = (y * 64 + x) * 4; + bytes[i] = (byte) ((pixel >> 16) & 0xFF); + bytes[i + 1] = (byte) ((pixel >> 8) & 0xFF); + bytes[i + 2] = (byte) (pixel & 0xFF); + bytes[i + 3] = (byte) ((pixel >> 24) & 0xFF); + } + } + conn.setServerIcon(bytes); + } catch (IOException ex) { + getLogger().error(ex.toString()); + } + } + public static boolean matches(String text1, String text2) { return text1.toLowerCase().matches(text2.replace(".", "\\.").replaceAll("\\*", ".*").toLowerCase()); } @@ -119,6 +185,19 @@ public class Base { } } + public static void init() { + File motdIcon = new File(config.messages.motd.icon); + if (!motdIcon.exists()) { + try (InputStream in = ConfigManager.class.getResourceAsStream("/server-blocked.png")) { + if (in != null) { + Files.copy(in, motdIcon.toPath(), StandardCopyOption.REPLACE_EXISTING); + } + } catch (IOException e) { + getLogger().warn(e.toString()); + } + } + } + public static void reloadConfig() { config = ConfigManager.loadConfig(adapter); } diff --git a/src/main/java/dev/colbster937/originblacklist/base/ConfigManager.java b/src/main/java/dev/colbster937/originblacklist/base/ConfigManager.java index 007101c..2310ba4 100644 --- a/src/main/java/dev/colbster937/originblacklist/base/ConfigManager.java +++ b/src/main/java/dev/colbster937/originblacklist/base/ConfigManager.java @@ -44,8 +44,6 @@ public class ConfigManager { public List brands; public List players; public boolean missing_origin; - - public Blacklist() {} } public static class Discord { @@ -54,5 +52,12 @@ public class ConfigManager { public static class Messages { public String kick; + public MOTD motd; + } + + public static class MOTD { + public boolean enabled; + public String text; + public String icon; } } diff --git a/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java index c02b177..1306f5f 100644 --- a/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java +++ b/src/main/java/dev/colbster937/originblacklist/bukkit/OriginBlacklistBukkit.java @@ -3,6 +3,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.EaglercraftInitializePlayerEvent; +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; @@ -19,6 +20,7 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener { Base.setApi(EaglerXServerAPI.instance()); Base.reloadConfig(); + Base.init(); getCommand("originblacklist").setExecutor(new CommandBukkit()); getServer().getPluginManager().registerEvents(this, this); @@ -30,4 +32,9 @@ public class OriginBlacklistBukkit extends JavaPlugin implements Listener { public void onLogin(EaglercraftInitializePlayerEvent event) { Base.handleConnection(event); } + + @EventHandler + public void onMOTD(EaglercraftMOTDEvent event) { + Base.handleMOTD(event); + } } diff --git a/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java index 9fb9735..2b74a3e 100644 --- a/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java +++ b/src/main/java/dev/colbster937/originblacklist/bungee/OriginBlacklistBungee.java @@ -3,6 +3,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.EaglercraftMOTDEvent; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; @@ -19,6 +20,7 @@ public class OriginBlacklistBungee extends Plugin implements Listener { Base.setApi(EaglerXServerAPI.instance()); Base.reloadConfig(); + Base.init(); getProxy().getPluginManager().registerCommand(this, new CommandBungee()); getProxy().getPluginManager().registerListener(this, this); @@ -30,4 +32,9 @@ public class OriginBlacklistBungee extends Plugin implements Listener { public void onLogin(EaglercraftInitializePlayerEvent event) { Base.handleConnection(event); } + + @EventHandler + public void onMOTD(EaglercraftMOTDEvent event) { + Base.handleMOTD(event); + } } diff --git a/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java index 4e19d5b..c081bc6 100644 --- a/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java +++ b/src/main/java/dev/colbster937/originblacklist/velocity/OriginBlacklistVelocity.java @@ -9,12 +9,14 @@ 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.EaglercraftMOTDEvent; import org.slf4j.Logger; @Plugin( id = "originblacklist", name = "OriginBlacklist", - version = "1.0.0", + version = "1.0.1", authors = {"Colbster937"}, description = "A reimplementation of OriginBlacklist for EaglerXServer", dependencies = {@Dependency(id = "eaglerxserver")} @@ -39,6 +41,7 @@ public class OriginBlacklistVelocity { public void onProxyInitialization(ProxyInitializeEvent event) { Base.setApi(EaglerXServerAPI.instance()); Base.reloadConfig(); + Base.init(); proxy.getCommandManager().register("originblacklist", new CommandVelocity()); logger.info("Loaded Velocity plugin"); } @@ -47,4 +50,9 @@ public class OriginBlacklistVelocity { public void onLogin(EaglercraftInitializePlayerEvent event) { Base.handleConnection(event); } + + @Subscribe + public void onMOTD(IEaglercraftMOTDEvent event) { + Base.handleMOTD(event); + } } diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 0c9a60d..a343035 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: OriginBlacklist -version: 1.0.0 +version: 1.0.1 main: dev.colbster937.originblacklist.bungee.OriginBlacklistBungee description: A reimplementation of OriginBlacklist for EaglerXServer author: Colbster937 diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index c6c7e56..ca5640e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -11,6 +11,13 @@ messages: Think this is a mistake? Join our discord: discord.gg/changethisintheconfig + motd: + enabled: true + text: | + This %easyblocktype% is not allowed! + » %blocked% « + icon: "blacklisted.png" + # Origin + Brand blacklist supports wildcards # Everything should be lowercase blacklist: @@ -51,13 +58,6 @@ discord: - - - - - - - diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 953a8b8..c5f722e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: OriginBlacklist -version: 1.0.0 +version: 1.0.1 main: dev.colbster937.originblacklist.bukkit.OriginBlacklistBukkit description: A reimplementation of OriginBlacklist for EaglerXServer author: Colbster937 diff --git a/src/main/resources/server-blocked.png b/src/main/resources/server-blocked.png new file mode 100644 index 0000000000000000000000000000000000000000..001ee13eee4b5db17c1187baec2d0bf2cb5accdc GIT binary patch literal 5380 zcmeHKX;f3!7QRsdiGpaE#DNf7)MAE921p<%5RfblBA|du^(MIqVMszI0!n2N2b@4f zQBYAt911F05J8zi%1|kyVil}2DvA|URP>z$R9vrXz2#c3|IEs8?>^u8_TJywXP?{+ zKHhVUuvStm+Xw+ zTBe3x3)fg>w?eI}x6F5|+AJz}t4&z5yn1_6%_8XU(Ybe$PabLWs2MmoY4H~G*;8{V zOBY|6pcv6^{r6vvr<}OyeCy&3*1?40DO(GY#4Uyc@5Ay!Cb?8?6tJ>hHXPk(mz|_? zDtx%qu7Wyl?^O6u%D|ShW()U@$D$2?ZgElwFu|J%7T!0`8t-OQvF*}QY%|siV7^a9 z@Q!fi>cY+&-^W$)Ouv8NT0)awtK|QA7PTswsU~j9sr0GU+`E(E5_{m+eb~l~seu*5 zRAYMM!^XbpJLAVo#`rrx7j8T_{vxzI>+y_NrW+vj{vXwKv(w7Q9yBs%Ufi8H`8Qu^ z{mEYw;qY=O(B1ar145QFJkm?g)$s7fQw50_wKsN?Y1k$MhaY3ZN+)P$nN7E}-ISdk zZzw7?yrmzcU+{}+{r(kZ@Q%#LD~t!hvPTE!b!Z;%edY4{CsRLig|Dn)oe8x%*oyJ$p^P*lE{PLW~)%S}< z90RLDMq8NOXxQ*LGoGA@A6x653teVx>&m+MUCXY{aEjiZ(b8tuPHiu0sj%r`@2PA(W4=+` zu_f|N-5Bfoe6KT0>m^&;YM%&mcV0W#JW)`$ZP{;ogtAR0`vcKGdt#NY8LvN zp83u8PMa?0OYujna{0xzg$?l2ch@F7D6VIzi3eJZ4qKSdrd+$re3A15Y}C2A*S3Z< zK5OOZ+x3(}KaYBDcv{+Im!iz>r02qV?{%Rk^Qxzr?rFbzHq@OPowjO$+4=E)xhXcW z(>yy|GxhIw;#cXBS%&uSO(U(mV%NQHTG>0XQq-U5*feW^b-VYwyUTF^P;3zN*64Px zN%3mj`|v3P`Na1)?*P?vi}lhC5`KT{x!2RWRKcsVlW*P4dC{`cC7Lw7>v-ah3rCU- zjITbhInOk)2w8MCrySY2xs;Y$baZa#>V`vIESDnudl9Y(U$^ejJ+%6@SxEAnjr}ou zF7)qU^!~kdV(;21QqG&agfI`x{;bsZBXW*7jeYjGbpixo62>pf-uT=%YHdG1)QHEZN8AGB%HyzU+-2*J_)o#oUTtZ{4cnwN=yv z1sDXln!JM|Eiz4m4^@BoA;}z`I{DR|o9F9pI?W03PZz41M(mMfbP3!V?=PZHsOz zZbxn>dcC`-s=4FP?6FI4-$WXvEBf|~Q-M!b?ce&-;TQbajlJwjA z5$k*ImdrW*)UmT}ORF;`;rH^ij+X(G${VM5^%a^sjd)WS zzwvS5;U}0~PUW|@+hi2j>4~vPBYJ-J?A$R@UlPBMcB1Hti??;$SXJ6NjInWi3m!f3 zwzQ<=bkXYH&%AkyncpDa)!|lk7@Q$7VsKUja_2Mo(g-3Vkn&KXCPD_z5(sjht&t)8 zFjR@-p(3$_g@0C3hR2BoEPMcsOXkYl(Gam$j2!ig@%HD(gz*^y{A?GjvxW%>B2XoQ z(?ow|Nb%26DZNF|a99vZRQ9`Az1Im-n?rZ3xb zhyvWP@F7a2j7cIzMMV*#C`74TM1mO%28nD>vbQGy1VIrkQ6d_GL@`ZEG04G26@0l^ zrW8vhI4vi_ld6;~JRXeWKE@Xz<8nXIOB6#Y06j<=L`H&%WKu)~Y4{9<(nAeMh64J> z847=Jrvn}yfL%M?iY zVgXZk>3~rAG#+YCVDMlefhs@|f+NilCQ$5Aih~0M;lVIGjEW;sC=m%C)lva+q8RY- zcrb&9QmF(oo#8;B^5{GQk4GmHXneXrK<6V=9!wiXu|O^cRf&WTk4j4=08~_%N)hl; z9zoy;QwdZAT=94m2LhP}GaM;&GMUPw>Zr8qz;yNDu<-Uo@@I=rIHD9v_DZ{sT7z-w}#Uqi(u@&-4V82&f!! z1R_F7GKokxpj{Ux$Ob5jXbTlE>+B#Irn?+Plv26BR2t60Yq@b+%1^^wu%85o5@91s z6nG=s)0kxNcJPNOObUYu(?G^d@-VzqAQnddFSK^|;G757+)Jzg{-brK!7b&7Mh@N$ z-iC{HdkKfr?FuHsA51}ks8N9~PQW!d#1BCvA{4Zbp?dvj7ym;oP{^ndL8(Fl-;qoQ zwLnD(JO@x%4m`R885U6J0v`QKc7;@^j6&q7s|e@_v;y_1(+W3Za0zFA36Bavwd(^E z0}>HFD@Gquj5L%nN!v9(rtD1mFHxLzfMIP0%p0_U_652j=~Fu#5>4B9{>9hOV*HC9 z0QEN~U#0IixxUHuRSJ9+_*->-lk2M#_$u(X>iWOQh5h_Mg-XERpeXRTbT!Sf89Ztk z%DjRU5H#jH?FR$x$+QGU10{#+VbG;#Fk!lhOq1XYOwT!NSAWg*?&}psm1Glki)9Pe z$Y+Gnp~Y5NqpWUu+1$svR4S7$b0rz$icn-k4Ir4a`cva}}5cpf!sW@8{W b+qQX(G~NGj+s;uJ02JbQc(e1}RwVofS$Hu& literal 0 HcmV?d00001