11 Commits
1.2 ... 1.5

5 changed files with 1054 additions and 807 deletions

View File

@@ -65,6 +65,7 @@ Bearbeiten Sie die `plugins/GlobalChat/welcome.yml` (Optional).
| Befehl | Beschreibung | Berechtigung | | Befehl | Beschreibung | Berechtigung |
|--------|--------------|--------------| |--------|--------------|--------------|
| `/clearchat, cc` | Löscht den Chatverlauf | `globalchat.clear` |
| `/togglechat` | Schaltet den globalen Chat für den Spieler ein/aus (wichtig für Lands/Quests). | Spieler | | `/togglechat` | Schaltet den globalen Chat für den Spieler ein/aus (wichtig für Lands/Quests). | Spieler |
| `/support <Nachricht>` | Sendet eine Anfrage an das gesamte Team. | Spieler | | `/support <Nachricht>` | Sendet eine Anfrage an das gesamte Team. | Spieler |
| `/reply <Nachricht>` | Antwortet auf eine Support-Anfrage. | Spieler | | `/reply <Nachricht>` | Antwortet auf eine Support-Anfrage. | Spieler |
@@ -79,6 +80,7 @@ Bearbeiten Sie die `plugins/GlobalChat/welcome.yml` (Optional).
| `globalchat.reload` | OP | Erlaubt das Neuladen der Konfiguration. | | `globalchat.reload` | OP | Erlaubt das Neuladen der Konfiguration. |
| `globalchat.mute` | OP | Erlaubt das Schalten des globalen Mutes. | | `globalchat.mute` | OP | Erlaubt das Schalten des globalen Mutes. |
| `globalchat.bypass` | OP | Erlaubt das Schreiben trotz globalem Mute. | | `globalchat.bypass` | OP | Erlaubt das Schreiben trotz globalem Mute. |
| `globalchat.clear` | OP | Löscht den Chatverlauf. |
## Technical Info (Secure Chat Fix) ## Technical Info (Secure Chat Fix)

View File

@@ -8,7 +8,7 @@
<!-- WICHTIG: Dies sind deine Projektdaten für 'globalchat' --> <!-- WICHTIG: Dies sind deine Projektdaten für 'globalchat' -->
<groupId>de.viper</groupId> <groupId>de.viper</groupId>
<artifactId>globalchat</artifactId> <artifactId>globalchat</artifactId>
<version>1.2</version> <version>1.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>GlobalChat</name> <name>GlobalChat</name>

View File

