From c4fcbdcb43e7e05e343da90f69fe6dfb2360314f Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 24 Oct 2023 11:10:24 +0200
Subject: [PATCH] Add ModLoaderBlocker for lunar client

---
 .../steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java  | 4 +++-
 src/de/steamwar/messages/BungeeCore.properties                | 2 ++
 src/de/steamwar/messages/BungeeCore_de.properties             | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
index fb85969c..d363ec62 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
@@ -45,11 +45,13 @@ public class ModLoaderBlocker extends BasicListener {
             return;
 
         String brand = new String(e.getData());
+        ProxiedPlayer p = (ProxiedPlayer) sender;
         if(brand.contains("fabric") || brand.contains("quilt") || brand.contains("LiteLoader")){
-            ProxiedPlayer p = (ProxiedPlayer) sender;
             if (!Storage.fabricCheckedPlayers.containsKey(p)) {
                 Storage.fabricPlayers.add(p);
             }
+        } else if (brand.contains("lunar")) {
+            p.disconnect(Message.parseToComponent("MOD_LOADER_LUNAR_CLIENT", false, p));
         }
     }
 
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 18b0364d..354c8695 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -116,6 +116,8 @@ MOD_RED_PLUR=Attempted use of mods:\n{0}
 MOD_YELLOW_SING=§7Deactivate the mod §e{0}§7 to continue playing on §eSteam§8War§7.
 MOD_YELLOW_PLUR=§7Deactivate the mods\n§e{0}\n§7to continue playing on §eSteam§8War§7.
 
+MOD_LOADER_LUNAR_CLIENT=§eLunar Client§7 is not supported on §eSteam§8War§7.
+
 MOD_USE_MODSENDER=§cPlease use the §c§lFabricModSender§c (https://steamwar.de/downloads/) or remove the mod that is rebranding your installation.
 
 #Various commands
diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties
index b9a11917..0ad87281 100644
--- a/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/src/de/steamwar/messages/BungeeCore_de.properties
@@ -102,6 +102,8 @@ MOD_RED_PLUR=Versuchte Benutzung der Mods:\n{0}
 MOD_YELLOW_SING=§7Deaktiviere den Mod §e{0}§7, um weiter auf §eSteam§8War §7spielen zu können.
 MOD_YELLOW_PLUR=§7Deaktiviere die Mods\n§e{0}\n§7um weiter auf §eSteam§8War §7spielen zu können.
 
+MOD_LOADER_LUNAR_CLIENT=§eLunar Client§7 ist auf §eSteam§8War§7 nicht unterstützt.
+
 MOD_USE_MODSENDER=§cBitte nutze den §c§lFabricModSender§c (https://steamwar.de/downloads/) oder entferne den Mod, der deine Fabric-Installation tarnt.
 
 #Various commands