Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 581d580f05 | |||
| e4d477042c | |||
| aa0f861d11 | |||
| 8347a60335 | |||
| e6fbd908e7 | |||
| 3f80c0eb1e | |||
| c02866809c |
33
README.md
33
README.md
@@ -6,17 +6,20 @@ Ein leistungsfähiges BungeeCord-Plugin für globalen Chat, Support-Nachrichten
|
||||
|
||||
## ⚠️ WICHTIGER HINWEIS
|
||||
|
||||
**Die Kernfunktionalität des GlobalChat wurde in die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) integriert.**
|
||||
**Die Kernfunktionalität des GlobalChat wurde in die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) integriert.** wenn die nur den Chat nutzen möchten können sie auch die GlobalChat herunterladen.
|
||||
**Download**: [GlobalChat](https://git.viper.ipv64.net/M_Viper/GlobalChat)
|
||||
|
||||
Dieses Plugin (**GlobalChat Suppressor**) dient ab sofort **nur noch als Schnittstelle** für die Unterserver (Spigot/Paper) und leitet die Nachrichten an die StatusAPI weiter. Die Befehle und Funktionen können wie gewohnt weiterverwendet werden.
|
||||
|
||||
### Was bedeutet das?
|
||||
|
||||
- **StatusAPI MUSS installiert sein:** Ohne die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) auf deinem BungeeCord funktioniert der GlobalChat nicht mehr.
|
||||
- **GlobalChat Suppressor:** Dieses Plugin bleibt auf den Unterservern aktiv und kommuniziert mit der StatusAPI.
|
||||
- **StatusAPI oder GlobalChat MUSS installiert sein:** Ohne die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) oder [GlobalChat](https://git.viper.ipv64.net/M_Viper/GlobalChat) auf deinem BungeeCord funktioniert der GlobalChat nicht.
|
||||
- **GlobalChat Suppressor:** Dieses Plugin bleibt auf den Unterservern aktiv und kommuniziert mit der StatusAPI oder mit GlobalChat.
|
||||
- **Zentrale Verwaltung:** Alle Chat-Funktionen, Badword-Filter und Support-Nachrichten werden nun zentral über die StatusAPI verwaltet.
|
||||
|
||||
**Download StatusAPI:** [https://git.viper.ipv64.net/M_Viper/StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI)
|
||||
**Download StatusAPI:** [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI)
|
||||
|
||||
**Download GlobalChat**: [GlobalChat](https://git.viper.ipv64.net/M_Viper/GlobalChat)
|
||||
|
||||
---
|
||||
|
||||
@@ -48,12 +51,11 @@ Dieses Plugin (**GlobalChat Suppressor**) dient ab sofort **nur noch als Schnitt
|
||||
|
||||
### Voraussetzung: StatusAPI
|
||||
|
||||
⚠️ **Die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) MUSS auf deinem BungeeCord-Server installiert sein!**
|
||||
⚠️ **Die [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) oder [GlobalChat](https://git.viper.ipv64.net/M_Viper/GlobalChat) MUSS auf deinem BungeeCord-Server installiert sein!**
|
||||
```text
|
||||
BungeeCord/
|
||||
├─ plugins/
|
||||
│ ├─ StatusAPI.jar ← PFLICHT
|
||||
│ └─ GlobalChat-Bungee.jar ← Optional (nur für BungeeCord)
|
||||
│ ├─ StatusAPI.jar oder GlobalChat.jar ← PFLICHT
|
||||
```
|
||||
|
||||
### Schritt-für-Schritt
|
||||
@@ -94,7 +96,7 @@ Neue Badwords können einfach hinzugefügt werden. Das Plugin muss nach Änderun
|
||||
## Architektur
|
||||
```text
|
||||
BungeeCord
|
||||
└─ StatusAPI (Hauptlogik, Befehle, Filter, Logs)
|
||||
└─ StatusAPI oder GlobalChat (Hauptlogik, Befehle, Filter, Logs)
|
||||
|
||||
Unterserver (Spigot/Paper)
|
||||
└─ GlobalChat Suppressor (Schnittstelle, leitet an StatusAPI weiter)
|
||||
@@ -102,17 +104,6 @@ Unterserver (Spigot/Paper)
|
||||
|
||||
---
|
||||
|
||||
## Migration von alter Version
|
||||
|
||||
Wenn du eine ältere Version des GlobalChat verwendest:
|
||||
|
||||
1. Installiere die neue [StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI) auf BungeeCord
|
||||
2. Kopiere deine `filter.yml` in den StatusAPI-Ordner
|
||||
3. Ersetze das alte GlobalChat-Plugin auf den Unterservern mit dem neuen GlobalChat Suppressor
|
||||
4. Starte alle Server neu
|
||||
|
||||
---
|
||||
|
||||
## Lizenz
|
||||
|
||||
Dieses Plugin ist **proprietär** und darf nicht ohne Erlaubnis des Autors verbreitet oder verändert werden.
|
||||
@@ -122,4 +113,6 @@ Dieses Plugin ist **proprietär** und darf nicht ohne Erlaubnis des Autors verbr
|
||||
## Support & Weitere Informationen
|
||||
|
||||
Für detaillierte Informationen zur StatusAPI und deren Konfiguration:
|
||||
**[https://git.viper.ipv64.net/M_Viper/StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI)**
|
||||
**[StatusAPI](https://git.viper.ipv64.net/M_Viper/StatusAPI)**
|
||||
|
||||
**[GlobalChat](https://git.viper.ipv64.net/M_Viper/GlobalChat)**
|
||||
104
pom.xml
104
pom.xml
@@ -1,42 +1,62 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
||||
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>de.viper.globalchat</groupId>
|
||||
<artifactId>GlobalChatSuppressor</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>GlobalChatSuppressor</name>
|
||||
|
||||
<properties>
|
||||
<java.version>17</java.version>
|
||||
<spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>${spigot.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
||||
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>de.viper.globalchat</groupId>
|
||||
<artifactId>GlobalChatSuppressor</artifactId>
|
||||
<version>1.2</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>GlobalChatSuppressor</name>
|
||||
|
||||
<properties>
|
||||
<java.version>17</java.version>
|
||||
<spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
|
||||
</properties>
|
||||
|
||||
<!-- HINZUGEFÜGT: Repositories, damit Maven die Libs findet -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>spigot-repo</id>
|
||||
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>sonatype</id>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>${spigot.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- HINZUGEFÜGT: Die Dependency für ComponentSerializer -->
|
||||
<dependency>
|
||||
<groupId>net.md-5</groupId>
|
||||
<artifactId>bungeecord-chat</artifactId>
|
||||
<version>1.20-R0.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -1,79 +1,112 @@
|
||||
package de.viper.globalchat.suppressor;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.plugin.messaging.PluginMessageListener;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public class GlobalChatSuppressor extends JavaPlugin implements PluginMessageListener, Listener {
|
||||
|
||||
private static final String CHANNEL = "global:control";
|
||||
private final Set<UUID> suppressJoinQuit = new HashSet<>();
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, this);
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, CHANNEL);
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
getLogger().info("GlobalChatSuppressor aktiviert!");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
getServer().getMessenger().unregisterIncomingPluginChannel(this, CHANNEL);
|
||||
getServer().getMessenger().unregisterOutgoingPluginChannel(this, CHANNEL);
|
||||
getLogger().info("GlobalChatSuppressor deaktiviert!");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPluginMessageReceived(String channel, Player player, byte[] message) {
|
||||
if (!channel.equals(CHANNEL)) return;
|
||||
|
||||
try (DataInputStream in = new DataInputStream(new ByteArrayInputStream(message))) {
|
||||
String subChannel = in.readUTF();
|
||||
if ("suppress".equalsIgnoreCase(subChannel)) {
|
||||
String uuidStr = in.readUTF();
|
||||
UUID playerUUID = UUID.fromString(uuidStr);
|
||||
suppressJoinQuit.add(playerUUID);
|
||||
getLogger().info("Suppress für Spieler UUID: " + playerUUID + " aktiviert.");
|
||||
// Entferne die Unterdrückung nach 2 Sekunden (synchron mit BungeeCord)
|
||||
getServer().getScheduler().runTaskLater(this, () -> {
|
||||
suppressJoinQuit.remove(playerUUID);
|
||||
getLogger().info("Suppress für Spieler UUID: " + playerUUID + " entfernt.");
|
||||
}, 40L); // 40 Ticks = 2 Sekunden
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (suppressJoinQuit.contains(player.getUniqueId())) {
|
||||
event.setJoinMessage(null);
|
||||
getLogger().info("Join-Nachricht für " + player.getName() + " unterdrückt.");
|
||||
suppressJoinQuit.remove(player.getUniqueId());
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (suppressJoinQuit.contains(player.getUniqueId())) {
|
||||
event.setQuitMessage(null);
|
||||
getLogger().info("Quit-Nachricht für " + player.getName() + " unterdrückt.");
|
||||
suppressJoinQuit.remove(player.getUniqueId());
|
||||
}
|
||||
}
|
||||
package de.viper.globalchat.suppressor;
|
||||
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.chat.ComponentSerializer;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.plugin.messaging.PluginMessageListener;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public class GlobalChatSuppressor extends JavaPlugin implements PluginMessageListener, Listener {
|
||||
|
||||
private static final String CHANNEL_CONTROL = "global:control";
|
||||
private static final String CHANNEL_CHAT = "global:chat"; // NEU: Kanal für Chat Relay
|
||||
|
||||
private final Set<UUID> suppressJoinQuit = new HashSet<>();
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
// Incoming Channels (Daten von BungeeCord)
|
||||
getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL_CONTROL, this);
|
||||
getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL_CHAT, this);
|
||||
|
||||
// Outgoing Channels (Daten zu BungeeCord)
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, CHANNEL_CONTROL);
|
||||
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
getLogger().info("GlobalChatSuppressor aktiviert (Chat Relay included)!");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
getServer().getMessenger().unregisterIncomingPluginChannel(this, CHANNEL_CONTROL);
|
||||
getServer().getMessenger().unregisterIncomingPluginChannel(this, CHANNEL_CHAT);
|
||||
getServer().getMessenger().unregisterOutgoingPluginChannel(this, CHANNEL_CONTROL);
|
||||
getLogger().info("GlobalChatSuppressor deaktiviert!");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPluginMessageReceived(String channel, Player player, byte[] message) {
|
||||
if (!channel.equals(CHANNEL_CONTROL) && !channel.equals(CHANNEL_CHAT)) return;
|
||||
|
||||
try {
|
||||
String data = new String(message, StandardCharsets.UTF_8);
|
||||
|
||||
if (channel.equals(CHANNEL_CHAT)) {
|
||||
// ==========================================
|
||||
// NEU: GLOBAL CHAT RELAY LOGIK
|
||||
// ==========================================
|
||||
// Wir empfangen JSON von BungeeCord.
|
||||
BaseComponent[] components = ComponentSerializer.parse(data);
|
||||
|
||||
// An alle Spieler auf diesem Server senden.
|
||||
// Da dies eine Server-Nachricht ist, bricht sie die Secure Chain nicht.
|
||||
// Auch der Spieler selbst sieht sie.
|
||||
for (Player all : Bukkit.getOnlinePlayers()) {
|
||||
all.spigot().sendMessage(components);
|
||||
}
|
||||
// ==========================================
|
||||
|
||||
} else if (channel.equals(CHANNEL_CONTROL)) {
|
||||
// Alte Suppress Logik (Join/Quit)
|
||||
try (DataInputStream in = new DataInputStream(new ByteArrayInputStream(message))) {
|
||||
String subChannel = in.readUTF();
|
||||
if ("suppress".equalsIgnoreCase(subChannel)) {
|
||||
String uuidStr = in.readUTF();
|
||||
UUID playerUUID = UUID.fromString(uuidStr);
|
||||
suppressJoinQuit.add(playerUUID);
|
||||
getLogger().info("Suppress für Spieler UUID: " + playerUUID + " aktiviert.");
|
||||
getServer().getScheduler().runTaskLater(this, () -> {
|
||||
suppressJoinQuit.remove(playerUUID);
|
||||
getLogger().info("Suppress für Spieler UUID: " + playerUUID + " entfernt.");
|
||||
}, 40L);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (suppressJoinQuit.contains(player.getUniqueId())) {
|
||||
event.setJoinMessage(null);
|
||||
getLogger().info("Join-Nachricht für " + player.getName() + " unterdrückt.");
|
||||
suppressJoinQuit.remove(player.getUniqueId());
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (suppressJoinQuit.contains(player.getUniqueId())) {
|
||||
event.setQuitMessage(null);
|
||||
getLogger().info("Quit-Nachricht für " + player.getName() + " unterdrückt.");
|
||||
suppressJoinQuit.remove(player.getUniqueId());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
name: GlobalChatSuppressor
|
||||
version: 1.0.0
|
||||
main: de.viper.globalchat.suppressor.GlobalChatSuppressor
|
||||
api-version: 1.21
|
||||
author: M_Viper
|
||||
commands: {}
|
||||
name: GlobalChatSuppressor
|
||||
version: 1.2
|
||||
main: de.viper.globalchat.suppressor.GlobalChatSuppressor
|
||||
api-version: 1.21
|
||||
author: M_Viper
|
||||
commands: {}
|
||||
|
||||
Reference in New Issue
Block a user