@@ -14,20 +14,24 @@ import net.md_5.bungee.api.chat.HoverEvent.Action;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.ChatEvent; import net.md_5.bungee.api.event.ChatEvent;
import net.md_5.bungee.api.event.PostLoginEvent;
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.api.event.ServerConnectEvent; import net.md_5.bungee.api.event.ServerConnectEvent;
import net.md_5.bungee.api.event.ServerSwitchEvent; import net.md_5.bungee.api.event.ServerSwitchEvent;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.chat.ComponentSerializer;
import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration; import net.md_5.bungee.config.YamlConfiguration;
import net.md_5.bungee.event.EventHandler;
import java.io.*; import java.io.*;
import java.lang.Class;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.*; import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -35,28 +39,27 @@ import java.util.regex.Pattern;
/** /**
* GlobalChat - Bungee Plugin * GlobalChat - Bungee Plugin
* - Filter (filter.yml)
* - Logs (plugins/GlobalChat/logs/YYYY-MM-DD.log)
* - /support, /reply, /info, /togglechat
* - Prefix/Suffix via LuckPerms (Proxy-side)
* - Server Aliase & Farben (via bungee.yml)
* - ServerSwitch announcement
* - Relay Mode: Sendet JSON an Spigot Server, um Secure-Chat Probleme zu vermeiden.
*/ */
public class GlobalChat extends Plugin implements Listener { public class GlobalChat extends Plugin implements Listener {
private static final String CHANNEL_CONTROL = "global:control"; private static final String CHANNEL_CONTROL = "global:control";
private static final String CHANNEL_CHAT = "global:chat"; private static final String CHANNEL_CHAT = "global:chat"; // Kanal für Chat-Relay (legacy)
private List<String> badWords = new ArrayList<>(); private List<String> badWords = new ArrayList<>();
private File logFolder; private File logFolder;
private boolean chatMuted = false; private boolean chatMuted = false;
// NEU: Config Handling für BungeeCord (Server Aliase) // Config Handling für BungeeCord
private File configFile; private File configFile;
private Configuration config; private Configuration config;
private Map<String, String> serverAliases = new HashMap<>(); private Map<String, String> serverAliases = new HashMap<>();
// Map für gruppen-spezifische Formate aus der bungee.yml
private Map<String, String> groupFormats = new HashMap<>();
// Map für manuelle Ränge (UUID Override) aus der bungee.yml
private final Map<String, String> manualRanks = new ConcurrentHashMap<>();
// Optional: falls Spigot-Server OP-Info per PluginMessage sendet // Optional: falls Spigot-Server OP-Info per PluginMessage sendet
private final Map<UUID, Boolean> playerIsOp = new ConcurrentHashMap<>(); private final Map<UUID, Boolean> playerIsOp = new ConcurrentHashMap<>();
// Letzte Support-Kontakte (staff UUID -> target UUID) // Letzte Support-Kontakte (staff UUID -> target UUID)
@@ -64,7 +67,7 @@ public class GlobalChat extends Plugin implements Listener {
// Tracking für unterdrückte Join-/Quit-Nachrichten // Tracking für unterdrückte Join-/Quit-Nachrichten
private final Set<UUID> suppressJoinQuit = ConcurrentHashMap.newKeySet(); private final Set<UUID> suppressJoinQuit = ConcurrentHashMap.newKeySet();
// NEU: Liste für Spieler, die Toggle-Chat aktiviert haben // Liste für Spieler, die Toggle-Chat aktiviert haben
private final Set<UUID> chatLockPlayers = ConcurrentHashMap.newKeySet(); private final Set<UUID> chatLockPlayers = ConcurrentHashMap.newKeySet();
// =========================== // ===========================
@@ -73,7 +76,9 @@ public class GlobalChat extends Plugin implements Listener {
private List<String> welcomeMessages = new ArrayList<>(); private List<String> welcomeMessages = new ArrayList<>();
private void loadWelcomeMessages() { private void loadWelcomeMessages() {
File file = new File(getDataFolder(), "welcome.yml"); String fileName = "welcome.yml";
File file = new File(getDataFolder(), fileName);
if (!file.exists()) { if (!file.exists()) {
try { try {
getDataFolder().mkdirs(); getDataFolder().mkdirs();
@@ -117,7 +122,7 @@ public class GlobalChat extends Plugin implements Listener {
@Override @Override
public void onEnable() { public void onEnable() {
// Plugin channels registrieren // Plugin channels registrieren (legacy, werden nicht mehr für Chat-Relay genutzt)
try { try {
getProxy().registerChannel(CHANNEL_CONTROL); getProxy().registerChannel(CHANNEL_CONTROL);
getProxy().registerChannel(CHANNEL_CHAT); getProxy().registerChannel(CHANNEL_CHAT);
@@ -131,19 +136,25 @@ public class GlobalChat extends Plugin implements Listener {
// Standard-Konfiguration kopieren, falls nicht vorhanden // Standard-Konfiguration kopieren, falls nicht vorhanden
if (!configFile.exists()) { if (!configFile.exists()) {
getLogger().info("bungee.yml nicht gefunden. Erstelle Standard...");
try (InputStream in = getResourceAsStream("bungee.yml")) { try (InputStream in = getResourceAsStream("bungee.yml")) {
Files.copy(in, configFile.toPath()); if (in != null) Files.copy(in, configFile.toPath());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else {
getLogger().info("bungee.yml gefunden. Lade Konfiguration...");
} }
loadConfigData(); loadConfigData();
loadServerAliases();
loadGroupFormats();
loadManualRanks(); // NEU: UUID Ränge laden
getProxy().getPluginManager().registerListener(this, this); getProxy().getPluginManager().registerListener(this, this);
loadFilter(); loadFilter();
loadWelcomeMessages(); loadWelcomeMessages();
loadServerAliases(); // NEU
logFolder = new File(getDataFolder(), "logs"); logFolder = new File(getDataFolder(), "logs");
if (!logFolder.exists()) logFolder.mkdirs(); if (!logFolder.exists()) logFolder.mkdirs();
@@ -157,7 +168,10 @@ public class GlobalChat extends Plugin implements Listener {
getProxy().getPluginManager().registerCommand(this, new InfoCommand()); getProxy().getPluginManager().registerCommand(this, new InfoCommand());
getProxy().getPluginManager().registerCommand(this, new ChatToggleCommand()); getProxy().getPluginManager().registerCommand(this, new ChatToggleCommand());
getLogger().info("§aGlobalChat aktiviert (Relay-Mode, ToggleChat, Zensur, Logs, Support, ServerAliase)!"); // NEU: ClearChat Befehl registrieren
getProxy().getPluginManager().registerCommand(this, new ClearChatCommand());
getLogger().info("§aGlobalChat aktiviert (UUID-Overrides via bungee.yml)!");
} }
@Override @Override
@@ -172,7 +186,7 @@ public class GlobalChat extends Plugin implements Listener {
} }
// =========================== // ===========================
// Konfiguration & Aliase // Konfiguration laden
// =========================== // ===========================
private void loadConfigData() { private void loadConfigData() {
try { try {
@@ -187,21 +201,80 @@ public class GlobalChat extends Plugin implements Listener {
if (config == null) return; if (config == null) return;
if (config.getSection("server-aliases") == null) {
return;
}
serverAliases.clear(); serverAliases.clear();
for (String key : config.getSection("server-aliases").getKeys()) { if (config.getSection("server-aliases") != null) {
serverAliases.put(key, config.getString("server-aliases." + key)); for (String key : config.getSection("server-aliases").getKeys()) {
serverAliases.put(key, config.getString("server-aliases." + key));
}
} }
getLogger().info("§eGeladene Server-Aliase: " + serverAliases.size()); getLogger().info("§eGeladene Server-Aliase: " + serverAliases.size());
} }
private String getServerDisplayName(String rawServerName) { private void loadGroupFormats() {
if (serverAliases.containsKey(rawServerName)) { loadConfigData();
return ChatColor.translateAlternateColorCodes('&', serverAliases.get(rawServerName)); if (config == null) return;
groupFormats.clear();
if (config.getSection("group-formats") != null) {
for (String key : config.getSection("group-formats").getKeys()) {
groupFormats.put(key, config.getString("group-formats." + key));
}
}
getLogger().info("§eGeladene Chat-Formate: " + groupFormats.size());
}
// NEU: UUID Rängen aus bungee.yml laden
private void loadManualRanks() {
loadConfigData(); // Reload sichern
if (config == null) {
getLogger().warning("§cConfig ist null! Kann bungee.yml nicht lesen.");
return;
}
manualRanks.clear();
// Prüfen, ob Sektion existiert
if (config.getSection("manual-ranks") == null) {
getLogger().warning("§cDer Bereich 'manual-ranks' wurde in der bungee.yml NICHT gefunden!");
getLogger().warning("§cTipp: Bitte lösche die alte bungee.yml und starte neu.");
return;
}
int loadedCount = 0;
if (config.getSection("manual-ranks").getKeys().isEmpty()) {
getLogger().warning("§cDer Bereich 'manual-ranks' ist leer (keine Overrides geladen).");
} else {
for (String uuidStr : config.getSection("manual-ranks").getKeys()) {
String groupName = config.getString("manual-ranks." + uuidStr);
if (groupName != null) {
try {
// UUID Prüfung nur zur Sicherheit
UUID.fromString(uuidStr);
manualRanks.put(uuidStr, groupName);
loadedCount++;
} catch (IllegalArgumentException ex) {
getLogger().warning("§cUngültige UUID in manual-ranks: " + uuidStr);
}
}
}
}
getLogger().info("§eGeladene UUID-Overrides: " + loadedCount);
}
private String getDisplayName(String serverName) {
String displayName = serverAliases.getOrDefault(serverName, serverName);
return ChatColor.translateAlternateColorCodes('&', displayName);
}
// ===========================
// Global Broadcast Helper
// ===========================
private void broadcastGlobal(TextComponent component) {
// KORREKTUR: Sende als System/Plugin-Nachricht an alle verbundenen Spieler.
// Damit bleibt die Anzeige identisch, aber es werden keine unsignierten Player-Chat-Pakete erzeugt.
for (ProxiedPlayer p : getProxy().getPlayers()) {
p.sendMessage(component);
} }
return rawServerName; // Fallback
} }
// =========================== // ===========================
@@ -213,22 +286,18 @@ public class GlobalChat extends Plugin implements Listener {
if (e.isCommand()) return; if (e.isCommand()) return;
ProxiedPlayer player = (ProxiedPlayer) e.getSender(); ProxiedPlayer player = (ProxiedPlayer) e.getSender();
String originalMsg = e.getMessage();
// ==================== CHAT LOCK / TOGGLE CHECK ==================== // ==================== CHAT LOCK / TOGGLE CHECK ====================
if (chatLockPlayers.contains(player.getUniqueId())) { if (chatLockPlayers.contains(player.getUniqueId())) {
// Chat ist deaktiviert: Nachricht geht direkt zum Server (für Lands/Quests) return; // Nachricht geht direkt zum Server
return;
} }
// ======================================================================== // ========================================================================
// Optional: Debugging (auskommentiert für performance) String originalMsg = e.getMessage();
// getLogger().info("ChatEvent: Spieler=" + player.getName() + ", Nachricht=" + originalMsg);
// Versuche, Join-/Quit-Nachrichten zu filtern
if (suppressJoinQuit.contains(player.getUniqueId()) && if (suppressJoinQuit.contains(player.getUniqueId()) &&
(originalMsg.contains("joined the Game") || originalMsg.contains("left the Game"))) { (originalMsg.contains("joined§ Game") || originalMsg.contains("left§ Game"))) {
getLogger().info("Unterdrücke Join-/Quit-Nachricht für " + player.getName() + ": " + originalMsg); getLogger().info("Unterdrücke Join-/Quit-Nachricht für " + player.getName());
e.setCancelled(true); e.setCancelled(true);
return; return;
} }
@@ -247,49 +316,43 @@ public class GlobalChat extends Plugin implements Listener {
censoredMsg = censoredMsg.replaceAll("(?i)" + Pattern.quote(bad), repeat("*", bad.length())); censoredMsg = censoredMsg.replaceAll("(?i)" + Pattern.quote(bad), repeat("*", bad.length()));
} }
// Event canceln
e.setCancelled(true); e.setCancelled(true);
String serverName = player.getServer().getInfo().getName(); String serverName = player.getServer().getInfo().getName();
String serverDisplay = getServerDisplayName(serverName); // NEU: Alias nutzen String serverDisplay = getDisplayName(serverName);
// Prefix/Suffix holen // Index 0: Prefix (Rang), Index 1: Suffix, Index 2: Spielername Farbe, Index 3: Chat Farbe
String[] ps = getPrefixSuffix(player); String[] ps = getPrefixSuffix(player);
String prefix = ps[0] == null ? "" : ps[0].trim(); String prefix = ps[0];
String suffix = ps[1] == null ? "" : ps[1].trim(); String playerColor = ps[2];
String chatColor = ps[3];
String displayTag = ""; String displayTag = "";
if (!prefix.isEmpty()) { if (!prefix.isEmpty()) {
displayTag = prefix; displayTag = prefix;
} else if (!suffix.isEmpty()) { } else if (!ps[1].isEmpty()) {
displayTag = suffix; displayTag = ps[1];
} }
if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " "; if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " ";
// Formatieren
StringBuilder out = new StringBuilder(); StringBuilder out = new StringBuilder();
out.append("§7[").append(serverDisplay).append("] "); // NEU: serverDisplay out.append("§7[").append(serverDisplay).append("§r§7] "); // FIX: Reset vor der Klammer
if (!displayTag.isEmpty()) out.append(displayTag); if (!displayTag.isEmpty()) out.append(displayTag);
out.append(player.getName());
out.append("§f: ").append(censoredMsg); // Spielername mit eigener Farbe
out.append(playerColor).append(player.getName());
out.append("§f: ").append(chatColor).append(censoredMsg); // Chatnachricht mit eigener Farbe
String chatOut = out.toString(); String chatOut = out.toString();
// NEU: Nachricht als JSON an alle Server senden (Relay) // NEU: Nachricht erstellen und an alle Spieler senden (als Systemnachricht)
TextComponent chatComponent = new TextComponent(chatOut); TextComponent chatComponent = new TextComponent(chatOut);
String jsonMessage = ComponentSerializer.toString(chatComponent); broadcastGlobal(chatComponent);
byte[] data = jsonMessage.getBytes(StandardCharsets.UTF_8);
for (ServerInfo server : getProxy().getServers().values()) { // Loggen (lokal auf Bungee)
if (server.getPlayers().isEmpty()) continue; // Optimierung
try {
server.sendData(CHANNEL_CHAT, data);
} catch (Exception ex) {
getLogger().warning("Konnte Chat-Nachricht nicht an " + server.getName() + " senden.");
}
}
// Loggen
String logEntry = "[" + serverName + "] " + String logEntry = "[" + serverName + "] " +
(displayTag.isEmpty() ? "" : stripColor(displayTag) + " ") + (displayTag.isEmpty() ? "" : stripColor(displayTag) + " ") +
player.getName() + player.getName() +
@@ -298,7 +361,53 @@ public class GlobalChat extends Plugin implements Listener {
} }
// =========================== // ===========================
// Server connect (pre-switch suppression) // Global Join & Quit Events
// ===========================
@EventHandler
public void onPostLogin(PostLoginEvent e) {
ProxiedPlayer player = e.getPlayer();
// Willkommensnachricht senden
sendRandomWelcomeMessage(player);
// Formatierung aus bungee.yml nutzen
String[] ps = getPrefixSuffix(player);
String prefix = ps[0];
String playerColor = ps[2]; // Namefarbe aus Config
String displayTag = "";
if (!prefix.isEmpty()) displayTag = prefix;
if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " ";
// Nachricht: "Spieler xy hat den Server betreten"
TextComponent joinMsg = new TextComponent(displayTag + playerColor + player.getName() + " §a§lhat den Server betreten.");
broadcastGlobal(joinMsg);
logMessage("[JOIN] " + player.getName() + " hat den Server betreten.");
}
@EventHandler
public void onPlayerDisconnect(PlayerDisconnectEvent e) {
ProxiedPlayer player = e.getPlayer();
// Formatierung aus bungee.yml nutzen
String[] ps = getPrefixSuffix(player);
String prefix = ps[0];
String playerColor = ps[2]; // Namefarbe aus Config
String displayTag = "";
if (!prefix.isEmpty()) displayTag = prefix;
if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " ";
// Nachricht: "Spieler xy hat den Server verlassen"
TextComponent quitMsg = new TextComponent(displayTag + playerColor + player.getName() + " §c§lhat den Server verlassen.");
broadcastGlobal(quitMsg);
logMessage("[QUIT] " + player.getName() + " hat den Server verlassen.");
}
// ===========================
// Server Connect & Switch
// =========================== // ===========================
@EventHandler @EventHandler
public void onServerConnect(ServerConnectEvent e) { public void onServerConnect(ServerConnectEvent e) {
@@ -317,14 +426,14 @@ public class GlobalChat extends Plugin implements Listener {
sendSuppressJoinQuit(from, player.getUniqueId()); sendSuppressJoinQuit(from, player.getUniqueId());
getLogger().info("Sent suppress quit message for " + player.getName() + " to server " + from.getName()); getLogger().info("Sent suppress quit message for " + player.getName() + " to server " + from.getName());
} catch (Throwable ex) { } catch (Throwable ex) {
getLogger().warning("Fehler beim Senden der Quit-Unterdrückung an " + from.getName() + ": " + ex.getMessage()); getLogger().warning("Fehler beim Senden der Quit-Unterdrückung: " + ex.getMessage());
} }
try { try {
sendSuppressJoinQuit(target, player.getUniqueId()); sendSuppressJoinQuit(target, player.getUniqueId());
getLogger().info("Sent suppress join message for " + player.getName() + " to server " + target.getName()); getLogger().info("Sent suppress join message for " + player.getName() + " to server " + target.getName());
} catch (Throwable ex) { } catch (Throwable ex) {
getLogger().warning("Fehler beim Senden der Join-Unterdrückung an " + target.getName() + ": " + ex.getMessage()); getLogger().warning("Fehler beim Senden der Join-Unterdrückung: " + ex.getMessage());
} }
getProxy().getScheduler().schedule(this, () -> { getProxy().getScheduler().schedule(this, () -> {
@@ -333,59 +442,47 @@ public class GlobalChat extends Plugin implements Listener {
}, 2, java.util.concurrent.TimeUnit.SECONDS); }, 2, java.util.concurrent.TimeUnit.SECONDS);
} }
// ===========================
// Server switch announcement (RELAY MODE)
// ===========================
@EventHandler @EventHandler
public void onServerSwitch(ServerSwitchEvent e) { public void onServerSwitch(ServerSwitchEvent e) {
ProxiedPlayer player = e.getPlayer(); ProxiedPlayer player = e.getPlayer();
ServerInfo from = e.getFrom(); ServerInfo from = e.getFrom();
ServerInfo to = player.getServer() != null ? player.getServer().getInfo() : null; ServerInfo to = player.getServer() != null ? player.getServer().getInfo() : null;
if (to == null) return; if (to == null || from == null) return;
if (from == null) return; // Erster Join
if (from.getName().equalsIgnoreCase(to.getName())) return; if (from.getName().equalsIgnoreCase(to.getName())) return;
String fromName = from.getName(); String fromName = from.getName();
String toName = to.getName(); String fromDisplay = getDisplayName(fromName);
// NEU: Aliase nutzen String toName = to.getName();
String fromDisplay = getServerDisplayName(fromName); String toDisplay = getDisplayName(toName);
String toDisplay = getServerDisplayName(toName);
String[] ps = getPrefixSuffix(player); String[] ps = getPrefixSuffix(player);
String prefix = ps[0] == null ? "" : ps[0].trim(); String prefix = ps[0];
String suffix = ps[1] == null ? "" : ps[1].trim(); String playerColor = ps[2]; // Namefarbe aus Properties für den Switch
String displayTag = ""; String displayTag = "";
if (!prefix.isEmpty()) displayTag = prefix; if (!prefix.isEmpty()) displayTag = prefix;
else if (!suffix.isEmpty()) displayTag = suffix; // Suffix wird hier ignoriert, da die || Syntax vorausgesetzt wird
else if (!ps[1].isEmpty()) displayTag = ps[1];
if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " "; if (!displayTag.isEmpty() && !displayTag.endsWith(" ")) displayTag = displayTag + " ";
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append("§7[").append(toDisplay).append("] "); // NEU: toDisplay msg.append("§7[").append(toDisplay).append("§r§7] ");
if (!displayTag.isEmpty()) msg.append(displayTag); if (!displayTag.isEmpty()) msg.append(displayTag);
msg.append(player.getName());
// Hier wird die playerColor aus der bungee.yml angewendet
msg.append(playerColor).append(player.getName());
msg.append(" §7hat den Server gewechselt: §e") msg.append(" §7hat den Server gewechselt: §e")
.append(fromDisplay).append(" §7→ §e").append(toDisplay).append("§7."); // NEU: Displays .append(fromDisplay).append(" §7→ §e").append(toDisplay).append("§7.");
String finalMsg = msg.toString(); String finalMsg = msg.toString();
// NEU: Switch Nachricht auch als JSON relays // NEU: Broadcast Helper nutzen
TextComponent switchComponent = new TextComponent(finalMsg); TextComponent switchComponent = new TextComponent(finalMsg);
String jsonMessage = ComponentSerializer.toString(switchComponent); broadcastGlobal(switchComponent);
byte[] data = jsonMessage.getBytes(StandardCharsets.UTF_8);
for (ServerInfo server : getProxy().getServers().values()) {
if (server.getPlayers().isEmpty()) continue;
try {
server.sendData(CHANNEL_CHAT, data);
} catch (Exception ex) {
getLogger().warning("Konnte Switch-Nachricht nicht senden.");
}
}
String logEntry = "[" + toName + "] " + String logEntry = "[" + toName + "] " +
(displayTag.isEmpty() ? "" : stripColor(displayTag) + " ") + (displayTag.isEmpty() ? "" : stripColor(displayTag) + " ") +
@@ -401,7 +498,7 @@ public class GlobalChat extends Plugin implements Listener {
out.writeUTF(playerId.toString()); out.writeUTF(playerId.toString());
server.sendData(CHANNEL_CONTROL, baos.toByteArray()); server.sendData(CHANNEL_CONTROL, baos.toByteArray());
} catch (IOException ex) { } catch (IOException ex) {
getLogger().warning("Fehler beim Senden der suppress-Nachricht an " + server.getName() + ": " + ex.getMessage()); getLogger().warning("Fehler beim Senden der suppress-Nachricht: " + ex.getMessage());
} }
} }
@@ -412,45 +509,87 @@ public class GlobalChat extends Plugin implements Listener {
} }
// =========================== // ===========================
// Prefix/Suffix via LuckPerms // Prefix/Suffix (Logic: UUID Override > LuckPerms > Perm)
// =========================== // ===========================
private String[] getPrefixSuffix(ProxiedPlayer player) { private String[] getPrefixSuffix(ProxiedPlayer player) {
String prefix = ""; String prefix = "";
String suffix = ""; String suffix = "";
String playerColor = "§f";
String chatColor = "§f";
String groupName = "spieler";
// 0. UUID Override aus bungee.yml
if (manualRanks.containsKey(player.getUniqueId().toString())) {
groupName = manualRanks.get(player.getUniqueId().toString());
}
// 1. LuckPerms via Reflection
else {
String lpGroup = getLuckPermsGroup(player);
if (lpGroup != null && !lpGroup.isEmpty() && !lpGroup.equalsIgnoreCase("default")) {
groupName = lpGroup.toLowerCase();
}
}
// 2. FALLBACK: Permission-Check
if (groupName == null || groupName.equalsIgnoreCase("default") || groupName.equalsIgnoreCase("Spieler")) {
if (player.hasPermission("group.owner")) groupName = "Owner";
else if (player.hasPermission("group.admin")) groupName = "Admin";
else if (player.hasPermission("group.developer")) groupName = "Developer";
else if (player.hasPermission("group.premium")) groupName = "Premium";
else groupName = "Spieler";
}
// 3. Farben aus bungee.yml anwenden
if (groupName != null && groupFormats.containsKey(groupName)) {
String rawFormat = groupFormats.get(groupName);
if (rawFormat.contains(" || ")) {
String[] parts = rawFormat.split(" \\|\\| ");
prefix = ChatColor.translateAlternateColorCodes('&', parts[0]);
playerColor = ChatColor.translateAlternateColorCodes('&', parts[1]);
chatColor = ChatColor.translateAlternateColorCodes('&', parts[2]);
suffix = "";
} else if (rawFormat.contains(": ")) {
String[] parts = rawFormat.split(": ", 2);
prefix = ChatColor.translateAlternateColorCodes('&', parts[0]);
chatColor = ChatColor.translateAlternateColorCodes('&', parts[1]);
playerColor = "§f";
suffix = "";
} else {
prefix = ChatColor.translateAlternateColorCodes('&', rawFormat);
suffix = "";
playerColor = "§f";
chatColor = "§f";
}
return new String[]{prefix, suffix, playerColor, chatColor};
}
// 4. LuckPerms Meta Fallback
try { try {
LuckPerms lp = LuckPermsProvider.get(); LuckPerms lp = LuckPermsProvider.get();
if (lp != null) { if (lp != null) {
User user = lp.getUserManager().getUser(player.getUniqueId()); User user = lp.getUserManager().getUser(player.getUniqueId());
if (user == null) { if (user == null) {
try { try { user = lp.getUserManager().loadUser(player.getUniqueId()).join(); } catch (Exception ignored) {}
user = lp.getUserManager().loadUser(player.getUniqueId()).join();
} catch (Exception ignored) {
user = null;
}
} }
if (user != null) { if (user != null) {
CachedMetaData meta = user.getCachedData().getMetaData(); CachedMetaData meta = user.getCachedData().getMetaData();
if (meta != null) { if (meta != null) {
String p = meta.getPrefix(); String p = meta.getPrefix();
String s = meta.getSuffix(); String s = meta.getSuffix();
if (p != null) prefix = p; if (p != null) prefix = ChatColor.translateAlternateColorCodes('&', p);
if (s != null) suffix = s; if (s != null) suffix = ChatColor.translateAlternateColorCodes('&', s);
} }
} }
} }
} catch (Throwable ignored) { } catch (Throwable ignored) {}
}
if (prefix != null && !prefix.isEmpty()) prefix = ChatColor.translateAlternateColorCodes('&', prefix);
if (suffix != null && !suffix.isEmpty()) suffix = ChatColor.translateAlternateColorCodes('&', suffix);
if (prefix == null) prefix = ""; if (prefix == null) prefix = "";
if (suffix == null) suffix = ""; if (suffix == null) suffix = "";
return new String[]{prefix, suffix}; return new String[]{prefix, suffix, playerColor, chatColor};
} }
private String stripColor(String s) { private String stripColor(String s) {
@@ -462,17 +601,16 @@ public class GlobalChat extends Plugin implements Listener {
// Filter einlesen // Filter einlesen
// =========================== // ===========================
private void loadFilter() { private void loadFilter() {
File file = new File(getDataFolder(), "filter.yml"); String fileName = "filter.yml";
File file = new File(getDataFolder(), fileName);
if (!file.exists()) { if (!file.exists()) {
try { getDataFolder().mkdirs();
getDataFolder().mkdirs(); try (PrintWriter out = new PrintWriter(file)) {
file.createNewFile(); out.println("badwords:");
try (PrintWriter out = new PrintWriter(file)) { out.println(" - arsch");
out.println("badwords:"); out.println(" - hurensohn");
out.println(" - arsch"); out.println(" - scheiße");
out.println(" - hurensohn");
out.println(" - scheiße");
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -521,6 +659,9 @@ public class GlobalChat extends Plugin implements Listener {
} }
} }
// ===========================
// Staff-Check
// ===========================
private boolean isStaff(ProxiedPlayer p) { private boolean isStaff(ProxiedPlayer p) {
if (p == null) return false; if (p == null) return false;
Boolean reportedOp = playerIsOp.get(p.getUniqueId()); Boolean reportedOp = playerIsOp.get(p.getUniqueId());
@@ -540,16 +681,28 @@ public class GlobalChat extends Plugin implements Listener {
return false; return false;
} }
// Überladene Methode für CommandSender (z.B. Console für ClearChat)
private boolean isStaff(CommandSender sender) {
if (sender instanceof ProxiedPlayer) {
return isStaff((ProxiedPlayer) sender);
}
// Console ist meistens Staff
return true;
}
// =========================== // ===========================
// Commands // Commands (Inner Classes)
// =========================== // ===========================
public class ReloadCommand extends Command { public class ReloadCommand extends Command {
public ReloadCommand() { super("globalreload", "globalchat.reload"); } public ReloadCommand() { super("globalreload", "globalchat.reload"); }
@Override @Override
public void execute(CommandSender sender, String[] args) { public void execute(CommandSender sender, String[] args) {
loadFilter(); loadFilter();
loadServerAliases(); // NEU: Aliase neu laden loadConfigData();
sender.sendMessage(new TextComponent("§aFilter und Server-Aliase wurden neu geladen!")); loadServerAliases();
loadGroupFormats();
loadManualRanks(); // NEU
sender.sendMessage(new TextComponent("§aFilter, Server-Aliase, Group-Formate und UUID-Overrides wurden neu geladen!"));
} }
} }
@@ -582,11 +735,10 @@ public class GlobalChat extends Plugin implements Listener {
} }
String msg = String.join(" ", args); String msg = String.join(" ", args);
String serverRaw = player.getServer().getInfo().getName();
String serverDisplay = getDisplayName(serverRaw);
String serverName = player.getServer().getInfo().getName(); TextComponent supportMsg = new TextComponent("§7[Support] §b" + player.getName() + " §7vom Server §e" + serverDisplay + " §7: §f" + msg);
String serverDisplay = getServerDisplayName(serverName); // NEU: Alias
TextComponent supportMsg = new TextComponent("§7[Support] §b" + player.getName() + " §7vom Server §e" + serverDisplay + " §7: §f" + msg); // NEU: Display
supportMsg.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, new ComponentBuilder("Klicke, um /reply " + player.getName() + " zu schreiben").create())); supportMsg.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, new ComponentBuilder("Klicke, um /reply " + player.getName() + " zu schreiben").create()));
supportMsg.setClickEvent(new net.md_5.bungee.api.chat.ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.SUGGEST_COMMAND, "/reply " + player.getName() + " ")); supportMsg.setClickEvent(new net.md_5.bungee.api.chat.ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.SUGGEST_COMMAND, "/reply " + player.getName() + " "));
@@ -598,7 +750,7 @@ public class GlobalChat extends Plugin implements Listener {
} }
player.sendMessage(new TextComponent("§aDeine Support-Nachricht wurde gesendet.")); player.sendMessage(new TextComponent("§aDeine Support-Nachricht wurde gesendet."));
logMessage("[Support][" + serverName + "] " + player.getName() + ": " + msg); logMessage("[Support][" + serverRaw + "] " + player.getName() + ": " + msg);
} }
} }
@@ -670,4 +822,60 @@ public class GlobalChat extends Plugin implements Listener {
} }
} }
} }
public class ClearChatCommand extends Command {
public ClearChatCommand() {
super("clearchat", "globalchat.clear", "cc");
}
@Override
public void execute(CommandSender sender, String[] args) {
// Prüfen, ob der Sender OP / Team ist
if (!isStaff(sender)) {
sender.sendMessage(new TextComponent("§cKeine Berechtigung!"));
return;
}
// 100 leere Zeilen senden zum Leeren
TextComponent emptyLine = new TextComponent(" ");
for (int i = 0; i < 100; i++) {
broadcastGlobal(emptyLine);
}
// Bestätigungsnachricht
TextComponent clearMsg = new TextComponent("§7[GlobalChat] §cDer Chat wurde von " + sender.getName() + " geleert.");
broadcastGlobal(clearMsg);
sender.sendMessage(new TextComponent("§aChat wurde geleert."));
}
}
// HELPER: LuckPerms Group via Reflection
private String getLuckPermsGroup(ProxiedPlayer player) {
try {
if (getProxy().getPluginManager().getPlugin("LuckPerms") == null) return null;
Class<?> providerClass = Class.forName("net.luckperms.api.LuckPermsProvider");
Method getMethod = providerClass.getMethod("get");
Object api = getMethod.invoke(null);
if (api != null) {
Method getUserManagerMethod = api.getClass().getMethod("getUserManager");
Object userManager = getUserManagerMethod.invoke(api);
Method loadUserMethod = userManager.getClass().getMethod("loadUser", UUID.class);
Object userFuture = loadUserMethod.invoke(userManager, player.getUniqueId());
Method joinMethod = userFuture.getClass().getMethod("join");
Object user = joinMethod.invoke(userFuture);
if (user != null) {
Method getPrimaryGroupMethod = user.getClass().getMethod("getPrimaryGroup");
return (String) getPrimaryGroupMethod.invoke(user);
}
}
} catch (ClassNotFoundException e) { return null; }
catch (Exception e) { return null; }
return null;
}
} }

View File

@@ -1,20 +1,54 @@
# Plugin Informationen
name: GlobalChat name: GlobalChat
main: de.viper.globalchat.GlobalChat main: de.viper.globalchat.GlobalChat
version: 1.2 version: 1.3
author: M_Viper author: M_Viper
# ============================================
# Server Aliase mit Farben # Server Aliase mit Farben
# ============================================
# Damit im Chat schöne Namen stehen (z.B. "&aLobby")
server-aliases: server-aliases:
# Format: interner-server-name: "&farbeAnzeigename"
lobby: "&aLobby" lobby: "&aLobby"
survival: "&2Survival" survival: "&2Survival"
# bedwars: "&cBedwars" # bedwars: "&cBedwars"
# skyblock: "&bSkyblock" # skyblock: "&bSkyblock"
# ============================================
# Manuelle Ränge (Overrides) basierend auf UUID
# ============================================
# Das ist der sicherste Weg, um einem Spieler einen festen Rang zu geben.
# Da sich UUIDs nicht ändern (anders als Namen), ist dieser Override permanent.
# Syntax: <UUID>: <Gruppenname>
# Beispiel: Die UUID unten ist nur ein Beispiel. Ersetze sie durch deine UUID.
manual-ranks:
# Dein Beispiel (Ersetze die UUID):
7c7851ce-9e9f-4862-a33c-2b1d955a9362: owner
# Noch eine Beispiel-UUID:
ffffffff-ffff-ffff-ffff-ffffffffffff: admin
# ============================================
# Chat-Formate für Gruppen
# ============================================
# Syntax: Gruppenname: "Prefix || Spieler-Farbe || Chat-Farbe"
# Beispiel: Rot (Rang) || Blau (Name) || Lila (Chat)
#
# Trennzeichen ist das doppelte Pipe-Zeichen mit Leerzeichen: " || "
#
group-formats:
owner: "&c[Owner] || &b || &d"
admin: "&4[Admin] || &9 || &c"
developer: "&b[Dev] || &3 || &a"
premium: "&6[Premium] || &e || &7"
spieler: "&f[Spieler] || &7 || &8"
# ============================================
# Befehle Definitionen
# ============================================
commands: commands:
globalreload: globalreload:
description: Lädt den Filter neu description: Lädt den Filter und Formate neu
usage: /globalreload usage: /globalreload
permission: globalchat.reload permission: globalchat.reload
globalmute: globalmute:
@@ -31,9 +65,12 @@ commands:
description: Zeigt Plugin-Informationen an description: Zeigt Plugin-Informationen an
usage: /info usage: /info
# ============================================
# Permissions
# ============================================
permissions: permissions:
globalchat.reload: globalchat.reload:
description: Erlaubt das Neuladen des Filters description: Erlaubt das Neuladen des Filters und der Formate
default: op default: op
globalchat.mute: globalchat.mute:
description: Erlaubt das Aktivieren/Deaktivieren des globalen Mutes description: Erlaubt das Aktivieren/Deaktivieren des globalen Mutes

View File

@@ -1,6 +1,6 @@
name: GlobalChatSpigot name: GlobalChatSpigot
main: de.viper.globalchat.GlobalChatSpigot main: de.viper.globalchat.GlobalChatSpigot
version: 1.1 version: 1.5
api-version: 1.13 api-version: 1.13
description: Spigot helper for GlobalChat Bungee (sends coords, handles teleport requests) description: Spigot helper for GlobalChat Bungee (sends coords, handles teleport requests)
authors: [M_Viper] authors: [M_Viper]