diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java index fb85969c..4a17b00f 100644 --- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java +++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java @@ -41,15 +41,22 @@ public class ModLoaderBlocker extends BasicListener { if(!(sender instanceof ProxiedPlayer)) return; + ProxiedPlayer p = (ProxiedPlayer) sender; + if (e.getTag().equals("lunarclient:pm")) { + p.disconnect(Message.parseToComponent("MOD_LOADER_LUNAR_CLIENT", false, p)); + return; + } + if(!e.getTag().equals("minecraft:brand")) return; String brand = new String(e.getData()); 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