Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 57a426a9c9 | |||
| 135d8b0fb3 | |||
| 31c7a33cbb | |||
| 301c0f1ce9 | |||
| 7ede377c07 | |||
| 834bd0e5e4 | |||
| f4bedaa288 | |||
| 8e7533a214 | |||
| b7de357e81 | |||
| a91e17a097 | |||
| 12c9379797 | |||
| 535b0aa2f3 |
275
README.md
275
README.md
@@ -2,146 +2,217 @@
|
||||
|
||||
  
|
||||
|
||||
**TicketSystem** ist das flexible, moderne Support- und Feedback-Plugin für Minecraft-Server. Es bietet flexible Speicherung (MySQL oder Datei), automatische Archivierung, Migration, Export/Import, Statistiken, vollständige Validierung, Debug-Modus, eine übersichtliche config.yml mit Versionsprüfung und eine dynamische GUI.
|
||||
**TicketSystem** ist das flexible, moderne Support- und Feedback-Plugin für Minecraft-Server (Spigot/Paper 1.18.x–1.21.x, Java 17+). Es bietet flexible Speicherung, automatische Backups & Migration, Export/Import, Statistiken, dynamische GUI, Kategorie- und Prioritäten-System, Bewertungs- und Kommentar-System, Discord-Webhook und volle BungeeCord-Unterstützung.
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
- **MySQL oder Datei-Speicherung** – YAML/JSON oder MySQL/MariaDB, jederzeit umschaltbar, Migration & Backup inklusive
|
||||
- **Automatische Backups & Migration** – Sicheres Wechseln zwischen Speicherarten, Datenverlust ausgeschlossen
|
||||
- **Export/Import** – Tickets einfach zwischen Servern oder Instanzen übertragen
|
||||
- **Statistiken & Archivierung** – Übersichtliche Auswertung, automatische Archivierung nach Zeitplan, manuelles Archivieren möglich
|
||||
- **Rollenbasierter Archiv-Zugriff** – Nur Spieler mit `ticket.archive` können das Archiv sehen, öffnen und Tickets permanent löschen – unabhängig von `ticket.admin` oder OP-Status
|
||||
- **Konfigurierbare Speicherpfade** – Daten- und Archivdateien frei wählbar, auch absolute Pfade
|
||||
- **Vollständige Validierung** – Fehlerhafte Tickets werden beim Laden erkannt, gemeldet und übersprungen
|
||||
- **Bessere Fehlerausgaben** – Alle Fehler erscheinen im Log und für Admins im Chat, inkl. Validierungs- und Speicherfehler
|
||||
- **Debug-Modus & Versionsprüfung** – Für Entwickler und Admins, erkennt veraltete config.yml automatisch
|
||||
- **Komplett anpassbar** – Nachrichten, Farben, Limits, Speicherpfade, Archiv-Intervall, Cooldowns, Rechte
|
||||
- **Unit-Tests** – Getestete Speicher-Logik für maximale Zuverlässigkeit
|
||||
- **Dynamische GUI** – Die Ticket-GUI passt sich automatisch der Ticketanzahl an (bis zu 54 Tickets pro Seite)
|
||||
- **Seiten-System** – Bei sehr vielen Tickets wird automatisch geblättert
|
||||
- **Performance** – Optimiert für große Server, alle Operationen laufen asynchron und ressourcenschonend
|
||||
- **Support & Erweiterbarkeit** – Sauberer Code, viele Hooks für eigene Erweiterungen
|
||||
- MySQL oder Datei-Speicherung (YAML/JSON oder MySQL/MariaDB, jederzeit umschaltbar)
|
||||
- Automatische Backups & Migration
|
||||
- Export/Import von Tickets
|
||||
- Statistiken & Archivierung
|
||||
- Rollenbasierter Archiv-Zugriff
|
||||
- Konfigurierbare Speicherpfade
|
||||
- Vollständige Validierung & Fehlerausgaben
|
||||
- Debug-Modus & Versionsprüfung
|
||||
- Anpassbare Nachrichten, Farben, Limits, Speicherpfade, Archiv-Intervall, Cooldowns, Rechte
|
||||
- Dynamische GUI mit Seiten-System
|
||||
- Kategorie- und Prioritäten-System
|
||||
- Bewertungs- und Kommentar-System
|
||||
- Offline-Benachrichtigungen
|
||||
- Discord-Webhook mit Embeds & Rollen-Ping
|
||||
- Blacklist für Spieler
|
||||
- Performance: asynchron, ressourcenschonend
|
||||
- Erweiterbarkeit: viele Hooks
|
||||
- **BungeeCord-Unterstützung**: serverübergreifende Tickets, Teleports, Weiterleitungen, Benachrichtigungen
|
||||
|
||||
---
|
||||
|
||||
## Installation & Setup
|
||||
|
||||
1. **config.yml** anpassen (Speicherorte, Nachrichten, Limits, Farben, MySQL-Daten etc.)
|
||||
2. **TicketSystem.jar** in den plugins-Ordner legen und Server starten
|
||||
3. **/ticket**-Befehle nutzen (siehe unten)
|
||||
|
||||
---
|
||||
|
||||
## Beispiel-Konfiguration
|
||||
|
||||
```yaml
|
||||
config-version: 1
|
||||
debug: false
|
||||
storage:
|
||||
type: "file" # "file" oder "mysql"
|
||||
data-file: "data.yml"
|
||||
archive-file: "archive.yml"
|
||||
mysql:
|
||||
host: "localhost"
|
||||
port: 3306
|
||||
database: "tickets"
|
||||
user: "root"
|
||||
password: "password"
|
||||
useSSL: false
|
||||
auto-archive-interval-hours: 24
|
||||
messages:
|
||||
prefix: "&7[&eTicket&7]"
|
||||
ticket-created: "&aDein Ticket wurde erstellt!"
|
||||
error: "&cEin Fehler ist aufgetreten!"
|
||||
```
|
||||
1. TicketSystem.jar in den plugins-Ordner legen und Server starten
|
||||
2. config.yml anpassen (Speicherorte, Nachrichten, Limits, Farben, MySQL-Daten etc.)
|
||||
3. /ticket-Befehle nutzen
|
||||
|
||||
---
|
||||
|
||||
## Befehle & Rechte
|
||||
|
||||
### Spieler-Befehle
|
||||
### Übersicht der Befehle
|
||||
|
||||
```
|
||||
/ticket - Ticket erstellen, verwalten, Status abfragen
|
||||
/ticket create <Nachricht> - Neues Ticket erstellen
|
||||
/ticket list - Zeigt alle Tickets des Spielers
|
||||
/ticket close <ID> - Ticket schließen
|
||||
```
|
||||
| Befehl | Beschreibung | Nutzergruppe |
|
||||
|-------------------------------------|---------------------------------------------------|----------------------|
|
||||
| /ticket | Hilfe & Übersicht | Spieler, Support |
|
||||
| /ticket create [Kategorie] [Priorität] <Text> | Ticket erstellen | Spieler |
|
||||
| /ticket list | Eigene Tickets in der GUI anzeigen | Spieler |
|
||||
| /ticket comment <ID> <Nachricht> | Kommentar hinzufügen | Spieler, Support |
|
||||
| /ticket rate <ID> <good|bad> | Support bewerten | Spieler |
|
||||
| /ticket claim <ID> | Ticket annehmen | Support/Admin |
|
||||
| /ticket close <ID> [Kommentar] | Ticket schließen | Support/Admin |
|
||||
| /ticket forward <ID> <Spieler> | Ticket weiterleiten | Support/Admin |
|
||||
| /ticket setpriority <ID> <low|normal|high|urgent> | Priorität ändern | Support/Admin |
|
||||
| /ticket reload | Konfiguration neu laden | Support/Admin |
|
||||
| /ticket stats | Statistiken anzeigen | Support/Admin |
|
||||
| /ticket archive | Tickets archivieren | Support/Admin |
|
||||
| /ticket blacklist <add|remove|list> [Spieler] [Grund] | Blacklist verwalten | Support/Admin |
|
||||
| /ticket migrate <tomysql|tofile> | Speicherart wechseln | Support/Admin |
|
||||
| /ticket export <Dateiname> | Tickets exportieren | Support/Admin |
|
||||
| /ticket import <Dateiname> | Tickets importieren | Support/Admin |
|
||||
| /ticket teleport <ID> | Teleport zu Ticket (BungeeCord) | Support/Admin |
|
||||
|
||||
### Admin-Befehle
|
||||
### Rechte
|
||||
|
||||
```
|
||||
/ticket reload - Plugin neu laden
|
||||
/ticket migrate - Speicherart wechseln (Migration)
|
||||
/ticket export/import - Tickets exportieren/importieren
|
||||
/ticket stats - Statistiken anzeigen
|
||||
/ticket archive - Tickets archivieren
|
||||
/ticket claim <ID> - Ticket übernehmen
|
||||
/ticket forward <ID> <Spieler> - Ticket weiterleiten
|
||||
/ticket close <ID> - Ticket schließen
|
||||
```
|
||||
| Permission | Beschreibung | Standard |
|
||||
|-------------------|---------------------------------------------------|------------------|
|
||||
| ticket.create | Ticket erstellen | alle Spieler |
|
||||
| ticket.support | Tickets einsehen, claimen, schließen, Priorität | manuell vergeben |
|
||||
| ticket.archive | Archiv öffnen, Tickets löschen | manuell vergeben |
|
||||
| ticket.admin | Voller Zugriff (inkl. Weiterleitung, Reload, Blacklist) | OP |
|
||||
|
||||
### Permissions
|
||||
> ticket.archive ist nicht in ticket.admin enthalten und muss explizit vergeben werden.
|
||||
|
||||
| Permission | Beschreibung | Standard |
|
||||
|---|---|---|
|
||||
| `ticket.create` | Ticket erstellen | ✅ alle Spieler |
|
||||
| `ticket.support` | Tickets einsehen, claimen & schließen | ❌ manuell vergeben |
|
||||
| `ticket.archive` | Archiv öffnen, einsehen & Tickets permanent löschen | ❌ manuell vergeben |
|
||||
| `ticket.admin` | Voller Zugriff inkl. Weiterleitung & Reload (beinhaltet `ticket.support`) | OP |
|
||||
---
|
||||
|
||||
> ⚠️ **Wichtig:** `ticket.archive` ist bewusst **nicht** in `ticket.admin` enthalten und wird auch **nicht automatisch an OPs vergeben**. Das Archiv-Recht muss explizit zugewiesen werden:
|
||||
> ```
|
||||
> /lp user <Spielername> permission set ticket.archive true
|
||||
> ```
|
||||
## Kategorie & Priorität
|
||||
|
||||
Beim Erstellen eines Tickets können Kategorie und Priorität optional angegeben werden. Die folgende Tabelle zeigt die Möglichkeiten und Beispiele:
|
||||
|
||||
| Befehl | Kategorie | Priorität |
|
||||
|----------------------------------------|-------------|-----------|
|
||||
| /ticket create <Text> | Standard | NORMAL |
|
||||
| /ticket create bug <Text> | Bug | NORMAL |
|
||||
| /ticket create high <Text> | Standard | HIGH |
|
||||
| /ticket create bug high <Text> | Bug | HIGH |
|
||||
| /ticket create question urgent <Text> | Frage | URGENT |
|
||||
|
||||
**Verfügbare Prioritäten:**
|
||||
- low
|
||||
- normal
|
||||
- high
|
||||
- urgent
|
||||
|
||||
(auch deutsch: niedrig, hoch, dringend)
|
||||
|
||||
**Kategorien und Aliases** sind frei in der config.yml konfigurierbar.
|
||||
|
||||
---
|
||||
|
||||
## Discord-Webhook
|
||||
|
||||
- Embeds mit Kategorie & Priorität
|
||||
- Rollen-Ping pro Nachrichtentyp
|
||||
- Drei Ereignisse: neues Ticket, Ticket geschlossen, Ticket weitergeleitet
|
||||
|
||||
Konfiguration in config.yml:
|
||||
|
||||
discord:
|
||||
enabled: true
|
||||
webhook-url: "https://discord.com/api/webhooks/..."
|
||||
role-ping-id: "123456789012345678"
|
||||
messages:
|
||||
new-ticket:
|
||||
role-ping: true
|
||||
show-category: true
|
||||
show-priority: true
|
||||
ticket-closed:
|
||||
enabled: true
|
||||
role-ping: false
|
||||
|
||||
---
|
||||
|
||||
## BungeeCord-Unterstützung
|
||||
|
||||
TicketSystem bietet volle Unterstützung für BungeeCord-Netzwerke:
|
||||
|
||||
- Tickets von jedem Server im Netzwerk
|
||||
- Teleport zu Tickets auf anderen Servern (/ticket teleport <ID>)
|
||||
- Tickets im Archiv und GUI serverübergreifend
|
||||
- Benachrichtigungen an alle Server
|
||||
- Discord-Webhooks zeigen Server-Namen
|
||||
- Tickets an Supporter auf anderen Servern weiterleiten
|
||||
- Teleport funktioniert auch zwischen Servern
|
||||
|
||||
**Voraussetzungen:**
|
||||
- spigot.yml: bungeecord: true
|
||||
- config.yml: bungeecord: true, server-name pro Server
|
||||
- TicketSystem.jar auf allen Spigot-Servern
|
||||
- Alle Server nutzen dieselbe MySQL-Datenbank
|
||||
|
||||
**Cross-Server-Befehle:**
|
||||
- /ticket teleport <ID>
|
||||
- /ticket forward <ID> <Spieler>
|
||||
- /ticket archive
|
||||
- /ticket list
|
||||
|
||||
**Tipps:**
|
||||
- Server-Name erscheint in GUI & Discord
|
||||
- Zielspieler muss online sein
|
||||
- Funktionen auch im Einzelserver-Modus
|
||||
- Bei Problemen: gleiche MySQL, Kanäle in plugin.yml prüfen
|
||||
|
||||
---
|
||||
|
||||
## Vergleich mit anderen Plugins
|
||||
|
||||
TicketSystem hebt sich durch viele Alleinstellungsmerkmale von anderen Ticket-Plugins ab. Die folgende Tabelle zeigt die wichtigsten Unterschiede:
|
||||
|
||||
| Feature | TicketSystem | SimpleTickets | AdvancedTickets |
|
||||
|-------------------------|:------------:|:-------------:|:---------------:|
|
||||
| Speicher-Migration | ✔️ | ⚠️ | ✖️ |
|
||||
| Automatische Backups | ✔️ | ⚠️ | ✖️ |
|
||||
| GUI mit Kategorien | ✔️ | ⚠️ | ✖️ |
|
||||
| Archivierung | ✔️ | ⚠️ | ✖️ |
|
||||
| Rollenbasierter Archiv | ✔️ | ✖️ | ✖️ |
|
||||
| Kategorie-System | ✔️ | ✖️ | ✖️ |
|
||||
| Prioritäten-System | ✔️ | ✖️ | ✖️ |
|
||||
| Offline-Benachrichtigungen| ✔️ | ✖️ | ✖️ |
|
||||
| Discord-Webhook | ✔️ | ✖️ | ✖️ |
|
||||
| Bewertungs-System | ✔️ | ✖️ | ✖️ |
|
||||
| Update-Checker | ✔️ | ✖️ | ✖️ |
|
||||
| BungeeCord-Unterstützung | ✔️ | ✖️ | ✖️ |
|
||||
|
||||
Legende:
|
||||
- ✔️ = Vollständige Unterstützung
|
||||
- ⚠️ = Eingeschränkte oder fehleranfällige Unterstützung
|
||||
- ✖️ = Nicht vorhanden
|
||||
|
||||
---
|
||||
|
||||
## FAQ
|
||||
|
||||
**Kann ich zwischen MySQL und Datei-Speicherung wechseln?**
|
||||
> Ja! Das Plugin migriert alle Daten automatisch und sicher.
|
||||
> Ja! Mit /ticket migrate tomysql oder /ticket migrate tofile werden alle Daten automatisch migriert.
|
||||
|
||||
**Wie viele Tickets passen in die GUI?**
|
||||
> Bis zu 54 pro Seite, bei mehr Tickets wird automatisch geblättert.
|
||||
**Wie konfiguriere ich eigene Kategorien?**
|
||||
> In der config.yml unter categories: Name, Farbe, Material und Aliases frei wählbar. Änderungen mit /ticket reload übernehmen.
|
||||
|
||||
**Wie kann ich Nachrichten und Limits anpassen?**
|
||||
> Alle Texte, Farben und Limits findest du in der `config.yml`.
|
||||
**Was passiert mit Benachrichtigungen wenn ein Spieler offline ist?**
|
||||
> Alle Benachrichtigungen werden gespeichert und beim nächsten Login angezeigt.
|
||||
|
||||
**Wie ändere ich die Priorität eines Tickets?**
|
||||
> Als Support/Admin per Befehl /ticket setpriority <ID> <Priorität> oder direkt in der GUI.
|
||||
|
||||
**Wie aktiviere ich den Debug-Modus?**
|
||||
> Setze `debug: true` in der `config.yml`.
|
||||
|
||||
**Wie kann ich Tickets exportieren/importieren?**
|
||||
> Mit `/ticket export` und `/ticket import` – ideal für Server-Umzüge.
|
||||
> debug: true in der config.yml setzen.
|
||||
|
||||
**Wer darf das Ticket-Archiv sehen?**
|
||||
> Nur Spieler mit der Permission `ticket.archive`. Diese wird weder automatisch an OPs noch an Admins vergeben und muss explizit zugewiesen werden.
|
||||
> Nur Spieler mit ticket.archive. Muss explizit vergeben werden.
|
||||
|
||||
**Wie funktioniert Teleport bei BungeeCord?**
|
||||
> Mit /ticket teleport <ID> wirst du automatisch auf den richtigen Server und zur Ticket-Position teleportiert.
|
||||
|
||||
---
|
||||
|
||||
## Vergleich mit anderen Plugins
|
||||
## Support, Community & Motivation
|
||||
|
||||
| Feature | TicketSystem | SimpleTickets | AdvancedTickets |
|
||||
|----------------------------------|:------------:|:-------------:|:---------------:|
|
||||
| Speicher-Migration | ✔️ | ⚠️ | ✖️ |
|
||||
| Automatische Backups | ✔️ | ⚠️ | ✖️ |
|
||||
| GUI | ✔️ | ⚠️ | ✖️ |
|
||||
| Archivierung | ✔️ | ⚠️ | ✖️ |
|
||||
| Rollenbasierter Archiv-Zugriff | ✔️ | ✖️ | ✖️ |
|
||||
| Update-Checker | ✔️ | ✖️ | ✖️ |
|
||||
|
||||
---
|
||||
|
||||
## Support & Community
|
||||
Du hast Fragen, brauchst Hilfe oder möchtest Feedback geben?
|
||||
|
||||
- [Discord Support](https://discord.com/invite/FdRs4BRd8D)
|
||||
- [Git Issues](https://git.viper.ipv64.net/M_Viper/TicketSystem/issues)
|
||||
|
||||
Wir antworten in der Regel innerhalb von 24 Stunden!
|
||||
|
||||
---
|
||||
|
||||
## ⭐ Unterstütze das Projekt
|
||||
|
||||
Wenn TicketSystem deinen Server bereichert hat, freuen wir uns über eine **5-Sterne Bewertung auf spigotmc**!
|
||||
Dein Feedback hilft uns, das Plugin weiter zu verbessern.
|
||||
**Dein Feedback zählt:**
|
||||
Wenn TicketSystem deinen Server bereichert hat, freuen wir uns über eine 5-Sterne Bewertung auf SpigotMC!
|
||||
Jede Rückmeldung hilft, das Plugin weiter zu verbessern und die Community zu stärken.
|
||||
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>de.ticketsystem</groupId>
|
||||
<artifactId>TicketSystem</artifactId>
|
||||
<version>1.0.2</version>
|
||||
<version>1.0.5</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>TicketSystem</name>
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package de.ticketsystem;
|
||||
|
||||
import de.ticketsystem.bungee.BungeeMessenger;
|
||||
import de.ticketsystem.commands.TicketCommand;
|
||||
import de.ticketsystem.database.DatabaseManager;
|
||||
import de.ticketsystem.discord.DiscordWebhook;
|
||||
import de.ticketsystem.gui.TicketGUI;
|
||||
import de.ticketsystem.listeners.PlayerJoinListener;
|
||||
import de.ticketsystem.manager.CategoryManager;
|
||||
import de.ticketsystem.manager.TicketManager;
|
||||
// WICHTIG: Import hinzugefügt
|
||||
import de.ticketsystem.model.Ticket;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
@@ -18,10 +19,20 @@ public class TicketPlugin extends JavaPlugin {
|
||||
private static TicketPlugin instance;
|
||||
|
||||
private boolean debug;
|
||||
private DatabaseManager databaseManager;
|
||||
private TicketManager ticketManager;
|
||||
private TicketGUI ticketGUI;
|
||||
private DiscordWebhook discordWebhook;
|
||||
|
||||
/**
|
||||
* Name dieses Servers im BungeeCord-Netzwerk.
|
||||
* Konfigurierbar in config.yml → server-name
|
||||
* Wird in Tickets gespeichert und in Benachrichtigungen angezeigt.
|
||||
*/
|
||||
private String serverName;
|
||||
|
||||
private DatabaseManager databaseManager;
|
||||
private TicketManager ticketManager;
|
||||
private CategoryManager categoryManager;
|
||||
private TicketGUI ticketGUI;
|
||||
private DiscordWebhook discordWebhook;
|
||||
private BungeeMessenger bungeeMessenger;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
@@ -29,9 +40,35 @@ public class TicketPlugin extends JavaPlugin {
|
||||
|
||||
saveDefaultConfig();
|
||||
|
||||
// --- WICHTIG: Ticket-Klasse registrieren ---
|
||||
// Ticket-Klasse für YAML-Serialisierung registrieren
|
||||
Ticket.register();
|
||||
// -------------------------------------------
|
||||
|
||||
// ── BungeeCord Plugin-Messaging-Kanäle registrieren ───────────────
|
||||
// Ausgehend: BungeeCord-Standardkanal (für Forward / Message)
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, BungeeMessenger.BUNGEE_CHANNEL);
|
||||
// Eingehend & Ausgehend: Eigener Kanal für Team- und Spielerbenachrichtigungen
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, BungeeMessenger.CUSTOM_CHANNEL);
|
||||
|
||||
bungeeMessenger = new BungeeMessenger(this);
|
||||
getServer().getMessenger().registerIncomingPluginChannel(this, BungeeMessenger.CUSTOM_CHANNEL, bungeeMessenger);
|
||||
|
||||
// Server-Name aus Config lesen
|
||||
serverName = getConfig().getString("server-name", "unknown");
|
||||
if ("unknown".equals(serverName)) {
|
||||
getLogger().warning("[BungeeCord] Kein 'server-name' in der config.yml definiert! " +
|
||||
"Setze 'server-name: dein-server' für korrekte Cross-Server-Anzeige.");
|
||||
} else {
|
||||
getLogger().info("[BungeeCord] Server-Name: §e" + serverName);
|
||||
}
|
||||
|
||||
// BungeeCord-Hinweis prüfen
|
||||
if (!getConfig().getBoolean("bungeecord", false)) {
|
||||
getLogger().info("[BungeeCord] Hinweis: Cross-Server-Features sind deaktiviert. " +
|
||||
"Setze 'bungeecord: true' in der config.yml und stelle sicher, " +
|
||||
"dass 'bungeecord: true' auch in spigot.yml gesetzt ist.");
|
||||
} else {
|
||||
getLogger().info("[BungeeCord] Cross-Server-Benachrichtigungen aktiviert.");
|
||||
}
|
||||
|
||||
// Update-Checker
|
||||
int resourceId = 132757;
|
||||
@@ -68,9 +105,10 @@ public class TicketPlugin extends JavaPlugin {
|
||||
}
|
||||
|
||||
// Manager, GUI & Discord-Webhook initialisieren
|
||||
ticketManager = new TicketManager(this);
|
||||
ticketGUI = new TicketGUI(this);
|
||||
discordWebhook = new DiscordWebhook(this);
|
||||
categoryManager = new CategoryManager(this);
|
||||
ticketManager = new TicketManager(this);
|
||||
ticketGUI = new TicketGUI(this);
|
||||
discordWebhook = new DiscordWebhook(this);
|
||||
|
||||
if (getConfig().getBoolean("discord.enabled", false)) {
|
||||
String url = getConfig().getString("discord.webhook-url", "");
|
||||
@@ -107,6 +145,10 @@ public class TicketPlugin extends JavaPlugin {
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
// Plugin-Messaging-Kanäle abmelden
|
||||
getServer().getMessenger().unregisterOutgoingPluginChannel(this);
|
||||
getServer().getMessenger().unregisterIncomingPluginChannel(this);
|
||||
|
||||
if (databaseManager != null) databaseManager.disconnect();
|
||||
getLogger().info("TicketSystem wurde deaktiviert.");
|
||||
}
|
||||
@@ -127,8 +169,22 @@ public class TicketPlugin extends JavaPlugin {
|
||||
|
||||
public static TicketPlugin getInstance() { return instance; }
|
||||
public DatabaseManager getDatabaseManager() { return databaseManager; }
|
||||
public TicketManager getTicketManager() { return ticketManager; }
|
||||
public TicketGUI getTicketGUI() { return ticketGUI; }
|
||||
public DiscordWebhook getDiscordWebhook() { return discordWebhook; }
|
||||
public boolean isDebug() { return debug; }
|
||||
public TicketManager getTicketManager() { return ticketManager; }
|
||||
public CategoryManager getCategoryManager() { return categoryManager; }
|
||||
public TicketGUI getTicketGUI() { return ticketGUI; }
|
||||
public DiscordWebhook getDiscordWebhook() { return discordWebhook; }
|
||||
public BungeeMessenger getBungeeMessenger() { return bungeeMessenger; }
|
||||
public boolean isDebug() { return debug; }
|
||||
|
||||
/**
|
||||
* BungeeCord: Gibt den konfigurierten Server-Namen zurück.
|
||||
* Entspricht dem Wert aus config.yml → server-name.
|
||||
*/
|
||||
public String getServerName() { return serverName; }
|
||||
|
||||
/**
|
||||
* BungeeCord: Gibt zurück ob Cross-Server-Features aktiviert sind.
|
||||
* Entspricht config.yml → bungeecord: true
|
||||
*/
|
||||
public boolean isBungeeCordEnabled() { return getConfig().getBoolean("bungeecord", false); }
|
||||
}
|
||||
263
src/main/java/de/ticketsystem/bungee/BungeeMessenger.java
Normal file
263
src/main/java/de/ticketsystem/bungee/BungeeMessenger.java
Normal file
@@ -0,0 +1,263 @@
|
||||
package de.ticketsystem.bungee;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteArrayDataOutput;
|
||||
import com.google.common.io.ByteStreams;
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.messaging.PluginMessageListener;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Verwaltet die BungeeCord Plugin-Messaging-Kanäle für Cross-Server-Kommunikation.
|
||||
*
|
||||
* Kanalübersicht:
|
||||
* Ausgehend: "BungeeCord" – Standard-BungeeCord-Kanal (Forward, Message)
|
||||
* Eingehend: "ticketsystem:notify" – Eigener Kanal für weitergeleitete Nachrichten
|
||||
*
|
||||
* Voraussetzung:
|
||||
* - In spigot.yml muss "bungeecord: true" gesetzt sein
|
||||
* - In plugin.yml müssen beide Kanäle unter "channels:" deklariert sein
|
||||
*
|
||||
* Pakettypen (erstes Byte bei ticketsystem:notify):
|
||||
* 0x01 = TEAM_NOTIFY – Nachricht an alle Online-Supporter/Admins auf diesem Server
|
||||
* 0x02 = PLAYER_MSG – Nachricht an einen bestimmten Spieler (UUID + Text)
|
||||
*
|
||||
* ── BUG FIX ──────────────────────────────────────────────────────────────────
|
||||
* Problem: BungeeCord's "Forward ALL" liefert auf dem Zielserver den inneren
|
||||
* Payload BEREITS ENTPACKT via onPluginMessageReceived auf dem
|
||||
* CUSTOM_CHANNEL. Das war korrekt implementiert.
|
||||
*
|
||||
* Der eigentliche Fehler lag in broadcastTeamNotification():
|
||||
* - Nachrichten mit "\n" wurden als ein einzelner String gesendet.
|
||||
* Minecraft verarbeitet "\n" in sendMessage() nicht → beide Zeilen kamen
|
||||
* als eine zusammen an (unleserlich, aber nicht die Ursache für "gar nichts").
|
||||
* - Die Methode wird jetzt mit einer Liste von Strings aufgerufen (broadcastLines)
|
||||
* damit jede Zeile als separates Paket gesendet wird – klar und lesbar.
|
||||
*
|
||||
* Hauptursache für "gar nichts auf Lobby":
|
||||
* Die plugin.yml hatte keinen "channels:"-Block. Ohne diesen Eintrag
|
||||
* registriert BungeeCord den Kanal "ticketsystem:notify" nicht und
|
||||
* verwirft alle eingehenden Forward-Pakete lautlos auf den Ziel-Servern.
|
||||
* → plugin.yml Fix ist die primäre Lösung.
|
||||
*
|
||||
* Diese Datei enthält zusätzlich Debug-Logging (wenn debug: true in config.yml)
|
||||
* damit zukünftige Probleme schneller gefunden werden können.
|
||||
* ─────────────────────────────────────────────────────────────────────────────
|
||||
*/
|
||||
public class BungeeMessenger implements PluginMessageListener {
|
||||
|
||||
/** BungeeCord-Standardkanal für Forward/Message-Subkanäle */
|
||||
public static final String BUNGEE_CHANNEL = "BungeeCord";
|
||||
|
||||
/** Eigener Weiterleitungskanal – muss in plugin.yml unter channels stehen */
|
||||
public static final String CUSTOM_CHANNEL = "ticketsystem:notify";
|
||||
|
||||
private static final byte TYPE_TEAM_NOTIFY = 0x01;
|
||||
private static final byte TYPE_PLAYER_MSG = 0x02;
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
|
||||
public BungeeMessenger(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
// ─────────────────────────── Ausgehende Nachrichten ────────────────────
|
||||
|
||||
/**
|
||||
* Sendet eine Chat-Nachricht an einen bestimmten Spieler – egal auf welchem
|
||||
* Server im Netzwerk er sich befindet.
|
||||
*
|
||||
* Reihenfolge:
|
||||
* 1. Spieler ist lokal online → direkte Zustellung
|
||||
* 2. Spieler ist woanders → BungeeCord "Message"-Subkanal (nach Name)
|
||||
* 3. Spieler ist offline → Pendende DB-Benachrichtigung (vorher speichern!)
|
||||
*/
|
||||
public void sendMessageToPlayer(UUID targetUUID, String targetName, String message) {
|
||||
// 1. Lokal online?
|
||||
Player local = Bukkit.getPlayer(targetUUID);
|
||||
if (local != null && local.isOnline()) {
|
||||
local.sendMessage(message);
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. Cross-Server via BungeeCord "Message"-Subkanal
|
||||
Player messenger = getAnyOnlinePlayer();
|
||||
if (messenger == null || targetName == null) return;
|
||||
|
||||
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||
out.writeUTF("Message");
|
||||
out.writeUTF(targetName);
|
||||
out.writeUTF(message);
|
||||
messenger.sendPluginMessage(plugin, BUNGEE_CHANNEL, out.toByteArray());
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG][BungeeMessenger] sendMessageToPlayer → " + targetName + ": " + message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Broadcastet eine Team-Benachrichtigung an alle Supporter/Admins im gesamten Netzwerk.
|
||||
*
|
||||
* Lokal online Spieler werden sofort benachrichtigt.
|
||||
* Alle anderen Server erhalten das Paket über den "Forward ALL"-Mechanismus.
|
||||
*
|
||||
* WICHTIG: Jede Zeile wird als separates Paket gesendet damit Minecraft
|
||||
* die Nachrichten korrekt zeilenweise anzeigt.
|
||||
*/
|
||||
public void broadcastTeamNotification(String message) {
|
||||
// Lokale Supporter direkt benachrichtigen
|
||||
Bukkit.getOnlinePlayers().stream()
|
||||
.filter(p -> p.hasPermission("ticket.support") || p.hasPermission("ticket.admin"))
|
||||
.forEach(p -> p.sendMessage(message));
|
||||
|
||||
// An alle anderen Server forwarden
|
||||
Player messenger = getAnyOnlinePlayer();
|
||||
if (messenger == null) {
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().warning("[DEBUG][BungeeMessenger] broadcastTeamNotification: kein Bote online – Forward nicht möglich!");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
sendForwardPacket(messenger, message);
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG][BungeeMessenger] broadcastTeamNotification gesendet via " + messenger.getName() + ": " + message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet eine Nachricht an einen bestimmten Spieler via eigenem Forward-Paket.
|
||||
*/
|
||||
public void forwardPlayerMessage(UUID targetUUID, String targetName, String message) {
|
||||
Player local = Bukkit.getPlayer(targetUUID);
|
||||
if (local != null && local.isOnline()) {
|
||||
local.sendMessage(message);
|
||||
return;
|
||||
}
|
||||
|
||||
Player messenger = getAnyOnlinePlayer();
|
||||
if (messenger == null) return;
|
||||
|
||||
byte[] uuidBytes = targetUUID.toString().getBytes(StandardCharsets.UTF_8);
|
||||
byte[] msgBytes = message.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
ByteArrayDataOutput inner = ByteStreams.newDataOutput();
|
||||
inner.writeByte(TYPE_PLAYER_MSG);
|
||||
inner.writeShort(uuidBytes.length);
|
||||
inner.write(uuidBytes);
|
||||
inner.writeShort(msgBytes.length);
|
||||
inner.write(msgBytes);
|
||||
byte[] innerBytes = inner.toByteArray();
|
||||
|
||||
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||
out.writeUTF("Forward");
|
||||
out.writeUTF("ALL");
|
||||
out.writeUTF(CUSTOM_CHANNEL);
|
||||
out.writeShort(innerBytes.length);
|
||||
out.write(innerBytes);
|
||||
|
||||
messenger.sendPluginMessage(plugin, BUNGEE_CHANNEL, out.toByteArray());
|
||||
}
|
||||
|
||||
// ─────────────────────────── Eingehende Nachrichten ────────────────────
|
||||
|
||||
@Override
|
||||
public void onPluginMessageReceived(String channel, Player player, byte[] data) {
|
||||
if (!CUSTOM_CHANNEL.equals(channel)) return;
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG][BungeeMessenger] Paket empfangen auf " + channel + ", " + data.length + " Bytes");
|
||||
}
|
||||
|
||||
try {
|
||||
ByteArrayDataInput in = ByteStreams.newDataInput(data);
|
||||
byte type = in.readByte();
|
||||
|
||||
if (type == TYPE_TEAM_NOTIFY) {
|
||||
// Rest der Bytes = UTF-8-kodierte Nachricht
|
||||
int len = data.length - 1;
|
||||
byte[] msgBytes = new byte[len];
|
||||
in.readFully(msgBytes);
|
||||
String message = new String(msgBytes, StandardCharsets.UTF_8);
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG][BungeeMessenger] TEAM_NOTIFY empfangen: " + message);
|
||||
}
|
||||
|
||||
// Im Hauptthread an lokale Supporter zustellen
|
||||
Bukkit.getScheduler().runTask(plugin, () ->
|
||||
Bukkit.getOnlinePlayers().stream()
|
||||
.filter(p -> p.hasPermission("ticket.support") || p.hasPermission("ticket.admin"))
|
||||
.forEach(p -> p.sendMessage(message))
|
||||
);
|
||||
|
||||
} else if (type == TYPE_PLAYER_MSG) {
|
||||
int uuidLen = in.readShort();
|
||||
byte[] uuidBytes = new byte[uuidLen];
|
||||
in.readFully(uuidBytes);
|
||||
UUID targetUUID = UUID.fromString(new String(uuidBytes, StandardCharsets.UTF_8));
|
||||
|
||||
int msgLen = in.readShort();
|
||||
byte[] msgBytes = new byte[msgLen];
|
||||
in.readFully(msgBytes);
|
||||
String message = new String(msgBytes, StandardCharsets.UTF_8);
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG][BungeeMessenger] PLAYER_MSG empfangen für: " + targetUUID);
|
||||
}
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
Player target = Bukkit.getPlayer(targetUUID);
|
||||
if (target != null && target.isOnline()) {
|
||||
target.sendMessage(message);
|
||||
}
|
||||
});
|
||||
|
||||
} else {
|
||||
plugin.getLogger().warning("[BungeeMessenger] Unbekannter Pakettyp: " + type);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
plugin.getLogger().warning("[BungeeMessenger] Fehler beim Verarbeiten einer Plugin-Message: " + e.getMessage());
|
||||
if (plugin.isDebug()) e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// ─────────────────────────── Hilfsmethoden ─────────────────────────────
|
||||
|
||||
/**
|
||||
* Baut und sendet ein Forward-ALL-Paket mit TYPE_TEAM_NOTIFY.
|
||||
*/
|
||||
private void sendForwardPacket(Player messenger, String message) {
|
||||
byte[] msgBytes = message.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
ByteArrayDataOutput inner = ByteStreams.newDataOutput();
|
||||
inner.writeByte(TYPE_TEAM_NOTIFY);
|
||||
inner.write(msgBytes);
|
||||
byte[] innerBytes = inner.toByteArray();
|
||||
|
||||
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||
out.writeUTF("Forward");
|
||||
out.writeUTF("ALL");
|
||||
out.writeUTF(CUSTOM_CHANNEL);
|
||||
out.writeShort(innerBytes.length);
|
||||
out.write(innerBytes);
|
||||
|
||||
messenger.sendPluginMessage(plugin, BUNGEE_CHANNEL, out.toByteArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt einen beliebigen online Spieler zurück der als "Bote" für Plugin-Messages
|
||||
* verwendet werden kann. BungeeCord verlangt einen Spieler als Absender.
|
||||
*/
|
||||
private Player getAnyOnlinePlayer() {
|
||||
Collection<? extends Player> online = Bukkit.getOnlinePlayers();
|
||||
return online.isEmpty() ? null : online.iterator().next();
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,9 @@
|
||||
package de.ticketsystem.discord;
|
||||
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import de.ticketsystem.model.ConfigCategory;
|
||||
import de.ticketsystem.model.Ticket;
|
||||
import de.ticketsystem.model.TicketPriority;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.io.OutputStream;
|
||||
@@ -9,156 +11,344 @@ import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Sendet Benachrichtigungen an einen Discord-Webhook.
|
||||
* Unterstützt Embeds mit Farbe, Feldern und Timestamp.
|
||||
*/
|
||||
public class DiscordWebhook {
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// Konstanten & Felder
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
private static final String AVATAR_URL = "https://mc-heads.net/avatar/%s/64";
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// Konstruktor
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
public DiscordWebhook(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
// ─────────────────────────── Öffentliche Methoden ──────────────────────
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// Öffentliche Methoden – Webhook-Events
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Sendet eine Benachrichtigung wenn ein neues Ticket erstellt wurde.
|
||||
*/
|
||||
public void sendNewTicket(Ticket ticket) {
|
||||
if (!isEnabled()) return;
|
||||
|
||||
String webhookUrl = plugin.getConfig().getString("discord.webhook-url", "");
|
||||
if (webhookUrl.isEmpty()) return;
|
||||
String webhookUrl = getWebhookUrl();
|
||||
if (webhookUrl == null) return;
|
||||
|
||||
// Felder aus Config lesen
|
||||
String title = plugin.getConfig().getString("discord.messages.new-ticket.title", "🎫 Neues Ticket erstellt");
|
||||
String color = plugin.getConfig().getString("discord.messages.new-ticket.color", "3066993"); // Grün
|
||||
String footer = plugin.getConfig().getString("discord.messages.new-ticket.footer", "TicketSystem");
|
||||
// Konfiguration lesen
|
||||
String title = plugin.getConfig().getString ("discord.messages.new-ticket.title", "Neues Ticket");
|
||||
String color = plugin.getConfig().getString ("discord.messages.new-ticket.color", "5793266");
|
||||
String footer = plugin.getConfig().getString ("discord.messages.new-ticket.footer", "TicketSystem");
|
||||
boolean showPos = plugin.getConfig().getBoolean("discord.messages.new-ticket.show-position", true);
|
||||
boolean showCat = plugin.getConfig().getBoolean("discord.messages.new-ticket.show-category", true);
|
||||
boolean showPri = plugin.getConfig().getBoolean("discord.messages.new-ticket.show-priority", true);
|
||||
boolean showSrv = plugin.getConfig().getBoolean("discord.messages.new-ticket.show-server", true);
|
||||
boolean ping = plugin.getConfig().getBoolean("discord.messages.new-ticket.role-ping", true);
|
||||
|
||||
// JSON-Embed aufbauen
|
||||
StringBuilder fields = new StringBuilder();
|
||||
fields.append(field("Spieler", ticket.getCreatorName(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Ticket ID", "#" + ticket.getId(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Anliegen", ticket.getMessage(), false));
|
||||
// Hilfs-Werte berechnen
|
||||
String prioEmoji = getPriorityEmoji(ticket.getPriority());
|
||||
String avatarUrl = String.format(AVATAR_URL, ticket.getCreatorUUID().toString());
|
||||
|
||||
// Felder aufbauen
|
||||
List<Field> fields = new ArrayList<>();
|
||||
fields.add(new Field("👤 Spieler", ticket.getCreatorName(), true));
|
||||
fields.add(new Field("🎫 Ticket", "#" + ticket.getId(), true));
|
||||
|
||||
if (showCat && plugin.getConfig().getBoolean("categories-enabled", true)) {
|
||||
ConfigCategory cat = plugin.getCategoryManager().fromKey(ticket.getCategoryKey());
|
||||
fields.add(new Field("🏷️ Kategorie", cat.getName(), true));
|
||||
}
|
||||
|
||||
if (showPri && plugin.getConfig().getBoolean("priorities-enabled", true)) {
|
||||
fields.add(new Field("⚡ Priorität", prioEmoji + " " + ticket.getPriority().getDisplayName(), true));
|
||||
}
|
||||
|
||||
if (showSrv && plugin.isBungeeCordEnabled() && !"unknown".equals(ticket.getServerName())) {
|
||||
fields.add(new Field("🖥️ Server", ticket.getServerName(), true));
|
||||
}
|
||||
|
||||
if (showPos) {
|
||||
fields.append(",");
|
||||
fields.append(field("Welt", ticket.getWorldName(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Position",
|
||||
fields.add(new Field("🌍 Welt", ticket.getWorldName(), true));
|
||||
fields.add(new Field("📍 Position",
|
||||
String.format("%.0f, %.0f, %.0f", ticket.getX(), ticket.getY(), ticket.getZ()), true));
|
||||
}
|
||||
|
||||
String json = buildPayload(title, Integer.parseInt(color), fields.toString(), footer);
|
||||
// JSON zusammenbauen & senden
|
||||
String description = "**Anliegen**\n> " + j(ticket.getMessage());
|
||||
|
||||
String json = buildJson(
|
||||
ping ? buildRolePing() : "",
|
||||
prioEmoji + " " + j(title) + " #" + ticket.getId(),
|
||||
description,
|
||||
Integer.parseInt(color),
|
||||
j(ticket.getCreatorName()), avatarUrl,
|
||||
avatarUrl,
|
||||
fields,
|
||||
j(footer) + " • Neues Ticket"
|
||||
);
|
||||
|
||||
sendAsync(webhookUrl, json);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet eine Benachrichtigung wenn ein Ticket geschlossen wurde.
|
||||
*/
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
public void sendTicketClosed(Ticket ticket, String closerName) {
|
||||
if (!isEnabled()) return;
|
||||
if (!plugin.getConfig().getBoolean("discord.messages.ticket-closed.enabled", false)) return;
|
||||
|
||||
String webhookUrl = plugin.getConfig().getString("discord.webhook-url", "");
|
||||
if (webhookUrl.isEmpty()) return;
|
||||
String webhookUrl = getWebhookUrl();
|
||||
if (webhookUrl == null) return;
|
||||
|
||||
String title = plugin.getConfig().getString("discord.messages.ticket-closed.title", "🔒 Ticket geschlossen");
|
||||
String color = plugin.getConfig().getString("discord.messages.ticket-closed.color", "15158332"); // Rot
|
||||
String footer = plugin.getConfig().getString("discord.messages.ticket-closed.footer", "TicketSystem");
|
||||
// Konfiguration lesen
|
||||
String title = plugin.getConfig().getString ("discord.messages.ticket-closed.title", "Ticket geschlossen");
|
||||
String color = plugin.getConfig().getString ("discord.messages.ticket-closed.color", "15548997");
|
||||
String footer = plugin.getConfig().getString ("discord.messages.ticket-closed.footer", "TicketSystem");
|
||||
boolean showCat = plugin.getConfig().getBoolean("discord.messages.ticket-closed.show-category", true);
|
||||
boolean showPri = plugin.getConfig().getBoolean("discord.messages.ticket-closed.show-priority", true);
|
||||
boolean showSrv = plugin.getConfig().getBoolean("discord.messages.ticket-closed.show-server", true);
|
||||
boolean ping = plugin.getConfig().getBoolean("discord.messages.ticket-closed.role-ping", false);
|
||||
|
||||
// Hilfs-Werte berechnen
|
||||
String prioEmoji = getPriorityEmoji(ticket.getPriority());
|
||||
String avatarUrl = String.format(AVATAR_URL, ticket.getCreatorUUID().toString());
|
||||
|
||||
// Beschreibung aufbauen
|
||||
StringBuilder desc = new StringBuilder();
|
||||
desc.append("**Anliegen**\n> ").append(j(ticket.getMessage()));
|
||||
|
||||
StringBuilder fields = new StringBuilder();
|
||||
fields.append(field("Ticket ID", "#" + ticket.getId(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Ersteller", ticket.getCreatorName(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Geschlossen von", closerName, true));
|
||||
if (ticket.getCloseComment() != null && !ticket.getCloseComment().isEmpty()) {
|
||||
fields.append(",");
|
||||
fields.append(field("Kommentar", ticket.getCloseComment(), false));
|
||||
desc.append("\n\n**Kommentar des Supports**\n> ").append(j(ticket.getCloseComment()));
|
||||
}
|
||||
|
||||
String json = buildPayload(title, Integer.parseInt(color), fields.toString(), footer);
|
||||
// Felder aufbauen
|
||||
List<Field> fields = new ArrayList<>();
|
||||
fields.add(new Field("👤 Ersteller", ticket.getCreatorName(), true));
|
||||
fields.add(new Field("🔒 Geschlossen von", j(closerName), true));
|
||||
fields.add(new Field("🎫 Ticket ID", "#" + ticket.getId(), true));
|
||||
|
||||
if (showCat && plugin.getConfig().getBoolean("categories-enabled", true)) {
|
||||
ConfigCategory cat = plugin.getCategoryManager().fromKey(ticket.getCategoryKey());
|
||||
fields.add(new Field("🏷️ Kategorie", cat.getName(), true));
|
||||
}
|
||||
|
||||
if (showPri && plugin.getConfig().getBoolean("priorities-enabled", true)) {
|
||||
fields.add(new Field("⚡ Priorität", prioEmoji + " " + ticket.getPriority().getDisplayName(), true));
|
||||
}
|
||||
|
||||
if (showSrv && plugin.isBungeeCordEnabled() && !"unknown".equals(ticket.getServerName())) {
|
||||
fields.add(new Field("🖥️ Server", ticket.getServerName(), true));
|
||||
}
|
||||
|
||||
if (plugin.getConfig().getBoolean("rating-enabled", true) && ticket.getPlayerRating() != null) {
|
||||
String rating = "THUMBS_UP".equals(ticket.getPlayerRating()) ? "👍 Positiv" : "👎 Negativ";
|
||||
fields.add(new Field("⭐ Bewertung", rating, true));
|
||||
}
|
||||
|
||||
// JSON zusammenbauen & senden
|
||||
String json = buildJson(
|
||||
ping ? buildRolePing() : "",
|
||||
"🔒 " + j(title) + " #" + ticket.getId(),
|
||||
desc.toString(),
|
||||
Integer.parseInt(color),
|
||||
j(ticket.getCreatorName()), avatarUrl,
|
||||
avatarUrl,
|
||||
fields,
|
||||
j(footer) + " • Ticket geschlossen"
|
||||
);
|
||||
|
||||
sendAsync(webhookUrl, json);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet eine Benachrichtigung wenn ein Ticket weitergeleitet wurde.
|
||||
*/
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
public void sendTicketForwarded(Ticket ticket, String fromName) {
|
||||
if (!isEnabled()) return;
|
||||
if (!plugin.getConfig().getBoolean("discord.messages.ticket-forwarded.enabled", false)) return;
|
||||
|
||||
String webhookUrl = plugin.getConfig().getString("discord.webhook-url", "");
|
||||
if (webhookUrl.isEmpty()) return;
|
||||
String webhookUrl = getWebhookUrl();
|
||||
if (webhookUrl == null) return;
|
||||
|
||||
String title = plugin.getConfig().getString("discord.messages.ticket-forwarded.title", "🔀 Ticket weitergeleitet");
|
||||
String color = plugin.getConfig().getString("discord.messages.ticket-forwarded.color", "15105570"); // Orange
|
||||
String footer = plugin.getConfig().getString("discord.messages.ticket-forwarded.footer", "TicketSystem");
|
||||
// Konfiguration lesen
|
||||
String title = plugin.getConfig().getString ("discord.messages.ticket-forwarded.title", "Ticket weitergeleitet");
|
||||
String color = plugin.getConfig().getString ("discord.messages.ticket-forwarded.color", "15105570");
|
||||
String footer = plugin.getConfig().getString ("discord.messages.ticket-forwarded.footer", "TicketSystem");
|
||||
boolean showCat = plugin.getConfig().getBoolean("discord.messages.ticket-forwarded.show-category", true);
|
||||
boolean showPri = plugin.getConfig().getBoolean("discord.messages.ticket-forwarded.show-priority", true);
|
||||
boolean showSrv = plugin.getConfig().getBoolean("discord.messages.ticket-forwarded.show-server", true);
|
||||
boolean ping = plugin.getConfig().getBoolean("discord.messages.ticket-forwarded.role-ping", false);
|
||||
|
||||
StringBuilder fields = new StringBuilder();
|
||||
fields.append(field("Ticket ID", "#" + ticket.getId(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Ersteller", ticket.getCreatorName(), true));
|
||||
fields.append(",");
|
||||
fields.append(field("Weitergeleitet von", fromName, true));
|
||||
fields.append(",");
|
||||
fields.append(field("Weitergeleitet an", ticket.getForwardedToName(), true));
|
||||
// Hilfs-Werte berechnen
|
||||
String prioEmoji = getPriorityEmoji(ticket.getPriority());
|
||||
String avatarUrl = String.format(AVATAR_URL, ticket.getCreatorUUID().toString());
|
||||
|
||||
// Felder aufbauen
|
||||
String forwardedTo = ticket.getForwardedToName() != null ? j(ticket.getForwardedToName()) : "–";
|
||||
|
||||
List<Field> fields = new ArrayList<>();
|
||||
fields.add(new Field("👤 Ersteller", ticket.getCreatorName(), true));
|
||||
fields.add(new Field("📤 Weitergeleitet von", j(fromName), true));
|
||||
fields.add(new Field("📥 Weitergeleitet an", forwardedTo, true));
|
||||
fields.add(new Field("🎫 Ticket ID", "#" + ticket.getId(), true));
|
||||
|
||||
if (showCat && plugin.getConfig().getBoolean("categories-enabled", true)) {
|
||||
ConfigCategory cat = plugin.getCategoryManager().fromKey(ticket.getCategoryKey());
|
||||
fields.add(new Field("🏷️ Kategorie", cat.getName(), true));
|
||||
}
|
||||
|
||||
if (showPri && plugin.getConfig().getBoolean("priorities-enabled", true)) {
|
||||
fields.add(new Field("⚡ Priorität", prioEmoji + " " + ticket.getPriority().getDisplayName(), true));
|
||||
}
|
||||
|
||||
if (showSrv && plugin.isBungeeCordEnabled() && !"unknown".equals(ticket.getServerName())) {
|
||||
fields.add(new Field("🖥️ Server", ticket.getServerName(), true));
|
||||
}
|
||||
|
||||
// JSON zusammenbauen & senden
|
||||
String json = buildJson(
|
||||
ping ? buildRolePing() : "",
|
||||
"🔀 " + j(title) + " #" + ticket.getId(),
|
||||
"**Anliegen**\n> " + j(ticket.getMessage()),
|
||||
Integer.parseInt(color),
|
||||
j(ticket.getCreatorName()), avatarUrl,
|
||||
avatarUrl,
|
||||
fields,
|
||||
j(footer) + " • Ticket weitergeleitet"
|
||||
);
|
||||
|
||||
String json = buildPayload(title, Integer.parseInt(color), fields.toString(), footer);
|
||||
sendAsync(webhookUrl, json);
|
||||
}
|
||||
|
||||
// ─────────────────────────── Private Hilfsmethoden ─────────────────────
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// JSON-Bau
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
private record Field(String name, String value, boolean inline) {}
|
||||
|
||||
/**
|
||||
* Baut den kompletten JSON-Payload ohne String.format()-Chaos.
|
||||
* Kein verschachteltes Escaping, kein ungültiges JSON.
|
||||
*/
|
||||
private String buildJson(
|
||||
String content,
|
||||
String title,
|
||||
String description,
|
||||
int color,
|
||||
String authorName,
|
||||
String authorIcon,
|
||||
String thumbnailUrl,
|
||||
List<Field> fields,
|
||||
String footer
|
||||
) {
|
||||
// Fields-Array aufbauen
|
||||
StringBuilder fieldsJson = new StringBuilder("[");
|
||||
for (int i = 0; i < fields.size(); i++) {
|
||||
Field f = fields.get(i);
|
||||
if (i > 0) fieldsJson.append(",");
|
||||
fieldsJson
|
||||
.append("{")
|
||||
.append("\"name\":") .append(jsonString(f.name())) .append(",")
|
||||
.append("\"value\":") .append(jsonString(f.value())) .append(",")
|
||||
.append("\"inline\":") .append(f.inline())
|
||||
.append("}");
|
||||
}
|
||||
fieldsJson.append("]");
|
||||
|
||||
// Embed-Objekt aufbauen
|
||||
StringBuilder embed = new StringBuilder("{");
|
||||
embed.append("\"title\":") .append(jsonString(title)) .append(",");
|
||||
embed.append("\"description\":") .append(jsonString(description)) .append(",");
|
||||
embed.append("\"color\":") .append(color) .append(",");
|
||||
embed.append("\"author\":{")
|
||||
.append("\"name\":") .append(jsonString(authorName)) .append(",")
|
||||
.append("\"icon_url\":") .append(jsonString(authorIcon))
|
||||
.append("},");
|
||||
embed.append("\"thumbnail\":{\"url\":").append(jsonString(thumbnailUrl)).append("},");
|
||||
embed.append("\"fields\":") .append(fieldsJson) .append(",");
|
||||
embed.append("\"footer\":{\"text\":").append(jsonString(footer)) .append("},");
|
||||
embed.append("\"timestamp\":") .append(jsonString(Instant.now().toString()));
|
||||
embed.append("}");
|
||||
|
||||
// Root-Objekt
|
||||
return "{" +
|
||||
"\"content\":" + jsonString(content) + "," +
|
||||
"\"embeds\":[" + embed + "]" +
|
||||
"}";
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt einen JSON-String-Wert zurück inkl. Anführungszeichen.
|
||||
* Alle Sonderzeichen werden korrekt escaped.
|
||||
*/
|
||||
private String jsonString(String value) {
|
||||
if (value == null) value = "";
|
||||
|
||||
StringBuilder sb = new StringBuilder("\"");
|
||||
for (char c : value.toCharArray()) {
|
||||
switch (c) {
|
||||
case '"' -> sb.append("\\\"");
|
||||
case '\\' -> sb.append("\\\\");
|
||||
case '\n' -> sb.append("\\n");
|
||||
case '\r' -> { /* ignorieren */ }
|
||||
case '\t' -> sb.append("\\t");
|
||||
default -> {
|
||||
if (c < 0x20) {
|
||||
sb.append(String.format("\\u%04x", (int) c));
|
||||
} else {
|
||||
sb.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
sb.append("\"");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Kurz-Alias: Escaped einen Wert für die Verwendung innerhalb von
|
||||
* description-Strings (die bereits durch jsonString() laufen).
|
||||
*/
|
||||
private String j(String s) {
|
||||
if (s == null) return "–";
|
||||
return s.replace("\\", "\\\\")
|
||||
.replace("\"", "\\\"")
|
||||
.replace("\n", " ")
|
||||
.replace("\r", "");
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// Hilfsmethoden
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
private boolean isEnabled() {
|
||||
return plugin.getConfig().getBoolean("discord.enabled", false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Baut einen einzelnen Embed-Field als JSON-String.
|
||||
*/
|
||||
private String field(String name, String value, boolean inline) {
|
||||
// Anführungszeichen und Backslashes im Wert escapen
|
||||
String safeValue = value != null
|
||||
? value.replace("\\", "\\\\").replace("\"", "\\\"")
|
||||
: "–";
|
||||
String safeName = name.replace("\\", "\\\\").replace("\"", "\\\"");
|
||||
return String.format("{\"name\":\"%s\",\"value\":\"%s\",\"inline\":%b}",
|
||||
safeName, safeValue, inline);
|
||||
private String getWebhookUrl() {
|
||||
String url = plugin.getConfig().getString("discord.webhook-url", "");
|
||||
return url.isEmpty() ? null : url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Baut den kompletten Webhook-Payload als JSON.
|
||||
*/
|
||||
private String buildPayload(String title, int color, String fieldsJson, String footer) {
|
||||
String timestamp = Instant.now().toString(); // ISO-8601
|
||||
return String.format("""
|
||||
{
|
||||
"embeds": [{
|
||||
"title": "%s",
|
||||
"color": %d,
|
||||
"fields": [%s],
|
||||
"footer": { "text": "%s" },
|
||||
"timestamp": "%s"
|
||||
}]
|
||||
}""",
|
||||
title.replace("\"", "\\\""),
|
||||
color,
|
||||
fieldsJson,
|
||||
footer.replace("\"", "\\\""),
|
||||
timestamp);
|
||||
private String buildRolePing() {
|
||||
String roleId = plugin.getConfig().getString("discord.role-ping-id", "").trim();
|
||||
return roleId.isEmpty() ? "" : "<@&" + roleId + ">";
|
||||
}
|
||||
|
||||
private String getPriorityEmoji(TicketPriority priority) {
|
||||
return switch (priority) {
|
||||
case LOW -> "🟢";
|
||||
case NORMAL -> "🟡";
|
||||
case HIGH -> "🟠";
|
||||
case URGENT -> "🔴";
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet den JSON-Payload asynchron an den Webhook.
|
||||
*/
|
||||
private void sendAsync(String webhookUrl, String json) {
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
try {
|
||||
@@ -176,16 +366,20 @@ public class DiscordWebhook {
|
||||
}
|
||||
|
||||
int responseCode = conn.getResponseCode();
|
||||
|
||||
if (plugin.isDebug()) {
|
||||
plugin.getLogger().info("[DEBUG] Discord Webhook Response: " + responseCode);
|
||||
plugin.getLogger().info("[DEBUG][DiscordWebhook] Response: " + responseCode);
|
||||
if (responseCode != 200 && responseCode != 204) {
|
||||
plugin.getLogger().info("[DEBUG][DiscordWebhook] Payload: " + json);
|
||||
}
|
||||
}
|
||||
|
||||
// 204 = No Content → Erfolg bei Discord
|
||||
if (responseCode != 200 && responseCode != 204) {
|
||||
plugin.getLogger().warning("[DiscordWebhook] Unerwarteter Response-Code: " + responseCode);
|
||||
}
|
||||
|
||||
conn.disconnect();
|
||||
|
||||
} catch (Exception e) {
|
||||
plugin.getLogger().warning("[DiscordWebhook] Fehler beim Senden: " + e.getMessage());
|
||||
if (plugin.isDebug()) e.printStackTrace();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,10 +3,13 @@ package de.ticketsystem.listeners;
|
||||
import java.util.List;
|
||||
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import de.ticketsystem.database.DatabaseManager;
|
||||
import de.ticketsystem.model.Ticket;
|
||||
import de.ticketsystem.model.TicketStatus;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
@@ -34,23 +37,80 @@ public class PlayerJoinListener implements Listener {
|
||||
.replace("{count}", String.valueOf(count));
|
||||
player.sendMessage(msg);
|
||||
player.sendMessage(plugin.color("&7» Tippe &e/ticket list &7für die Übersicht."));
|
||||
}, 40L); // 2 Sekunden Verzögerung
|
||||
}, 40L);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ── Spieler: über geschlossene Tickets mit Kommentar informieren ──
|
||||
// Nur wenn der Ersteller noch nicht live benachrichtigt wurde
|
||||
// ── BungeeCord: ausstehenden Teleport-Auftrag prüfen ─────────────
|
||||
// Wenn ein Admin via GUI auf einen anderen Server geschickt wurde,
|
||||
// liegt hier die Zielposition. Wir teleportieren ihn nach dem Spawn.
|
||||
if (plugin.isBungeeCordEnabled()
|
||||
&& plugin.getConfig().getBoolean("bungee-teleport-enabled", true)) {
|
||||
Bukkit.getScheduler().runTaskLater(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
DatabaseManager.PendingTeleport pt =
|
||||
plugin.getDatabaseManager().consumePendingTeleport(player.getUniqueId());
|
||||
if (pt == null) return;
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
World world = Bukkit.getWorld(pt.world());
|
||||
if (world == null) {
|
||||
player.sendMessage(plugin.color(
|
||||
"&cTeleport-Zielwelt &e" + pt.world() + " &cnicht gefunden!"));
|
||||
return;
|
||||
}
|
||||
Location loc = new Location(world, pt.x(), pt.y(), pt.z(), pt.yaw(), pt.pitch());
|
||||
player.teleport(loc);
|
||||
player.sendMessage(plugin.color(
|
||||
"&7Du wurdest zur Ticket-Position teleportiert. &8("
|
||||
+ String.format("%.0f, %.0f, %.0f", pt.x(), pt.y(), pt.z()) + ")"));
|
||||
});
|
||||
});
|
||||
// 40 Ticks (2 Sek) Verzögerung damit der Spieler vollständig gespawnt ist
|
||||
}, 40L);
|
||||
}
|
||||
|
||||
// ── Ausstehende Kommentar-/Schließ-Benachrichtigungen anzeigen ────
|
||||
// (Nachrichten die ankamen während der Spieler offline war)
|
||||
Bukkit.getScheduler().runTaskLater(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
List<String> pending = plugin.getDatabaseManager().getPendingNotifications(player.getUniqueId());
|
||||
if (pending.isEmpty()) return;
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&6Ticket-Benachrichtigungen &7(während du offline warst):"));
|
||||
for (String msg : pending) {
|
||||
player.sendMessage(plugin.color(msg));
|
||||
}
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
});
|
||||
plugin.getDatabaseManager().clearPendingNotifications(player.getUniqueId());
|
||||
});
|
||||
}, 60L);
|
||||
|
||||
// ── [NEU] Spieler: Ticket-claimed-Benachrichtigung für Offline-Zeit ──
|
||||
// Läuft mit 60 Ticks Verzögerung (3 Sek) damit der Spieler zuerst normal spawnt
|
||||
Bukkit.getScheduler().runTaskLater(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
plugin.getTicketManager().notifyClaimedWhileOffline(player);
|
||||
}, 60L);
|
||||
|
||||
// ── Spieler: über geschlossene Tickets informieren (nur wenn noch nicht geschehen) ──
|
||||
// Bug-Fix: Nutzt close_notified aus der DB statt in-memory Set.
|
||||
// Verhindert Duplikate bei Server-Wechseln in BungeeCord-Netzwerken.
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
List<Ticket> closed = plugin.getDatabaseManager()
|
||||
.getTicketsByStatus(TicketStatus.CLOSED);
|
||||
|
||||
for (Ticket t : closed) {
|
||||
if (!t.getCreatorUUID().equals(player.getUniqueId())) continue;
|
||||
if (t.getCloseComment() == null || t.getCloseComment().isEmpty()) continue;
|
||||
|
||||
// Nicht erneut senden, wenn bereits live benachrichtigt (In-Memory-Set)
|
||||
if (plugin.getTicketManager().wasClosedNotificationSent(t.getId())) continue;
|
||||
// DB-Feld prüfen – funktioniert serverübergreifend
|
||||
if (t.isCloseNotified()) continue;
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () ->
|
||||
plugin.getTicketManager().notifyCreatorClosed(t));
|
||||
@@ -73,7 +133,7 @@ public class PlayerJoinListener implements Listener {
|
||||
player.sendMessage(bar);
|
||||
}
|
||||
});
|
||||
}, 20L); // 1 Sekunde
|
||||
}, 20L);
|
||||
}
|
||||
}
|
||||
}
|
||||
177
src/main/java/de/ticketsystem/manager/CategoryManager.java
Normal file
177
src/main/java/de/ticketsystem/manager/CategoryManager.java
Normal file
@@ -0,0 +1,177 @@
|
||||
package de.ticketsystem.manager;
|
||||
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import de.ticketsystem.model.ConfigCategory;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Loads and manages ticket categories defined in config.yml under the "categories" section.
|
||||
*
|
||||
* Example config.yml layout:
|
||||
*
|
||||
* categories:
|
||||
* general:
|
||||
* name: "Allgemein"
|
||||
* color: "&7"
|
||||
* material: "PAPER"
|
||||
* aliases:
|
||||
* - "allgemein"
|
||||
* - "general"
|
||||
* bug:
|
||||
* name: "Bug"
|
||||
* color: "&c"
|
||||
* material: "REDSTONE"
|
||||
* aliases:
|
||||
* - "bug"
|
||||
* - "fehler"
|
||||
*/
|
||||
public class CategoryManager {
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
|
||||
/** Ordered map: key → ConfigCategory */
|
||||
private final Map<String, ConfigCategory> categories = new LinkedHashMap<>();
|
||||
|
||||
/** Alias → key mapping for fast resolve() lookups */
|
||||
private final Map<String, String> aliasMap = new LinkedHashMap<>();
|
||||
|
||||
public CategoryManager(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
load();
|
||||
}
|
||||
|
||||
// ─────────────────────────── Loading ───────────────────────────────────
|
||||
|
||||
private void load() {
|
||||
categories.clear();
|
||||
aliasMap.clear();
|
||||
|
||||
ConfigurationSection section = plugin.getConfig().getConfigurationSection("categories");
|
||||
|
||||
if (section == null || section.getKeys(false).isEmpty()) {
|
||||
// Fallback: create built-in defaults so the plugin always works
|
||||
loadDefaults();
|
||||
return;
|
||||
}
|
||||
|
||||
for (String key : section.getKeys(false)) {
|
||||
ConfigurationSection cat = section.getConfigurationSection(key);
|
||||
if (cat == null) continue;
|
||||
|
||||
String name = cat.getString("name", capitalize(key));
|
||||
String color = cat.getString("color", "&7");
|
||||
String matStr = cat.getString("material", "PAPER").toUpperCase();
|
||||
Material material;
|
||||
try {
|
||||
material = Material.valueOf(matStr);
|
||||
} catch (IllegalArgumentException e) {
|
||||
plugin.getLogger().warning("[CategoryManager] Unbekanntes Material '" + matStr
|
||||
+ "' für Kategorie '" + key + "'. Fallback: PAPER");
|
||||
material = Material.PAPER;
|
||||
}
|
||||
|
||||
ConfigCategory category = new ConfigCategory(key, name, color, material);
|
||||
categories.put(key.toLowerCase(), category);
|
||||
|
||||
// Register key itself as alias
|
||||
aliasMap.put(key.toLowerCase(), key.toLowerCase());
|
||||
|
||||
// Register additional aliases
|
||||
List<String> aliases = cat.getStringList("aliases");
|
||||
for (String alias : aliases) {
|
||||
aliasMap.put(alias.toLowerCase(), key.toLowerCase());
|
||||
}
|
||||
}
|
||||
|
||||
if (categories.isEmpty()) {
|
||||
plugin.getLogger().warning("[CategoryManager] Keine gültigen Kategorien in der config.yml gefunden. Lade Standardkategorien.");
|
||||
loadDefaults();
|
||||
} else {
|
||||
plugin.getLogger().info("[CategoryManager] " + categories.size() + " Kategorie(n) geladen: " + String.join(", ", categories.keySet()));
|
||||
}
|
||||
}
|
||||
|
||||
/** Built-in fallback categories — mirrors the old TicketCategory enum */
|
||||
private void loadDefaults() {
|
||||
addDefault("general", "Allgemein", "&7", Material.PAPER, "allgemein", "general");
|
||||
addDefault("bug", "Bug", "&c", Material.REDSTONE, "bug", "fehler");
|
||||
addDefault("question", "Frage", "&e", Material.BOOK, "frage", "question");
|
||||
addDefault("complaint", "Beschwerde", "&6", Material.WRITABLE_BOOK, "beschwerde", "complaint");
|
||||
addDefault("other", "Sonstiges", "&8", Material.FEATHER, "sonstiges", "other");
|
||||
plugin.getLogger().info("[CategoryManager] Standard-Kategorien geladen (5).");
|
||||
}
|
||||
|
||||
private void addDefault(String key, String name, String color, Material mat, String... aliases) {
|
||||
ConfigCategory cat = new ConfigCategory(key, name, color, mat);
|
||||
categories.put(key, cat);
|
||||
aliasMap.put(key, key);
|
||||
for (String alias : aliases) aliasMap.put(alias.toLowerCase(), key);
|
||||
}
|
||||
|
||||
// ─────────────────────────── Public API ────────────────────────────────
|
||||
|
||||
/**
|
||||
* Returns all loaded categories in config order.
|
||||
*/
|
||||
public List<ConfigCategory> getAll() {
|
||||
return Collections.unmodifiableList(new ArrayList<>(categories.values()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the first category (default), or a hard-coded fallback if empty.
|
||||
*/
|
||||
public ConfigCategory getDefault() {
|
||||
if (categories.isEmpty()) return new ConfigCategory("general", "Allgemein", "&7", Material.PAPER);
|
||||
return categories.values().iterator().next();
|
||||
}
|
||||
|
||||
/**
|
||||
* Looks up a category by exact key (case-insensitive).
|
||||
* Returns null if not found.
|
||||
*/
|
||||
public ConfigCategory fromKey(String key) {
|
||||
if (key == null) return getDefault();
|
||||
ConfigCategory cat = categories.get(key.toLowerCase());
|
||||
return cat != null ? cat : getDefault();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves a user-supplied string (key or alias) to a ConfigCategory.
|
||||
* Returns null if no match is found (so callers can show an error).
|
||||
*/
|
||||
public ConfigCategory resolve(String input) {
|
||||
if (input == null) return null;
|
||||
String key = aliasMap.get(input.toLowerCase());
|
||||
return key != null ? categories.get(key) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a human-readable comma-separated list of all category keys,
|
||||
* e.g. "general, bug, question, complaint, other"
|
||||
*/
|
||||
public String getAvailableNames() {
|
||||
return String.join(", ", categories.keySet());
|
||||
}
|
||||
|
||||
/**
|
||||
* Reloads categories from the (already reloaded) config.
|
||||
* Call this after plugin.reloadConfig().
|
||||
*/
|
||||
public void reload() {
|
||||
load();
|
||||
}
|
||||
|
||||
// ─────────────────────────── Helpers ───────────────────────────────────
|
||||
|
||||
private static String capitalize(String s) {
|
||||
if (s == null || s.isEmpty()) return s;
|
||||
return Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase();
|
||||
}
|
||||
}
|
||||
@@ -1,15 +1,14 @@
|
||||
package de.ticketsystem.manager;
|
||||
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import de.ticketsystem.model.ConfigCategory;
|
||||
import de.ticketsystem.model.Ticket;
|
||||
import de.ticketsystem.model.TicketStatus;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public class TicketManager {
|
||||
@@ -19,9 +18,6 @@ public class TicketManager {
|
||||
/** Cooldown Map: UUID → Zeitstempel letztes Ticket */
|
||||
private final Map<UUID, Long> cooldowns = new HashMap<>();
|
||||
|
||||
/** Ticket-IDs für die der Ersteller bereits über Schließung informiert wurde */
|
||||
private final Set<Integer> notifiedClosedTickets = new HashSet<>();
|
||||
|
||||
public TicketManager(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
@@ -40,121 +36,308 @@ public class TicketManager {
|
||||
return Math.max(0, (cooldownMillis - elapsed) / 1000);
|
||||
}
|
||||
|
||||
public void setCooldown(UUID uuid) {
|
||||
cooldowns.put(uuid, System.currentTimeMillis());
|
||||
}
|
||||
public void setCooldown(UUID uuid) { cooldowns.put(uuid, System.currentTimeMillis()); }
|
||||
|
||||
// ─────────────────────────── Benachrichtigungen ────────────────────────
|
||||
|
||||
/**
|
||||
* Benachrichtigt alle Online-Supporter/Admins über ein neues Ticket
|
||||
* und sendet optional eine Discord-Webhook-Nachricht.
|
||||
* Benachrichtigt alle Supporter/Admins über ein neues Ticket – auch auf anderen Servern.
|
||||
*
|
||||
* Lokal online Spieler werden direkt angesprochen.
|
||||
* Über BungeeCord werden alle anderen Server im Netzwerk ebenfalls benachrichtigt.
|
||||
* Optional sendet der Discord-Webhook eine Nachricht.
|
||||
*/
|
||||
public void notifyTeam(Ticket ticket) {
|
||||
String msg = plugin.formatMessage("messages.new-ticket-notify")
|
||||
.replace("{player}", ticket.getCreatorName())
|
||||
.replace("{message}", ticket.getMessage())
|
||||
.replace("{id}", String.valueOf(ticket.getId()));
|
||||
String creatorName = ticket.getCreatorName() != null ? ticket.getCreatorName() : "Unbekannt";
|
||||
String message = ticket.getMessage() != null ? ticket.getMessage() : "";
|
||||
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
if (p.hasPermission("ticket.support") || p.hasPermission("ticket.admin")) {
|
||||
p.sendMessage(msg);
|
||||
p.sendMessage(plugin.color("&7» Klicke &e/ticket list &7um die GUI zu öffnen."));
|
||||
// Kategorie & Priorität optional anzeigen
|
||||
String categoryInfo = "";
|
||||
String priorityInfo = "";
|
||||
if (plugin.getConfig().getBoolean("categories-enabled", true)) {
|
||||
ConfigCategory cat = plugin.getCategoryManager().fromKey(ticket.getCategoryKey());
|
||||
categoryInfo = " §7[§r" + cat.getColored() + "§7]";
|
||||
}
|
||||
if (plugin.getConfig().getBoolean("priorities-enabled", true)) {
|
||||
priorityInfo = " §7Priorität: §r" + ticket.getPriority().getColored();
|
||||
}
|
||||
|
||||
// BungeeCord: Server-Herkunft anzeigen wenn BungeeCord aktiviert
|
||||
String serverInfo = "";
|
||||
if (plugin.isBungeeCordEnabled() && !"unknown".equals(ticket.getServerName())) {
|
||||
serverInfo = " §7Server: §b" + ticket.getServerName();
|
||||
}
|
||||
|
||||
String msg = plugin.formatMessage("messages.new-ticket-notify")
|
||||
.replace("{player}", creatorName)
|
||||
.replace("{message}", message)
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
+ categoryInfo + priorityInfo + serverInfo;
|
||||
|
||||
String guiHint = plugin.color("&7» Klicke &e/ticket list &7um die GUI zu öffnen.");
|
||||
|
||||
if (plugin.isBungeeCordEnabled()) {
|
||||
// ─ BungeeCord-Modus: Team-Broadcast über alle Server ─────────────────
|
||||
// BungeeMessenger sendet lokal direkt, dann per Forward an alle anderen Server.
|
||||
// Beide Nachrichten werden zu einer zusammengefasst um ein einzelnes
|
||||
// Forward-Paket zu erzeugen statt zwei (reduziert Netzwerklast und
|
||||
// verhindert mögliche Reihenfolge-Probleme).
|
||||
plugin.getBungeeMessenger().broadcastTeamNotification(msg + "\n" + guiHint);
|
||||
} else {
|
||||
// ─ Standalone-Modus: Nur lokal ───────────────────────────────
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
if (p.hasPermission("ticket.support") || p.hasPermission("ticket.admin")) {
|
||||
p.sendMessage(msg);
|
||||
p.sendMessage(guiHint);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Discord-Webhook (asynchron, kein Einfluss auf Server-Performance)
|
||||
plugin.getDiscordWebhook().sendNewTicket(ticket);
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket angenommen wurde.
|
||||
* Setzt claimer_notified = true und persistiert es.
|
||||
*
|
||||
* BungeeCord: Zustellung auch wenn der Spieler auf einem anderen Server ist.
|
||||
*/
|
||||
public void notifyCreatorClaimed(Ticket ticket) {
|
||||
Player creator = Bukkit.getPlayer(ticket.getCreatorUUID());
|
||||
if (creator != null && creator.isOnline()) {
|
||||
String msg = plugin.formatMessage("messages.ticket-claimed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{claimer}", ticket.getClaimerName());
|
||||
creator.sendMessage(msg);
|
||||
}
|
||||
String claimerName = resolveClaimerName(ticket);
|
||||
|
||||
String msg = plugin.formatMessage("messages.ticket-claimed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{claimer}", claimerName);
|
||||
|
||||
deliverToPlayer(ticket.getCreatorUUID(), ticket.getCreatorName(), msg);
|
||||
|
||||
// Persistiert setzen, damit Join-Listener weiß, dass Spieler bereits informiert ist
|
||||
plugin.getDatabaseManager().markClaimerNotified(ticket.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Wird beim Server-Join aufgerufen – informiert den Spieler über Tickets,
|
||||
* die geclaimt oder weitergeleitet wurden während er offline war.
|
||||
*/
|
||||
public void notifyClaimedWhileOffline(Player player) {
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
var tickets = plugin.getDatabaseManager().getTicketsByStatus(
|
||||
TicketStatus.CLAIMED, TicketStatus.FORWARDED);
|
||||
|
||||
for (Ticket t : tickets) {
|
||||
if (!t.getCreatorUUID().equals(player.getUniqueId())) continue;
|
||||
if (t.isClaimerNotified()) continue;
|
||||
|
||||
String claimerName = t.getClaimerName() != null ? t.getClaimerName() : "Support";
|
||||
final String name = claimerName;
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
if (!player.isOnline()) return;
|
||||
if (t.getStatus() == TicketStatus.CLAIMED) {
|
||||
String msg = plugin.formatMessage("messages.ticket-claimed-notify")
|
||||
.replace("{id}", String.valueOf(t.getId()))
|
||||
.replace("{claimer}", name);
|
||||
player.sendMessage(msg);
|
||||
} else {
|
||||
String forwardedTo = t.getForwardedToName() != null ? t.getForwardedToName() : "einen Supporter";
|
||||
String msg = plugin.formatMessage("messages.ticket-forwarded-creator-notify")
|
||||
.replace("{id}", String.valueOf(t.getId()))
|
||||
.replace("{supporter}", forwardedTo);
|
||||
player.sendMessage(msg);
|
||||
}
|
||||
});
|
||||
|
||||
plugin.getDatabaseManager().markClaimerNotified(t.getId());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket weitergeleitet wurde.
|
||||
* BungeeCord: Cross-Server-Zustellung.
|
||||
*/
|
||||
public void notifyCreatorForwarded(Ticket ticket) {
|
||||
Player creator = Bukkit.getPlayer(ticket.getCreatorUUID());
|
||||
if (creator != null && creator.isOnline()) {
|
||||
String forwardedTo = ticket.getForwardedToName() != null ? ticket.getForwardedToName() : "einen Supporter";
|
||||
String msg = plugin.formatMessage("messages.ticket-forwarded-creator-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{supporter}", forwardedTo);
|
||||
creator.sendMessage(msg);
|
||||
}
|
||||
String forwardedTo = ticket.getForwardedToName() != null ? ticket.getForwardedToName() : "einen Supporter";
|
||||
String msg = plugin.formatMessage("messages.ticket-forwarded-creator-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{supporter}", forwardedTo);
|
||||
|
||||
deliverToPlayer(ticket.getCreatorUUID(), ticket.getCreatorName(), msg);
|
||||
|
||||
// Auch bei Weiterleitung notified setzen
|
||||
plugin.getDatabaseManager().markClaimerNotified(ticket.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet dem weitergeleiteten Supporter eine Benachrichtigung
|
||||
* und informiert optional Discord.
|
||||
* Sendet dem weitergeleiteten Supporter eine Benachrichtigung.
|
||||
* BungeeCord: Zustellung auch wenn der Supporter auf einem anderen Server ist.
|
||||
*/
|
||||
public void notifyForwardedTo(Ticket ticket, String fromName) {
|
||||
Player target = Bukkit.getPlayer(ticket.getForwardedToUUID());
|
||||
if (target != null && target.isOnline()) {
|
||||
String msg = plugin.formatMessage("messages.ticket-forwarded-notify")
|
||||
.replace("{player}", ticket.getCreatorName())
|
||||
.replace("{id}", String.valueOf(ticket.getId()));
|
||||
target.sendMessage(msg);
|
||||
}
|
||||
if (ticket.getForwardedToUUID() == null) return;
|
||||
|
||||
String creatorName = ticket.getCreatorName() != null ? ticket.getCreatorName() : "Unbekannt";
|
||||
String msg = plugin.formatMessage("messages.ticket-forwarded-notify")
|
||||
.replace("{player}", creatorName)
|
||||
.replace("{id}", String.valueOf(ticket.getId()));
|
||||
|
||||
deliverToPlayer(ticket.getForwardedToUUID(), ticket.getForwardedToName(), msg);
|
||||
|
||||
// Discord
|
||||
plugin.getDiscordWebhook().sendTicketForwarded(ticket, fromName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket geschlossen wurde,
|
||||
* und informiert optional Discord.
|
||||
*/
|
||||
public void notifyCreatorClosed(Ticket ticket) {
|
||||
notifyCreatorClosed(ticket, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket geschlossen wurde.
|
||||
* @param closerName Name des Admins/Supporters der es geschlossen hat (für Discord, kann null sein)
|
||||
* BungeeCord: Cross-Server-Zustellung + Fallback in Pending-DB.
|
||||
*/
|
||||
public void notifyCreatorClosed(Ticket ticket) { notifyCreatorClosed(ticket, null); }
|
||||
|
||||
public void notifyCreatorClosed(Ticket ticket, String closerName) {
|
||||
notifiedClosedTickets.add(ticket.getId());
|
||||
// Bug-Fix: close_notified wird in der DB gespeichert – kein In-Memory-Set mehr.
|
||||
// Dadurch funktioniert der Check auch nach einem Server-Wechsel korrekt.
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () ->
|
||||
plugin.getDatabaseManager().markCloseNotified(ticket.getId()));
|
||||
|
||||
Player creator = Bukkit.getPlayer(ticket.getCreatorUUID());
|
||||
if (creator != null && creator.isOnline()) {
|
||||
String comment = (ticket.getCloseComment() != null && !ticket.getCloseComment().isEmpty())
|
||||
? ticket.getCloseComment() : "";
|
||||
String comment = (ticket.getCloseComment() != null && !ticket.getCloseComment().isEmpty())
|
||||
? ticket.getCloseComment() : "";
|
||||
|
||||
String msg = plugin.formatMessage("messages.ticket-closed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{comment}", comment);
|
||||
creator.sendMessage(msg);
|
||||
// Hauptnachricht
|
||||
String msg = plugin.formatMessage("messages.ticket-closed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{comment}", comment);
|
||||
|
||||
if (!comment.isEmpty()) {
|
||||
creator.sendMessage(plugin.color("&7Kommentar des Supports: &f" + comment));
|
||||
}
|
||||
// Bewertungsaufforderung
|
||||
String ratingMsg = null;
|
||||
if (plugin.getConfig().getBoolean("rating-enabled", true)) {
|
||||
ratingMsg = plugin.color(
|
||||
"&8&m &r\n" +
|
||||
"&6Wie zufrieden bist du mit dem Support?\n" +
|
||||
"&a/ticket rate " + ticket.getId() + " good &7– 👍 Gut\n" +
|
||||
"&c/ticket rate " + ticket.getId() + " bad &7– 👎 Schlecht\n" +
|
||||
"&8&m ");
|
||||
}
|
||||
|
||||
// Prüfen ob Ersteller lokal online ist
|
||||
Player creator = Bukkit.getPlayer(ticket.getCreatorUUID());
|
||||
if (creator != null && creator.isOnline()) {
|
||||
// ─ Lokal online: direkt zustellen ────────────────────────────
|
||||
creator.sendMessage(msg);
|
||||
if (!comment.isEmpty())
|
||||
creator.sendMessage(plugin.color("&7Kommentar des Supports: &f" + comment));
|
||||
if (ratingMsg != null) creator.sendMessage(ratingMsg);
|
||||
|
||||
} else if (plugin.isBungeeCordEnabled()) {
|
||||
// ─ BungeeCord: via Plugin-Messaging auf anderen Servern zustellen ─
|
||||
// KEIN savePendingClosedNotification hier! Das würde bei Server-Wechsel
|
||||
// als "Offline-Nachricht" doppelt angezeigt werden.
|
||||
// BungeeCord's "Message"-Kanal erreicht den Spieler netzwerkweit sofern er online ist.
|
||||
// Ist er wirklich offline, sieht er beim nächsten Login via PlayerJoinListener
|
||||
// eine frische Benachrichtigung (close_notified=true verhindert Duplikate).
|
||||
plugin.getBungeeMessenger().sendMessageToPlayer(
|
||||
ticket.getCreatorUUID(), ticket.getCreatorName(), msg);
|
||||
if (!comment.isEmpty())
|
||||
plugin.getBungeeMessenger().sendMessageToPlayer(
|
||||
ticket.getCreatorUUID(), ticket.getCreatorName(),
|
||||
plugin.color("&7Kommentar des Supports: &f" + comment));
|
||||
if (ratingMsg != null)
|
||||
plugin.getBungeeMessenger().sendMessageToPlayer(
|
||||
ticket.getCreatorUUID(), ticket.getCreatorName(), ratingMsg);
|
||||
|
||||
} else {
|
||||
// ─ Standalone, Spieler offline: in Pending-DB speichern ──────
|
||||
savePendingClosedNotification(ticket, comment);
|
||||
}
|
||||
|
||||
// Discord
|
||||
String closer = closerName != null ? closerName : "Unbekannt";
|
||||
plugin.getDiscordWebhook().sendTicketClosed(ticket, closer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prüft ob der Ersteller für dieses Ticket bereits über die Schließung informiert wurde.
|
||||
* Bug-Fix: Nutzt jetzt close_notified aus der DB statt ein In-Memory-Set.
|
||||
* Funktioniert damit auch nach Server-Wechseln in BungeeCord-Netzwerken korrekt.
|
||||
*
|
||||
* @deprecated Bitte stattdessen ticket.isCloseNotified() direkt prüfen,
|
||||
* da das Ticket-Objekt aus der DB bereits den korrekten Wert hat.
|
||||
*/
|
||||
public boolean wasClosedNotificationSent(int ticketId) {
|
||||
return notifiedClosedTickets.contains(ticketId);
|
||||
// Direkt in der DB nachschlagen – kein In-Memory-Set, kein Server-gebundener State
|
||||
Ticket t = plugin.getDatabaseManager().getTicketById(ticketId);
|
||||
return t != null && t.isCloseNotified();
|
||||
}
|
||||
|
||||
// ─────────────────────────── BungeeCord Hilfsmethoden ──────────────────
|
||||
|
||||
// ── BUG FIX #2 ──────────────────────────────────────────────────────────
|
||||
// Vorher: addPendingNotification() wurde IMMER asynchron ausgeführt –
|
||||
// auch wenn der Spieler lokal online war oder BungeeCord die
|
||||
// Nachricht bereits zugestellt hat. Das führte dazu, dass Spieler
|
||||
// beim nächsten Login immer noch eine "verpasste Nachricht" sahen,
|
||||
// obwohl sie die Nachricht bereits erhalten hatten.
|
||||
//
|
||||
// Fix: addPendingNotification() wird nur noch aufgerufen wenn:
|
||||
// 1. Der Spieler NICHT lokal online ist, UND
|
||||
// 2. BungeeCord NICHT aktiviert ist (Standalone-Fallback).
|
||||
// Im BungeeCord-Modus ist der BungeeCord-"Message"-Kanal für die
|
||||
// Zustellung zuständig. Offline-Spieler werden über close_notified
|
||||
// und den PlayerJoinListener beim nächsten Login benachrichtigt.
|
||||
// ────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Zustellung einer Nachricht an einen Spieler.
|
||||
*
|
||||
* Ablauf:
|
||||
* 1. Spieler lokal online → direkt
|
||||
* 2. BungeeCord aktiv → via Plugin-Messaging (kein Pending-Eintrag)
|
||||
* 3. Offline + Standalone → Pending-DB (Zustellung beim nächsten Login)
|
||||
*
|
||||
* @param uuid UUID des Empfängers
|
||||
* @param name Spielername (für BungeeCord-Lookup)
|
||||
* @param message Bereits color-übersetzter Text
|
||||
*/
|
||||
private void deliverToPlayer(UUID uuid, String name, String message) {
|
||||
Player local = Bukkit.getPlayer(uuid);
|
||||
if (local != null && local.isOnline()) {
|
||||
// Lokal online → direkt zustellen, fertig
|
||||
local.sendMessage(message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (plugin.isBungeeCordEnabled()) {
|
||||
// BungeeCord-Modus: Nachricht über Plugin-Messaging weiterleiten.
|
||||
// KEIN Pending-Eintrag! BungeeCord übernimmt die Zustellung.
|
||||
// Ist der Spieler wirklich offline, kümmert sich der PlayerJoinListener
|
||||
// beim nächsten Login um die Benachrichtigung.
|
||||
plugin.getBungeeMessenger().sendMessageToPlayer(uuid, name, message);
|
||||
return;
|
||||
}
|
||||
|
||||
// Standalone-Modus, Spieler offline → in Pending-DB speichern
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () ->
|
||||
plugin.getDatabaseManager().addPendingNotification(uuid, message));
|
||||
}
|
||||
|
||||
/**
|
||||
* Speichert eine ausstehende Schließ-Benachrichtigung in der DB.
|
||||
*/
|
||||
private void savePendingClosedNotification(Ticket ticket, String comment) {
|
||||
String pendingMsg = "&e[Ticket #" + ticket.getId() + "] &7Dein Ticket wurde geschlossen."
|
||||
+ (comment.isEmpty() ? "" : " &7Kommentar: &f" + comment)
|
||||
+ (plugin.getConfig().getBoolean("rating-enabled", true)
|
||||
? " &7Bewertung: &e/ticket rate " + ticket.getId() + " good/bad" : "");
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () ->
|
||||
plugin.getDatabaseManager().addPendingNotification(ticket.getCreatorUUID(), pendingMsg));
|
||||
}
|
||||
|
||||
// ─────────────────────────── Hilfsmethoden ─────────────────────────────
|
||||
|
||||
private String resolveClaimerName(Ticket ticket) {
|
||||
if (ticket.getClaimerName() != null) return ticket.getClaimerName();
|
||||
if (ticket.getClaimerUUID() != null) {
|
||||
String name = Bukkit.getOfflinePlayer(ticket.getClaimerUUID()).getName();
|
||||
if (name != null) return name;
|
||||
}
|
||||
return "Support";
|
||||
}
|
||||
|
||||
public boolean hasReachedTicketLimit(UUID uuid) {
|
||||
int max = plugin.getConfig().getInt("max-open-tickets-per-player", 2);
|
||||
if (max <= 0) return false;
|
||||
@@ -165,16 +348,29 @@ public class TicketManager {
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&6TicketSystem &7– Befehle"));
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&e/ticket create <Text> &7– Neues Ticket erstellen"));
|
||||
player.sendMessage(plugin.color("&e/ticket create [Kategorie] <Text> &7– Neues Ticket erstellen"));
|
||||
player.sendMessage(plugin.color("&e/ticket list &7– Deine Tickets ansehen (GUI)"));
|
||||
player.sendMessage(plugin.color("&e/ticket comment <ID> <Text> &7– Nachricht zu einem Ticket"));
|
||||
|
||||
if (plugin.getConfig().getBoolean("rating-enabled", true))
|
||||
player.sendMessage(plugin.color("&e/ticket rate <ID> <good|bad> &7– Support bewerten"));
|
||||
|
||||
if (player.hasPermission("ticket.support") || player.hasPermission("ticket.admin")) {
|
||||
player.sendMessage(plugin.color("&e/ticket claim <ID> &7– Ticket annehmen"));
|
||||
player.sendMessage(plugin.color("&e/ticket close <ID> [Kommentar] &7– Ticket schließen"));
|
||||
}
|
||||
if (player.hasPermission("ticket.admin")) {
|
||||
player.sendMessage(plugin.color("&e/ticket forward <ID> <Spieler> &7– Ticket weiterleiten"));
|
||||
player.sendMessage(plugin.color("&e/ticket blacklist <add|remove|list> [Spieler] [Grund] &7– Blacklist verwalten"));
|
||||
player.sendMessage(plugin.color("&e/ticket reload &7– Konfiguration neu laden"));
|
||||
player.sendMessage(plugin.color("&e/ticket stats &7– Statistiken anzeigen"));
|
||||
}
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
|
||||
// BungeeCord-Status anzeigen
|
||||
if (player.hasPermission("ticket.admin") && plugin.isBungeeCordEnabled()) {
|
||||
player.sendMessage(plugin.color("&8[BungeeCord] &7Server: &b" + plugin.getServerName()
|
||||
+ " &8| Cross-Server-Benachrichtigungen &aaktiv"));
|
||||
}
|
||||
}
|
||||
}
|
||||
53
src/main/java/de/ticketsystem/model/ConfigCategory.java
Normal file
53
src/main/java/de/ticketsystem/model/ConfigCategory.java
Normal file
@@ -0,0 +1,53 @@
|
||||
package de.ticketsystem.model;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
/**
|
||||
* Eine aus der config.yml geladene Ticket-Kategorie.
|
||||
* Ersetzt das hardcodierte TicketCategory-Enum vollständig.
|
||||
*
|
||||
* Konfigurationsbeispiel (config.yml):
|
||||
*
|
||||
* categories:
|
||||
* bug:
|
||||
* name: "Bug"
|
||||
* color: "&c"
|
||||
* material: "REDSTONE"
|
||||
* aliases:
|
||||
* - "bug"
|
||||
* - "fehler"
|
||||
*/
|
||||
public class ConfigCategory {
|
||||
|
||||
/** Interner Schlüssel aus der Config (z.B. "bug", "general") – immer Kleinbuchstaben */
|
||||
private final String key;
|
||||
|
||||
/** Anzeigename (z.B. "Bug", "Allgemein") */
|
||||
private final String name;
|
||||
|
||||
/** Minecraft-Farbcode (z.B. "&c") */
|
||||
private final String color;
|
||||
|
||||
/** GUI-Item-Material */
|
||||
private final Material material;
|
||||
|
||||
public ConfigCategory(String key, String name, String color, Material material) {
|
||||
this.key = key.toLowerCase();
|
||||
this.name = name;
|
||||
this.color = color;
|
||||
this.material = material;
|
||||
}
|
||||
|
||||
public String getKey() { return key; }
|
||||
public String getName() { return name; }
|
||||
public String getColor() { return color; }
|
||||
public Material getMaterial() { return material; }
|
||||
|
||||
/** Gibt den farbigen Anzeigenamen zurück, z.B. "§cBug" */
|
||||
public String getColored() {
|
||||
return org.bukkit.ChatColor.translateAlternateColorCodes('&', color + name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() { return key; }
|
||||
}
|
||||
@@ -3,7 +3,6 @@ package de.ticketsystem.model;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||
import org.bukkit.configuration.serialization.SerializableAs;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
||||
@@ -17,200 +16,194 @@ import java.util.UUID;
|
||||
@SerializableAs("Ticket")
|
||||
public class Ticket implements ConfigurationSerializable {
|
||||
|
||||
private int id;
|
||||
private UUID creatorUUID;
|
||||
private int id;
|
||||
private UUID creatorUUID;
|
||||
private String creatorName;
|
||||
private String message;
|
||||
|
||||
private String worldName;
|
||||
private double x, y, z;
|
||||
private float yaw, pitch;
|
||||
private float yaw, pitch;
|
||||
|
||||
/**
|
||||
* Name des Servers auf dem das Ticket erstellt wurde (BungeeCord-Netzwerk).
|
||||
* Entspricht dem Wert aus config.yml → server-name.
|
||||
* Standardwert: "unknown"
|
||||
*/
|
||||
private String serverName = "unknown";
|
||||
|
||||
private TicketStatus status;
|
||||
private UUID claimerUUID;
|
||||
private String claimerName;
|
||||
private UUID forwardedToUUID;
|
||||
private String forwardedToName;
|
||||
private Timestamp createdAt;
|
||||
private Timestamp claimedAt;
|
||||
private Timestamp closedAt;
|
||||
private String closeComment;
|
||||
private UUID claimerUUID;
|
||||
private String claimerName;
|
||||
private UUID forwardedToUUID;
|
||||
private String forwardedToName;
|
||||
private Timestamp createdAt;
|
||||
private Timestamp claimedAt;
|
||||
private Timestamp closedAt;
|
||||
private String closeComment;
|
||||
|
||||
private boolean playerDeleted = false;
|
||||
|
||||
/** Kategorie-Key aus config.yml, z.B. "bug", "general" */
|
||||
private String categoryKey = "general";
|
||||
|
||||
private TicketPriority priority = TicketPriority.NORMAL;
|
||||
|
||||
/** null = nicht bewertet | "THUMBS_UP" | "THUMBS_DOWN" */
|
||||
private String playerRating = null;
|
||||
private boolean claimerNotified = false;
|
||||
|
||||
/**
|
||||
* Gibt an ob der Ersteller bereits über die Schließung informiert wurde.
|
||||
* Wird in der DB gespeichert damit Server-Wechsel keine Duplikate erzeugen.
|
||||
*/
|
||||
private boolean closeNotified = false;
|
||||
|
||||
public Ticket() {}
|
||||
|
||||
|
||||
public Ticket(UUID creatorUUID, String creatorName, String message, Location location) {
|
||||
this.creatorUUID = creatorUUID;
|
||||
this.creatorName = creatorName;
|
||||
this.message = message;
|
||||
this.worldName = location.getWorld().getName();
|
||||
this.x = location.getX();
|
||||
this.y = location.getY();
|
||||
this.z = location.getZ();
|
||||
this.yaw = location.getYaw();
|
||||
this.pitch = location.getPitch();
|
||||
this.status = TicketStatus.OPEN;
|
||||
this.message = message;
|
||||
this.worldName = location.getWorld().getName();
|
||||
this.x = location.getX(); this.y = location.getY(); this.z = location.getZ();
|
||||
this.yaw = location.getYaw(); this.pitch = location.getPitch();
|
||||
this.status = TicketStatus.OPEN;
|
||||
this.createdAt = new Timestamp(System.currentTimeMillis());
|
||||
}
|
||||
|
||||
// --- NEU: Konstruktor zum Laden aus der YAML (Deserialisierung) ---
|
||||
public Ticket(Map<String, Object> map) {
|
||||
this.id = (int) map.get("id");
|
||||
|
||||
// UUIDs sicher aus String konvertieren
|
||||
Object creatorObj = map.get("creatorUUID");
|
||||
this.creatorUUID = creatorObj instanceof UUID ? (UUID) creatorObj : UUID.fromString((String) creatorObj);
|
||||
|
||||
Object cObj = map.get("creatorUUID");
|
||||
this.creatorUUID = cObj instanceof UUID ? (UUID) cObj : UUID.fromString((String) cObj);
|
||||
this.creatorName = (String) map.get("creatorName");
|
||||
this.message = (String) map.get("message");
|
||||
this.worldName = (String) map.get("world");
|
||||
|
||||
// Koordinaten sicher parsen
|
||||
this.x = map.get("x") instanceof Double ? (Double) map.get("x") : ((Number) map.get("x")).doubleValue();
|
||||
this.y = map.get("y") instanceof Double ? (Double) map.get("y") : ((Number) map.get("y")).doubleValue();
|
||||
this.z = map.get("z") instanceof Double ? (Double) map.get("z") : ((Number) map.get("z")).doubleValue();
|
||||
|
||||
this.yaw = map.get("yaw") instanceof Float ? (Float) map.get("yaw") : ((Number) map.get("yaw")).floatValue();
|
||||
this.pitch = map.get("pitch") instanceof Float ? (Float) map.get("pitch") : ((Number) map.get("pitch")).floatValue();
|
||||
|
||||
this.message = (String) map.get("message");
|
||||
this.worldName = (String) map.get("world");
|
||||
this.x = toDouble(map.get("x")); this.y = toDouble(map.get("y")); this.z = toDouble(map.get("z"));
|
||||
this.yaw = toFloat(map.get("yaw")); this.pitch = toFloat(map.get("pitch"));
|
||||
this.status = TicketStatus.valueOf((String) map.get("status"));
|
||||
|
||||
// Timestamps aus Long (Millis) wieder zu Timestamp machen
|
||||
if (map.get("createdAt") != null) {
|
||||
this.createdAt = new Timestamp(((Number) map.get("createdAt")).longValue());
|
||||
}
|
||||
if (map.get("claimedAt") != null) {
|
||||
this.claimedAt = new Timestamp(((Number) map.get("claimedAt")).longValue());
|
||||
}
|
||||
if (map.get("closedAt") != null) {
|
||||
this.closedAt = new Timestamp(((Number) map.get("closedAt")).longValue());
|
||||
}
|
||||
|
||||
if (map.get("createdAt") != null) this.createdAt = new Timestamp(toLong(map.get("createdAt")));
|
||||
if (map.get("claimedAt") != null) this.claimedAt = new Timestamp(toLong(map.get("claimedAt")));
|
||||
if (map.get("closedAt") != null) this.closedAt = new Timestamp(toLong(map.get("closedAt")));
|
||||
this.closeComment = (String) map.get("closeComment");
|
||||
|
||||
// Optionale Felder
|
||||
if (map.containsKey("claimerUUID") && map.get("claimerUUID") != null) {
|
||||
Object claimerObj = map.get("claimerUUID");
|
||||
this.claimerUUID = claimerObj instanceof UUID ? (UUID) claimerObj : UUID.fromString((String) claimerObj);
|
||||
Object o = map.get("claimerUUID");
|
||||
this.claimerUUID = o instanceof UUID ? (UUID) o : UUID.fromString((String) o);
|
||||
this.claimerName = (String) map.get("claimerName");
|
||||
}
|
||||
|
||||
if (map.containsKey("forwardedToUUID") && map.get("forwardedToUUID") != null) {
|
||||
Object fwdObj = map.get("forwardedToUUID");
|
||||
this.forwardedToUUID = fwdObj instanceof UUID ? (UUID) fwdObj : UUID.fromString((String) fwdObj);
|
||||
Object o = map.get("forwardedToUUID");
|
||||
this.forwardedToUUID = o instanceof UUID ? (UUID) o : UUID.fromString((String) o);
|
||||
this.forwardedToName = (String) map.get("forwardedToName");
|
||||
}
|
||||
if (map.containsKey("playerDeleted")) this.playerDeleted = (boolean) map.get("playerDeleted");
|
||||
if (map.containsKey("category")) this.categoryKey = (String) map.get("category");
|
||||
if (map.containsKey("priority")) this.priority = TicketPriority.fromString((String) map.get("priority"));
|
||||
if (map.containsKey("playerRating")) this.playerRating = (String) map.get("playerRating");
|
||||
if (map.containsKey("claimerNotified")) this.claimerNotified = (boolean) map.get("claimerNotified");
|
||||
// BungeeCord: Server-Name laden (Fallback: "unknown")
|
||||
if (map.containsKey("serverName")) this.serverName = (String) map.get("serverName");
|
||||
if (map.containsKey("closeNotified")) this.closeNotified = (boolean) map.get("closeNotified");
|
||||
}
|
||||
|
||||
// --- NEU: Methode zum Speichern in die YAML (Serialisierung) ---
|
||||
@Override
|
||||
public Map<String, Object> serialize() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
|
||||
map.put("id", id);
|
||||
// WICHTIG: UUID als String speichern, um !!java.util.UUID Tag zu vermeiden
|
||||
map.put("creatorUUID", creatorUUID.toString());
|
||||
map.put("creatorName", creatorName);
|
||||
map.put("message", message);
|
||||
map.put("world", worldName);
|
||||
|
||||
map.put("x", x);
|
||||
map.put("y", y);
|
||||
map.put("z", z);
|
||||
map.put("yaw", yaw);
|
||||
map.put("pitch", pitch);
|
||||
|
||||
map.put("message", message);
|
||||
map.put("world", worldName);
|
||||
map.put("x", x); map.put("y", y); map.put("z", z);
|
||||
map.put("yaw", yaw); map.put("pitch", pitch);
|
||||
map.put("status", status.name());
|
||||
|
||||
// Timestamps als Long speichern
|
||||
if (createdAt != null) map.put("createdAt", createdAt.getTime());
|
||||
if (claimedAt != null) map.put("claimedAt", claimedAt.getTime());
|
||||
if (closedAt != null) map.put("closedAt", closedAt.getTime());
|
||||
|
||||
if (closedAt != null) map.put("closedAt", closedAt.getTime());
|
||||
if (closeComment != null) map.put("closeComment", closeComment);
|
||||
|
||||
if (claimerUUID != null) {
|
||||
map.put("claimerUUID", claimerUUID.toString());
|
||||
map.put("claimerName", claimerName);
|
||||
}
|
||||
|
||||
if (forwardedToUUID != null) {
|
||||
map.put("forwardedToUUID", forwardedToUUID.toString());
|
||||
map.put("forwardedToName", forwardedToName);
|
||||
}
|
||||
|
||||
if (claimerUUID != null) { map.put("claimerUUID", claimerUUID.toString()); map.put("claimerName", claimerName); }
|
||||
if (forwardedToUUID != null) { map.put("forwardedToUUID", forwardedToUUID.toString()); map.put("forwardedToName", forwardedToName); }
|
||||
map.put("playerDeleted", playerDeleted);
|
||||
map.put("category", categoryKey);
|
||||
map.put("priority", priority.name());
|
||||
if (playerRating != null) map.put("playerRating", playerRating);
|
||||
map.put("claimerNotified", claimerNotified);
|
||||
// BungeeCord: Server-Name speichern
|
||||
map.put("serverName", serverName);
|
||||
map.put("closeNotified", closeNotified);
|
||||
return map;
|
||||
}
|
||||
|
||||
// --- NEU: Registrierung ---
|
||||
public static void register() {
|
||||
ConfigurationSerialization.registerClass(Ticket.class, "Ticket");
|
||||
}
|
||||
public static void register() { ConfigurationSerialization.registerClass(Ticket.class, "Ticket"); }
|
||||
|
||||
// --- Deine ursprüngliche getLocation Methode (beibehalten) ---
|
||||
public Location getLocation() {
|
||||
World world = Bukkit.getWorld(worldName);
|
||||
if (world == null) return null;
|
||||
return new Location(world, x, y, z, yaw, pitch);
|
||||
return world == null ? null : new Location(world, x, y, z, yaw, pitch);
|
||||
}
|
||||
|
||||
// ─────────────────────────── Getter & Setter ────────────────────────────
|
||||
private static double toDouble(Object o) { return o instanceof Double d ? d : ((Number) o).doubleValue(); }
|
||||
private static float toFloat(Object o) { return o instanceof Float f ? f : ((Number) o).floatValue(); }
|
||||
private static long toLong(Object o) { return ((Number) o).longValue(); }
|
||||
|
||||
public int getId() { return id; }
|
||||
public void setId(int id) { this.id = id; }
|
||||
// ─────────────────────────── Getter & Setter ───────────────────────────
|
||||
|
||||
public UUID getCreatorUUID() { return creatorUUID; }
|
||||
public void setCreatorUUID(UUID creatorUUID) { this.creatorUUID = creatorUUID; }
|
||||
public int getId() { return id; }
|
||||
public void setId(int id) { this.id = id; }
|
||||
public UUID getCreatorUUID() { return creatorUUID; }
|
||||
public void setCreatorUUID(UUID v) { this.creatorUUID = v; }
|
||||
public String getCreatorName() { return creatorName; }
|
||||
public void setCreatorName(String v) { this.creatorName = v; }
|
||||
public String getMessage() { return message; }
|
||||
public void setMessage(String v) { this.message = v; }
|
||||
public String getWorldName() { return worldName; }
|
||||
public void setWorldName(String v) { this.worldName = v; }
|
||||
public double getX() { return x; }
|
||||
public void setX(double v) { this.x = v; }
|
||||
public double getY() { return y; }
|
||||
public void setY(double v) { this.y = v; }
|
||||
public double getZ() { return z; }
|
||||
public void setZ(double v) { this.z = v; }
|
||||
public float getYaw() { return yaw; }
|
||||
public void setYaw(float v) { this.yaw = v; }
|
||||
public float getPitch() { return pitch; }
|
||||
public void setPitch(float v) { this.pitch = v; }
|
||||
public TicketStatus getStatus() { return status; }
|
||||
public void setStatus(TicketStatus v) { this.status = v; }
|
||||
public UUID getClaimerUUID() { return claimerUUID; }
|
||||
public void setClaimerUUID(UUID v) { this.claimerUUID = v; }
|
||||
public String getClaimerName() { return claimerName; }
|
||||
public void setClaimerName(String v) { this.claimerName = v; }
|
||||
public UUID getForwardedToUUID() { return forwardedToUUID; }
|
||||
public void setForwardedToUUID(UUID v) { this.forwardedToUUID = v; }
|
||||
public String getForwardedToName() { return forwardedToName; }
|
||||
public void setForwardedToName(String v) { this.forwardedToName = v; }
|
||||
public Timestamp getCreatedAt() { return createdAt; }
|
||||
public void setCreatedAt(Timestamp v) { this.createdAt = v; }
|
||||
public Timestamp getClaimedAt() { return claimedAt; }
|
||||
public void setClaimedAt(Timestamp v) { this.claimedAt = v; }
|
||||
public Timestamp getClosedAt() { return closedAt; }
|
||||
public void setClosedAt(Timestamp v) { this.closedAt = v; }
|
||||
public String getCloseComment() { return closeComment; }
|
||||
public void setCloseComment(String v) { this.closeComment = v; }
|
||||
public boolean isPlayerDeleted() { return playerDeleted; }
|
||||
public void setPlayerDeleted(boolean v) { this.playerDeleted = v; }
|
||||
public String getCategoryKey() { return categoryKey; }
|
||||
public void setCategoryKey(String v) { this.categoryKey = v != null ? v.toLowerCase() : "general"; }
|
||||
public TicketPriority getPriority() { return priority; }
|
||||
public void setPriority(TicketPriority v) { this.priority = v; }
|
||||
public String getPlayerRating() { return playerRating; }
|
||||
public void setPlayerRating(String v) { this.playerRating = v; }
|
||||
public boolean hasRating() { return playerRating != null; }
|
||||
public boolean isClaimerNotified() { return claimerNotified; }
|
||||
public void setClaimerNotified(boolean v) { this.claimerNotified = v; }
|
||||
|
||||
public String getCreatorName() { return creatorName; }
|
||||
public void setCreatorName(String creatorName) { this.creatorName = creatorName; }
|
||||
/** BungeeCord: Gibt den Server-Namen zurück, auf dem das Ticket erstellt wurde. */
|
||||
public String getServerName() { return serverName != null ? serverName : "unknown"; }
|
||||
/** BungeeCord: Setzt den Server-Namen (aus config.yml → server-name). */
|
||||
public void setServerName(String v) { this.serverName = v != null ? v : "unknown"; }
|
||||
|
||||
public String getMessage() { return message; }
|
||||
public void setMessage(String message) { this.message = message; }
|
||||
|
||||
public String getWorldName() { return worldName; }
|
||||
public void setWorldName(String worldName) { this.worldName = worldName; }
|
||||
|
||||
public double getX() { return x; }
|
||||
public void setX(double x) { this.x = x; }
|
||||
|
||||
public double getY() { return y; }
|
||||
public void setY(double y) { this.y = y; }
|
||||
|
||||
public double getZ() { return z; }
|
||||
public void setZ(double z) { this.z = z; }
|
||||
|
||||
public float getYaw() { return yaw; }
|
||||
public void setYaw(float yaw) { this.yaw = yaw; }
|
||||
|
||||
public float getPitch() { return pitch; }
|
||||
public void setPitch(float pitch) { this.pitch = pitch; }
|
||||
|
||||
public TicketStatus getStatus() { return status; }
|
||||
public void setStatus(TicketStatus status) { this.status = status; }
|
||||
|
||||
public UUID getClaimerUUID() { return claimerUUID; }
|
||||
public void setClaimerUUID(UUID claimerUUID) { this.claimerUUID = claimerUUID; }
|
||||
|
||||
public String getClaimerName() { return claimerName; }
|
||||
public void setClaimerName(String claimerName) { this.claimerName = claimerName; }
|
||||
|
||||
public UUID getForwardedToUUID() { return forwardedToUUID; }
|
||||
public void setForwardedToUUID(UUID forwardedToUUID) { this.forwardedToUUID = forwardedToUUID; }
|
||||
|
||||
public String getForwardedToName() { return forwardedToName; }
|
||||
public void setForwardedToName(String forwardedToName) { this.forwardedToName = forwardedToName; }
|
||||
|
||||
public Timestamp getCreatedAt() { return createdAt; }
|
||||
public void setCreatedAt(Timestamp createdAt) { this.createdAt = createdAt; }
|
||||
|
||||
public Timestamp getClaimedAt() { return claimedAt; }
|
||||
public void setClaimedAt(Timestamp claimedAt) { this.claimedAt = claimedAt; }
|
||||
|
||||
public Timestamp getClosedAt() { return closedAt; }
|
||||
public void setClosedAt(Timestamp closedAt) { this.closedAt = closedAt; }
|
||||
|
||||
public String getCloseComment() { return closeComment; }
|
||||
public void setCloseComment(String closeComment) { this.closeComment = closeComment; }
|
||||
/** Gibt an ob der Ersteller bereits über die Schließung informiert wurde (DB-persistent). */
|
||||
public boolean isCloseNotified() { return closeNotified; }
|
||||
/** Setzt den close_notified-Flag (wird in DB gespeichert). */
|
||||
public void setCloseNotified(boolean v) { this.closeNotified = v; }
|
||||
}
|
||||
33
src/main/java/de/ticketsystem/model/TicketCategory.java
Normal file
33
src/main/java/de/ticketsystem/model/TicketCategory.java
Normal file
@@ -0,0 +1,33 @@
|
||||
package de.ticketsystem.model;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
public enum TicketCategory {
|
||||
GENERAL ("Allgemein", "§7", Material.PAPER),
|
||||
BUG ("Bug", "§c", Material.REDSTONE),
|
||||
QUESTION ("Frage", "§e", Material.BOOK),
|
||||
COMPLAINT ("Beschwerde", "§6", Material.WRITABLE_BOOK),
|
||||
OTHER ("Sonstiges", "§8", Material.FEATHER);
|
||||
|
||||
private final String displayName;
|
||||
private final String color;
|
||||
private final Material guiMaterial;
|
||||
|
||||
TicketCategory(String displayName, String color, Material guiMaterial) {
|
||||
this.displayName = displayName;
|
||||
this.color = color;
|
||||
this.guiMaterial = guiMaterial;
|
||||
}
|
||||
|
||||
public String getDisplayName() { return displayName; }
|
||||
public String getColor() { return color; }
|
||||
public String getColored() { return color + displayName; }
|
||||
public Material getGuiMaterial() { return guiMaterial; }
|
||||
|
||||
/** Safely parse from stored string, fall back to GENERAL. */
|
||||
public static TicketCategory fromString(String s) {
|
||||
if (s == null) return GENERAL;
|
||||
try { return valueOf(s.toUpperCase()); }
|
||||
catch (IllegalArgumentException e) { return GENERAL; }
|
||||
}
|
||||
}
|
||||
47
src/main/java/de/ticketsystem/model/TicketComment.java
Normal file
47
src/main/java/de/ticketsystem/model/TicketComment.java
Normal file
@@ -0,0 +1,47 @@
|
||||
package de.ticketsystem.model;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Represents a player comment/reply on a ticket.
|
||||
*/
|
||||
public class TicketComment {
|
||||
|
||||
private int id;
|
||||
private int ticketId;
|
||||
private UUID authorUUID;
|
||||
private String authorName;
|
||||
private String message;
|
||||
private Timestamp createdAt;
|
||||
|
||||
public TicketComment() {}
|
||||
|
||||
public TicketComment(int ticketId, UUID authorUUID, String authorName, String message) {
|
||||
this.ticketId = ticketId;
|
||||
this.authorUUID = authorUUID;
|
||||
this.authorName = authorName;
|
||||
this.message = message;
|
||||
this.createdAt = new Timestamp(System.currentTimeMillis());
|
||||
}
|
||||
|
||||
// ─────────────── Getters / Setters ────────────────────────────────────
|
||||
|
||||
public int getId() { return id; }
|
||||
public void setId(int id) { this.id = id; }
|
||||
|
||||
public int getTicketId() { return ticketId; }
|
||||
public void setTicketId(int ticketId) { this.ticketId = ticketId; }
|
||||
|
||||
public UUID getAuthorUUID() { return authorUUID; }
|
||||
public void setAuthorUUID(UUID authorUUID) { this.authorUUID = authorUUID; }
|
||||
|
||||
public String getAuthorName() { return authorName; }
|
||||
public void setAuthorName(String authorName){ this.authorName = authorName; }
|
||||
|
||||
public String getMessage() { return message; }
|
||||
public void setMessage(String message) { this.message = message; }
|
||||
|
||||
public Timestamp getCreatedAt() { return createdAt; }
|
||||
public void setCreatedAt(Timestamp ts) { this.createdAt = ts; }
|
||||
}
|
||||
31
src/main/java/de/ticketsystem/model/TicketPriority.java
Normal file
31
src/main/java/de/ticketsystem/model/TicketPriority.java
Normal file
@@ -0,0 +1,31 @@
|
||||
package de.ticketsystem.model;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
public enum TicketPriority {
|
||||
LOW ("Niedrig", "§a", Material.GREEN_WOOL),
|
||||
NORMAL ("Normal", "§e", Material.YELLOW_WOOL),
|
||||
HIGH ("Hoch", "§6", Material.ORANGE_WOOL),
|
||||
URGENT ("Dringend","§c", Material.RED_WOOL);
|
||||
|
||||
private final String displayName;
|
||||
private final String color;
|
||||
private final Material guiMaterial;
|
||||
|
||||
TicketPriority(String displayName, String color, Material guiMaterial) {
|
||||
this.displayName = displayName;
|
||||
this.color = color;
|
||||
this.guiMaterial = guiMaterial;
|
||||
}
|
||||
|
||||
public String getDisplayName() { return displayName; }
|
||||
public String getColor() { return color; }
|
||||
public String getColored() { return color + displayName; }
|
||||
public Material getGuiMaterial() { return guiMaterial; }
|
||||
|
||||
public static TicketPriority fromString(String s) {
|
||||
if (s == null) return NORMAL;
|
||||
try { return valueOf(s.toUpperCase()); }
|
||||
catch (IllegalArgumentException e) { return NORMAL; }
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,26 @@ version: "2.0"
|
||||
# Debug-Modus (true = Logs in der Konsole)
|
||||
debug: false
|
||||
|
||||
# ----------------------------------------------------
|
||||
# BUNGEECORD (Cross-Server-Unterstützung)
|
||||
# ----------------------------------------------------
|
||||
# VORAUSSETZUNGEN:
|
||||
# 1. In spigot.yml auf JEDEM Server: bungeecord: true
|
||||
# 2. MySQL muss aktiviert sein (use-mysql: true)
|
||||
# 3. Plugin auf JEDEM Spigot-Server installieren
|
||||
# 4. Alle Server müssen dieselbe MySQL-Datenbank verwenden
|
||||
#
|
||||
# false = Normaler Single-Server-Modus (Standard)
|
||||
# true = Cross-Server Benachrichtigungen aktiv
|
||||
# ----------------------------------------------------
|
||||
bungeecord: false
|
||||
bungee-teleport-enabled: true
|
||||
|
||||
# Name dieses Servers im BungeeCord-Netzwerk.
|
||||
# Wird in Tickets, GUI und Discord-Embeds angezeigt.
|
||||
# Auf jedem Server ANDERS einstellen! (z.B. "survival", "creative", "skyblock")
|
||||
server-name: "survival"
|
||||
|
||||
# ----------------------------------------------------
|
||||
# SPEICHERPFAD & ARCHIV
|
||||
# ----------------------------------------------------
|
||||
@@ -59,6 +79,80 @@ max-open-tickets-per-player: 2 # Maximale offene Tickets pro Spieler (0 = unbeg
|
||||
# ----------------------------------------------------
|
||||
auto-archive-interval-hours: 24 # Intervall in Stunden (0 = aus)
|
||||
|
||||
# ----------------------------------------------------
|
||||
# OPTIONALE FEATURES
|
||||
# ----------------------------------------------------
|
||||
|
||||
# Kategorie-System (true = aktiviert)
|
||||
# Spieler können beim Erstellen eine Kategorie wählen: /ticket create [kategorie] [priorität] <text>
|
||||
categories-enabled: true
|
||||
|
||||
# Prioritäten-System (true = aktiviert)
|
||||
# Spieler können beim Erstellen eine Priorität wählen: /ticket create [kategorie] [priorität] <text>
|
||||
# Admins/Supporter können die Priorität nachträglich ändern: /ticket setpriority <id> <low|normal|high|urgent>
|
||||
priorities-enabled: true
|
||||
|
||||
# Bewertungs-System (true = aktiviert)
|
||||
# Spieler können nach dem Schließen den Support bewerten: /ticket rate <id> good|bad
|
||||
# Ergebnisse sind in /ticket stats sichtbar
|
||||
rating-enabled: true
|
||||
|
||||
# ----------------------------------------------------
|
||||
# KATEGORIEN (nur aktiv wenn categories-enabled: true)
|
||||
# ----------------------------------------------------
|
||||
# Jede Kategorie hat:
|
||||
# name: Anzeigename im Chat und in der GUI
|
||||
# color: Farbcode mit & (Minecraft Farbcodes)
|
||||
# material: Minecraft-Material für das GUI-Item (Großbuchstaben, z.B. PAPER, REDSTONE, BOOK)
|
||||
# aliases: Alternative Eingaben beim /ticket create Befehl (Kleinbuchstaben!)
|
||||
#
|
||||
# Das erste eingetragene Item ist die Standard-Kategorie für Tickets ohne Angabe.
|
||||
# Du kannst beliebig viele Kategorien hinzufügen oder entfernen.
|
||||
# ----------------------------------------------------
|
||||
categories:
|
||||
general:
|
||||
name: "Allgemein"
|
||||
color: "&7"
|
||||
material: "PAPER"
|
||||
aliases:
|
||||
- "allgemein"
|
||||
- "general"
|
||||
- "default"
|
||||
bug:
|
||||
name: "Bug"
|
||||
color: "&c"
|
||||
material: "REDSTONE"
|
||||
aliases:
|
||||
- "bug"
|
||||
- "fehler"
|
||||
- "error"
|
||||
question:
|
||||
name: "Frage"
|
||||
color: "&e"
|
||||
material: "BOOK"
|
||||
aliases:
|
||||
- "frage"
|
||||
- "question"
|
||||
- "help"
|
||||
- "hilfe"
|
||||
complaint:
|
||||
name: "Beschwerde"
|
||||
color: "&6"
|
||||
material: "WRITABLE_BOOK"
|
||||
aliases:
|
||||
- "beschwerde"
|
||||
- "complaint"
|
||||
- "report"
|
||||
- "melden"
|
||||
other:
|
||||
name: "Sonstiges"
|
||||
color: "&8"
|
||||
material: "FEATHER"
|
||||
aliases:
|
||||
- "sonstiges"
|
||||
- "other"
|
||||
- "misc"
|
||||
|
||||
# ----------------------------------------------------
|
||||
# DISCORD WEBHOOK (Optional)
|
||||
# ----------------------------------------------------
|
||||
@@ -69,6 +163,44 @@ discord:
|
||||
# Webhook-URL aus Discord (Kanaleinstellungen → Integrationen → Webhook erstellen)
|
||||
webhook-url: ""
|
||||
|
||||
# Rollen-Ping: Discord-Rollen-ID (Rechtsklick auf Rolle → ID kopieren)
|
||||
# Leer lassen ("") = kein Ping
|
||||
role-ping-id: ""
|
||||
|
||||
messages:
|
||||
# ── Neues Ticket ────────────────────────────────────────────────────────
|
||||
new-ticket:
|
||||
title: "🎫 Neues Ticket erstellt"
|
||||
color: "3066993" # Grün
|
||||
footer: "TicketSystem"
|
||||
show-position: true # Welt & Koordinaten im Embed anzeigen
|
||||
show-category: true # Kategorie im Embed anzeigen
|
||||
show-priority: true # Priorität im Embed anzeigen
|
||||
show-server: true # BungeeCord: Server-Name im Embed anzeigen
|
||||
role-ping: false # Rollen-Ping bei neuem Ticket senden
|
||||
|
||||
# ── Ticket geschlossen ──────────────────────────────────────────────────
|
||||
ticket-closed:
|
||||
enabled: false # Webhook-Nachricht beim Schließen senden
|
||||
title: "🔒 Ticket geschlossen"
|
||||
color: "15158332" # Rot
|
||||
footer: "TicketSystem"
|
||||
show-category: true # Kategorie im Embed anzeigen
|
||||
show-priority: true # Priorität im Embed anzeigen
|
||||
show-server: true # BungeeCord: Server-Name im Embed anzeigen
|
||||
role-ping: false # Rollen-Ping beim Schließen senden
|
||||
|
||||
# ── Ticket weitergeleitet ───────────────────────────────────────────────
|
||||
ticket-forwarded:
|
||||
enabled: false # Webhook-Nachricht beim Weiterleiten senden
|
||||
title: "🔀 Ticket weitergeleitet"
|
||||
color: "15105570" # Orange
|
||||
footer: "TicketSystem"
|
||||
show-category: true # Kategorie im Embed anzeigen
|
||||
show-priority: true # Priorität im Embed anzeigen
|
||||
show-server: true # BungeeCord: Server-Name im Embed anzeigen
|
||||
role-ping: false # Rollen-Ping beim Weiterleiten senden
|
||||
|
||||
# ----------------------------------------------------
|
||||
# SYSTEM-NACHRICHTEN (mit &-Farbcodes)
|
||||
# ----------------------------------------------------
|
||||
@@ -94,12 +226,35 @@ messages:
|
||||
ticket-forwarded: "&aTicket &e#{id} &awurde an &e{player} &aweitergeleitet."
|
||||
ticket-forwarded-notify: "&eDu hast ein Ticket von &6{player} &eweitergeleitet bekommen. &7(ID: {id})"
|
||||
|
||||
# --- NEU: Benachrichtigungen für den Ticket-Ersteller ---
|
||||
# Wird gesendet, wenn das eigene Ticket geschlossen wurde
|
||||
# --- BENACHRICHTIGUNGEN FÜR DEN TICKET-ERSTELLER ---
|
||||
ticket-closed-notify: "&aDein Ticket &e#{id} &awurde geschlossen."
|
||||
# Wird gesendet, wenn das eigene Ticket an einen anderen Supporter weitergeleitet wurde
|
||||
ticket-forwarded-creator-notify: "&eDein Ticket &6#{id} &ewurde an &b{supporter} &eweitergeleitet."
|
||||
|
||||
# --- KATEGORIEN ---
|
||||
# {category} wird durch den Anzeigenamen der gewählten Kategorie ersetzt
|
||||
ticket-created-category: "&aTicket &e#{id} &aerstellt! &7Kategorie: {category}"
|
||||
category-invalid: "&cUnbekannte Kategorie: &e{input}&c. Verfügbare Kategorien: &e{categories}"
|
||||
|
||||
# --- KOMMENTARE ---
|
||||
comment-saved: "&aDein Kommentar zu Ticket &e#{id} &awurde gespeichert."
|
||||
comment-notify: "&e[Ticket #{id}] &f{author} &7kommentiert: &f{message}"
|
||||
comment-no-permission: "&cDu kannst nur deine eigenen Tickets kommentieren."
|
||||
|
||||
# --- BEWERTUNGEN ---
|
||||
rating-saved-good: "&aDanke für deine Bewertung! &a👍 Positiv"
|
||||
rating-saved-bad: "&aDanke für deine Bewertung! &c👎 Negativ"
|
||||
rating-already-rated: "&cDu hast dieses Ticket bereits bewertet."
|
||||
rating-not-yours: "&cDu kannst nur deine eigenen Tickets bewerten."
|
||||
rating-disabled: "&cBewertungen sind aktuell deaktiviert."
|
||||
rating-prompt: "&6Wie zufrieden bist du mit dem Support?\n&a/ticket rate {id} good &7– 👍 Gut\n&c/ticket rate {id} bad &7– 👎 Schlecht"
|
||||
|
||||
# --- BLACKLIST ---
|
||||
blacklist-added: "&a{player} &awurde zur Ticket-Blacklist hinzugefügt. &7Grund: &e{reason}"
|
||||
blacklist-removed: "&a{player} &awurde von der Blacklist entfernt."
|
||||
blacklist-already: "&cSpieler ist bereits auf der Blacklist."
|
||||
blacklist-not-found: "&cSpieler war nicht auf der Blacklist."
|
||||
blacklist-blocked: "&cDu wurdest vom Ticket-System gesperrt und kannst keine Tickets erstellen."
|
||||
|
||||
# --- FEHLER & HINWEISE ---
|
||||
no-permission: "&cDu hast keine Berechtigung!"
|
||||
no-open-tickets: "&aAktuell gibt es keine offenen Tickets."
|
||||
|
||||
@@ -1,25 +1,62 @@
|
||||
name: TicketSystem
|
||||
version: 1.0.2
|
||||
version: 1.0.5
|
||||
main: de.ticketsystem.TicketPlugin
|
||||
api-version: 1.20
|
||||
author: M_Viper
|
||||
description: Ingame Support Ticket System with MySQL
|
||||
|
||||
# ── BungeeCord Plugin-Messaging-Kanäle ───────────────────────────────────────
|
||||
# PFLICHTFELD für Cross-Server-Benachrichtigungen!
|
||||
channels:
|
||||
- BungeeCord
|
||||
- ticketsystem:notify
|
||||
|
||||
commands:
|
||||
ticket:
|
||||
description: Ticket System Hauptbefehl
|
||||
usage: /ticket <create|list|claim|close|forward|reload>
|
||||
description: TicketSystem Hauptbefehl
|
||||
usage: |
|
||||
/ticket create [Kategorie] <Text>
|
||||
/ticket list
|
||||
/ticket comment <ID> <Nachricht>
|
||||
/ticket rate <ID> <good|bad>
|
||||
/ticket claim <ID>
|
||||
/ticket close <ID> [Kommentar]
|
||||
/ticket forward <ID> <Spieler>
|
||||
/ticket blacklist <add|remove|list> [Spieler] [Grund]
|
||||
/ticket stats
|
||||
/ticket archive
|
||||
/ticket reload
|
||||
aliases: [t, support]
|
||||
|
||||
permissions:
|
||||
|
||||
# ── Spieler-Permissions ───────────────────────────────────────────────────
|
||||
|
||||
ticket.create:
|
||||
description: Spieler kann Tickets erstellen
|
||||
description: Spieler kann Tickets erstellen und kommentieren
|
||||
default: true
|
||||
|
||||
# ── Supporter-Permissions ─────────────────────────────────────────────────
|
||||
|
||||
ticket.support:
|
||||
description: Supporter kann Tickets einsehen und claimen
|
||||
description: Supporter kann Tickets einsehen, claimen und schließen
|
||||
default: false
|
||||
|
||||
ticket.archive:
|
||||
description: Zugriff auf das Ticket-Archiv (öffnen, einsehen, permanent löschen)
|
||||
default: false
|
||||
|
||||
# ── Admin-Permissions ────────────────────────────────────────────────────
|
||||
|
||||
ticket.admin:
|
||||
description: Admin hat vollen Zugriff inkl. Weiterleitung und Reload
|
||||
description: >
|
||||
Admin hat vollen Zugriff: Weiterleiten, Blacklist verwalten,
|
||||
Statistiken, Reload, Archiv, Export/Import, Migration
|
||||
default: op
|
||||
children:
|
||||
ticket.support: true
|
||||
ticket.blacklist: true
|
||||
|
||||
ticket.blacklist:
|
||||
description: Kann Spieler zur Ticket-Blacklist hinzufügen und entfernen
|
||||
default: false
|
||||
Reference in New Issue
Block a user