Update from Git Manager GUI
This commit is contained in:
@@ -10,6 +10,7 @@ import de.ticketsystem.gui.TicketGUI;
|
||||
import de.ticketsystem.listeners.PlayerJoinListener;
|
||||
import de.ticketsystem.manager.CategoryManager;
|
||||
import de.ticketsystem.manager.FaqManager;
|
||||
import de.ticketsystem.manager.LanguageManager;
|
||||
import de.ticketsystem.manager.TicketManager;
|
||||
import de.ticketsystem.model.Ticket;
|
||||
import org.bukkit.ChatColor;
|
||||
@@ -29,6 +30,7 @@ public class TicketPlugin extends JavaPlugin {
|
||||
*/
|
||||
private String serverName;
|
||||
|
||||
private LanguageManager languageManager;
|
||||
private DatabaseManager databaseManager;
|
||||
private TicketManager ticketManager;
|
||||
private CategoryManager categoryManager;
|
||||
@@ -48,6 +50,10 @@ public class TicketPlugin extends JavaPlugin {
|
||||
// Ticket-Klasse für YAML-Serialisierung registrieren
|
||||
Ticket.register();
|
||||
|
||||
// ── Sprachdatei laden (lang.yml) ──────────────────────────────────
|
||||
// Muss VOR allen anderen Managern geschehen, da diese lang() nutzen.
|
||||
languageManager = new LanguageManager(this);
|
||||
|
||||
// ── BungeeCord Plugin-Messaging-Kanäle registrieren ───────────────
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, BungeeMessenger.BUNGEE_CHANNEL);
|
||||
getServer().getMessenger().registerOutgoingPluginChannel(this, BungeeMessenger.CUSTOM_CHANNEL);
|
||||
@@ -66,14 +72,14 @@ public class TicketPlugin extends JavaPlugin {
|
||||
getLogger().info("[BungeeCord] Cross-Server-Features deaktiviert. Setze 'bungeecord: true' um sie zu aktivieren.");
|
||||
}
|
||||
|
||||
// Update-Checker (nur Warnung wenn Update verfügbar – kein API-Raw-Log)
|
||||
// Update-Checker
|
||||
int resourceId = 132757;
|
||||
new UpdateChecker(this, resourceId).getVersion(version -> {
|
||||
String current = getDescription().getVersion();
|
||||
if (!current.equals(version)) {
|
||||
String msg = ChatColor.translateAlternateColorCodes('&',
|
||||
"&6[TicketSystem] &eNeue Version verfügbar: &a" + version + " &7(aktuell: " + current + ")");
|
||||
getLogger().warning("Neue Version verfügbar: " + version + " (aktuell: " + current + ")");
|
||||
String msg = lang().format("update.available-line1", "{version}", version);
|
||||
getLogger().warning(lang().format("update.available-console",
|
||||
"{new}", version, "{current}", current));
|
||||
getServer().getScheduler().runTaskLater(this, () ->
|
||||
getServer().getOnlinePlayers().stream()
|
||||
.filter(p -> p.hasPermission("ticket.admin"))
|
||||
@@ -83,7 +89,7 @@ public class TicketPlugin extends JavaPlugin {
|
||||
|
||||
// Versionsprüfung der config.yml
|
||||
String configVersion = getConfig().getString("version", "");
|
||||
String expectedVersion = "2.0";
|
||||
String expectedVersion = "2.2";
|
||||
if (!expectedVersion.equals(configVersion)) {
|
||||
getLogger().warning("[WARNUNG] config.yml-Version (" + configVersion
|
||||
+ ") stimmt nicht mit der erwarteten Version (" + expectedVersion + ") überein!");
|
||||
@@ -156,29 +162,125 @@ public class TicketPlugin extends JavaPlugin {
|
||||
|
||||
// ─────────────────────────── Hilfsmethoden ─────────────────────────────
|
||||
|
||||
public String formatMessage(String path) {
|
||||
String prefix = color(getConfig().getString("prefix", "&8[&6Ticket&8] &r"));
|
||||
String message = getConfig().getString(path, "&cNachricht nicht gefunden: " + path);
|
||||
return prefix + color(message);
|
||||
/**
|
||||
* Gibt den LanguageManager zurück – bevorzugte Methode für alle Texte.
|
||||
*
|
||||
* Verwendung:
|
||||
* plugin.lang().get("ticket.created")
|
||||
* plugin.lang().format("ticket.created", "{id}", String.valueOf(id))
|
||||
* plugin.lang().send(player, "ticket.created", "{id}", String.valueOf(id))
|
||||
*/
|
||||
public LanguageManager lang() {
|
||||
return languageManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Kompatibilitätsmethode für bestehenden Code.
|
||||
* Liest Pfade der Form "messages.xxx" aus lang.yml (ohne "messages."-Prefix).
|
||||
*
|
||||
* Beispiel: formatMessage("messages.ticket-created") → lang "ticket.created"
|
||||
*
|
||||
* @deprecated Direkt {@link #lang()} verwenden.
|
||||
*/
|
||||
@Deprecated
|
||||
public String formatMessage(String path) {
|
||||
// "messages.ticket-created" → "ticket.created" (legacy-Mapping)
|
||||
String langKey = mapLegacyPath(path);
|
||||
if (langKey != null) {
|
||||
return lang().formatWithPrefix(langKey);
|
||||
}
|
||||
// Fallback: Direkt in lang.yml nachschlagen
|
||||
String value = lang().getRaw(path);
|
||||
return lang().getPrefix() + lang().color(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Übersetzt &-Farbcodes in §-Farbcodes.
|
||||
* Kompatibilitätsmethode – bevorzugt lang().color() verwenden.
|
||||
*/
|
||||
public String color(String text) {
|
||||
return ChatColor.translateAlternateColorCodes('&', text);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mappt alte "messages.xxx"-Pfade auf neue lang.yml-Pfade.
|
||||
* Muss ergänzt werden wenn neue Schlüssel im alten Stil genutzt wurden.
|
||||
*/
|
||||
private String mapLegacyPath(String path) {
|
||||
if (path == null) return null;
|
||||
return switch (path) {
|
||||
case "messages.export-success" -> "system.export-success";
|
||||
case "messages.export-fail" -> "system.export-fail";
|
||||
case "messages.import-success" -> "system.import-success";
|
||||
case "messages.import-fail" -> "system.import-fail";
|
||||
case "messages.migration-success" -> "system.migration-success";
|
||||
case "messages.migration-fail" -> "system.migration-fail";
|
||||
case "messages.archive-success" -> "system.archive-success";
|
||||
case "messages.archive-fail" -> "system.archive-fail";
|
||||
case "messages.file-not-found" -> "system.file-not-found";
|
||||
case "messages.unknown-mode" -> "system.unknown-mode";
|
||||
case "messages.validation-warning" -> "system.validation-warning";
|
||||
case "messages.ticket-created" -> "ticket.created";
|
||||
case "messages.ticket-created-category" -> "ticket.created-category";
|
||||
case "messages.ticket-claimed" -> "ticket.claimed";
|
||||
case "messages.ticket-claimed-notify" -> "ticket.claimed-notify";
|
||||
case "messages.ticket-closed" -> "ticket.closed";
|
||||
case "messages.ticket-closed-notify" -> "ticket.closed-notify";
|
||||
case "messages.ticket-forwarded" -> "ticket.forwarded";
|
||||
case "messages.ticket-forwarded-notify" -> "ticket.forwarded-notify";
|
||||
case "messages.ticket-forwarded-creator-notify" -> "ticket.forwarded-creator";
|
||||
case "messages.new-ticket-notify" -> "ticket.new-notify";
|
||||
case "messages.comment-saved" -> "comment.saved";
|
||||
case "messages.comment-notify" -> "comment.notify-online";
|
||||
case "messages.comment-no-permission" -> "comment.no-permission";
|
||||
case "messages.rating-saved-good" -> "rating.saved-good";
|
||||
case "messages.rating-saved-bad" -> "rating.saved-bad";
|
||||
case "messages.rating-already-rated" -> "rating.already-rated";
|
||||
case "messages.rating-not-yours" -> "rating.not-yours";
|
||||
case "messages.rating-disabled" -> "rating.disabled";
|
||||
case "messages.rating-prompt" -> "rating.prompt-title";
|
||||
case "messages.blacklist-added" -> "blacklist.added";
|
||||
case "messages.blacklist-removed" -> "blacklist.removed";
|
||||
case "messages.blacklist-already" -> "blacklist.already";
|
||||
case "messages.blacklist-not-found" -> "blacklist.not-found";
|
||||
case "messages.blacklist-blocked" -> "create.blacklist-blocked";
|
||||
case "messages.no-permission" -> "general.no-permission";
|
||||
case "messages.no-open-tickets" -> "general.no-open-tickets";
|
||||
case "messages.join-open-tickets" -> "join.open-tickets";
|
||||
case "messages.already-claimed" -> "general.already-claimed";
|
||||
case "messages.ticket-not-found" -> "general.ticket-not-found";
|
||||
case "messages.cooldown" -> "general.cooldown";
|
||||
case "messages.category-invalid" -> "create.category-invalid";
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
// ─────────────────────────── Getter ────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Aktualisiert serverName und debug-Flag aus der (bereits neu geladenen) Config.
|
||||
* Muss nach plugin.reloadConfig() aufgerufen werden.
|
||||
*/
|
||||
public void reloadSettings() {
|
||||
serverName = getConfig().getString("server-name", "unknown");
|
||||
if ("unknown".equals(serverName)) {
|
||||
getLogger().warning("[BungeeCord] Kein 'server-name' in der config.yml definiert!");
|
||||
}
|
||||
debug = getConfig().getBoolean("debug", false);
|
||||
}
|
||||
|
||||
public static TicketPlugin getInstance() { return instance; }
|
||||
public DatabaseManager getDatabaseManager() { return databaseManager; }
|
||||
public TicketManager getTicketManager() { return ticketManager; }
|
||||
public CategoryManager getCategoryManager() { return categoryManager; }
|
||||
public FaqManager getFaqManager() { return faqManager; }
|
||||
public TicketGUI getTicketGUI() { return ticketGUI; }
|
||||
public FaqGUI getFaqGUI() { return faqGUI; }
|
||||
public DiscordWebhook getDiscordWebhook() { return discordWebhook; }
|
||||
public BungeeMessenger getBungeeMessenger() { return bungeeMessenger; }
|
||||
public TicketCache getTicketCache() { return ticketCache; }
|
||||
public boolean isDebug() { return debug; }
|
||||
public String getServerName() { return serverName; }
|
||||
public boolean isBungeeCordEnabled() { return getConfig().getBoolean("bungeecord", false); }
|
||||
public LanguageManager getLanguageManager() { return languageManager; }
|
||||
public DatabaseManager getDatabaseManager() { return databaseManager; }
|
||||
public TicketManager getTicketManager() { return ticketManager; }
|
||||
public CategoryManager getCategoryManager() { return categoryManager; }
|
||||
public FaqManager getFaqManager() { return faqManager; }
|
||||
public TicketGUI getTicketGUI() { return ticketGUI; }
|
||||
public FaqGUI getFaqGUI() { return faqGUI; }
|
||||
public DiscordWebhook getDiscordWebhook() { return discordWebhook; }
|
||||
public BungeeMessenger getBungeeMessenger() { return bungeeMessenger; }
|
||||
public TicketCache getTicketCache() { return ticketCache; }
|
||||
public boolean isDebug() { return debug; }
|
||||
public String getServerName() { return serverName; }
|
||||
public boolean isBungeeCordEnabled() { return getConfig().getBoolean("bungeecord", false); }
|
||||
}
|
||||
@@ -149,9 +149,9 @@ public class BungeeMessenger implements PluginMessageListener {
|
||||
|
||||
ByteArrayDataOutput inner = ByteStreams.newDataOutput();
|
||||
inner.writeByte(TYPE_PLAYER_MSG);
|
||||
inner.writeShort(uuidBytes.length);
|
||||
inner.writeInt(uuidBytes.length);
|
||||
inner.write(uuidBytes);
|
||||
inner.writeShort(msgBytes.length);
|
||||
inner.writeInt(msgBytes.length);
|
||||
inner.write(msgBytes);
|
||||
byte[] innerBytes = inner.toByteArray();
|
||||
|
||||
@@ -159,7 +159,7 @@ public class BungeeMessenger implements PluginMessageListener {
|
||||
out.writeUTF("Forward");
|
||||
out.writeUTF("ALL");
|
||||
out.writeUTF(CUSTOM_CHANNEL);
|
||||
out.writeShort(innerBytes.length);
|
||||
out.writeInt(innerBytes.length);
|
||||
out.write(innerBytes);
|
||||
|
||||
messenger.sendPluginMessage(plugin, BUNGEE_CHANNEL, out.toByteArray());
|
||||
@@ -198,12 +198,12 @@ public class BungeeMessenger implements PluginMessageListener {
|
||||
);
|
||||
|
||||
} else if (type == TYPE_PLAYER_MSG) {
|
||||
int uuidLen = in.readShort();
|
||||
int uuidLen = in.readInt();
|
||||
byte[] uuidBytes = new byte[uuidLen];
|
||||
in.readFully(uuidBytes);
|
||||
UUID targetUUID = UUID.fromString(new String(uuidBytes, StandardCharsets.UTF_8));
|
||||
|
||||
int msgLen = in.readShort();
|
||||
int msgLen = in.readInt();
|
||||
byte[] msgBytes = new byte[msgLen];
|
||||
in.readFully(msgBytes);
|
||||
String message = new String(msgBytes, StandardCharsets.UTF_8);
|
||||
@@ -246,7 +246,7 @@ public class BungeeMessenger implements PluginMessageListener {
|
||||
out.writeUTF("Forward");
|
||||
out.writeUTF("ALL");
|
||||
out.writeUTF(CUSTOM_CHANNEL);
|
||||
out.writeShort(innerBytes.length);
|
||||
out.writeInt(innerBytes.length);
|
||||
out.write(innerBytes);
|
||||
|
||||
messenger.sendPluginMessage(plugin, BUNGEE_CHANNEL, out.toByteArray());
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1102,6 +1102,38 @@ public class DatabaseManager {
|
||||
|
||||
// ─────────────────────────── Abfragen ──────────────────────────────────
|
||||
|
||||
/**
|
||||
* Gibt alle geschlossenen Tickets eines bestimmten Spielers zurück,
|
||||
* die noch nicht als close_notified markiert wurden.
|
||||
* Deutlich effizienter als alle CLOSED-Tickets zu laden und per UUID zu filtern.
|
||||
*/
|
||||
public List<Ticket> getUnnotifiedClosedTicketsByPlayer(UUID uuid) {
|
||||
List<Ticket> list = new ArrayList<>();
|
||||
if (useMySQL) {
|
||||
String sql = "SELECT * FROM tickets WHERE creator_uuid = ? AND status = 'CLOSED' AND close_notified = 0";
|
||||
try (Connection conn = getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setString(1, uuid.toString());
|
||||
ResultSet rs = ps.executeQuery();
|
||||
while (rs.next()) list.add(mapRow(rs));
|
||||
} catch (SQLException e) {
|
||||
plugin.getLogger().log(Level.SEVERE, "Fehler beim Abrufen der Tickets: " + e.getMessage(), e);
|
||||
}
|
||||
return list;
|
||||
} else {
|
||||
if (!dataConfig.contains("tickets")) return list;
|
||||
for (String key : dataConfig.getConfigurationSection("tickets").getKeys(false)) {
|
||||
Ticket t = (Ticket) dataConfig.get("tickets." + key);
|
||||
if (t != null
|
||||
&& uuid.equals(t.getCreatorUUID())
|
||||
&& t.getStatus() == TicketStatus.CLOSED
|
||||
&& !t.isCloseNotified()) {
|
||||
list.add(t);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
||||
public List<Ticket> getTicketsByStatus(TicketStatus... statuses) {
|
||||
List<Ticket> list = new ArrayList<>();
|
||||
if (statuses.length == 0) return list;
|
||||
|
||||
@@ -4,6 +4,7 @@ import de.ticketsystem.TicketPlugin;
|
||||
import de.ticketsystem.model.FaqEntry;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
@@ -22,99 +23,225 @@ import java.util.*;
|
||||
|
||||
/**
|
||||
* FAQ GUI für Spieler (Lesemodus) und Admins (Verwaltungsmodus).
|
||||
*
|
||||
* ──── Spieler-GUI (/ticket faq) ─────────────────────────────────────────
|
||||
* Slots 0-44 : FAQ-Einträge als Custom-Skull-Items
|
||||
* › Name = Frage
|
||||
* › Lore = Antwort (aufgeteilt auf 40-Zeichen-Zeilen)
|
||||
* Slot 49 : Seitenanzeige
|
||||
* Slot 45/53 : Vorherige / Nächste Seite
|
||||
*
|
||||
* ──── Admin-GUI (ticket.admin-Berechtigung) ─────────────────────────────
|
||||
* Wie Spieler-GUI, zusätzlich:
|
||||
* Slot 50 : "Neues FAQ hinzufügen" (Lime Wool)
|
||||
* Klick auf FAQ-Item → Aktions-GUI
|
||||
*
|
||||
* ──── Aktions-GUI (27 Slots) ────────────────────────────────────────────
|
||||
* Slot 4 : FAQ-Info (Skull)
|
||||
* Slot 10 : Bearbeiten (Book & Quill)
|
||||
* Slot 12 : Löschen (Barrier)
|
||||
* Slot 16 : Zurück (Arrow)
|
||||
*
|
||||
* ──── Chat-Eingabe (Hinzufügen / Bearbeiten) ────────────────────────────
|
||||
* Step 1: Admin gibt Frage ein
|
||||
* Step 2: Admin gibt Antwort ein → FAQ wird gespeichert
|
||||
* Layout, Größe und Slots sind über config.yml steuerbar.
|
||||
*/
|
||||
public class FaqGUI implements Listener {
|
||||
|
||||
// ─────────────────────────── Titel-Konstanten ──────────────────────────
|
||||
// ── Konfigurierbare Felder ────────────────────────────────────────────────
|
||||
private int faqRows;
|
||||
private int faqNavPrev, faqNavNext, faqNavAdd, faqNavPage;
|
||||
|
||||
private Material headMaterial = Material.PLAYER_HEAD;
|
||||
private String headTexture = "http://textures.minecraft.net/texture/da2fde34d34c8588e58bfd790ce18025f7843399dee2ab4cedc2c0b463fd1e";
|
||||
private List<Integer> contentSlots = new ArrayList<>();
|
||||
|
||||
private static final String FAQ_GUI_TITLE = "§8§lHäufige Fragen (FAQ)";
|
||||
private static final String FAQ_ADMIN_TITLE = "§8§lFAQ verwalten";
|
||||
private static final String FAQ_ACTION_TITLE = "§8§lFAQ Aktionen";
|
||||
|
||||
/** FAQ-Einträge pro Seite (Zeilen 0-4, Slots 0-44). */
|
||||
private static final int PAGE_SIZE = 45;
|
||||
|
||||
/**
|
||||
* Texture-URL für die Custom-Skull-Items.
|
||||
* http://textures.minecraft.net/texture/da2fde34d34c8588e58bfd790ce18025f7843399dee2ab4cedc2c0b463fd1e
|
||||
*/
|
||||
private static final String FAQ_SKIN_URL =
|
||||
// ── System Felder ────────────────────────────────────────────────────────
|
||||
private static final String DEFAULT_SKIN_URL =
|
||||
"http://textures.minecraft.net/texture/da2fde34d34c8588e58bfd790ce18025f7843399dee2ab4cedc2c0b463fd1e";
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
|
||||
// ─────────────────────────── State ─────────────────────────────────────
|
||||
|
||||
/** Slot-Map für Spieler-FAQ-GUI: UUID → (Slot → FaqEntry) */
|
||||
private final Map<UUID, Map<Integer, FaqEntry>> slotMap = new HashMap<>();
|
||||
/** Aktuelle Seite pro Spieler in der FAQ-GUI */
|
||||
private final Map<UUID, Integer> faqPage = new HashMap<>();
|
||||
/** Ob der Spieler sich in der Admin-Ansicht befindet */
|
||||
private final Set<UUID> adminView = new HashSet<>();
|
||||
/** Aktuell ausgewähltes FAQ für die Aktions-GUI */
|
||||
private final Map<UUID, FaqEntry> actionEntry = new HashMap<>();
|
||||
|
||||
// ─── Chat-Input-States ──────────────────────────────────────────────
|
||||
/** Wartet auf Frage-Eingabe: null = neu, "edit:<id>" = bearbeiten */
|
||||
private final Map<UUID, String> awaitingQuestion = new HashMap<>();
|
||||
/** Wartet auf Antwort-Eingabe: key = Frage-Text (|id) bei Edit */
|
||||
private final Map<UUID, String> awaitingAnswer = new HashMap<>();
|
||||
private final Map<UUID, String> awaitingQuestion = new HashMap<>();
|
||||
private final Map<UUID, String> awaitingAnswer = new HashMap<>();
|
||||
|
||||
// ─────────────────────────── Konstruktor ───────────────────────────────
|
||||
// Materialien für Navigations-Buttons
|
||||
private Material matNavPrev, matNavNext, matNavPage, matNavAdd;
|
||||
|
||||
public FaqGUI(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
reloadConfig();
|
||||
}
|
||||
|
||||
/**
|
||||
* Berechnet die Item-Slots:
|
||||
* Schachbrett-Muster ohne Glas – passt sich automatisch an jede Größe an:
|
||||
*
|
||||
* Reihe 0 : Glas in geraden Spalten (0,2,4,6,8), Items in ungeraden (1,3,5,7) → 4 Items
|
||||
* Reihe 1 : Items in geraden Spalten (0,2,4,6,8), leer in ungeraden → 5 Items
|
||||
* Reihe 2 : Items in ungeraden Spalten (1,3,5,7), leer in geraden → 4 Items
|
||||
* Reihe 3 : Items in geraden Spalten (0,2,4,6,8), leer in ungeraden → 5 Items
|
||||
* ... (Reihe 1+ kein Glas – nur Items und leere Slots wechselnd)
|
||||
* Letzte Reihe: Navigation (Footer)
|
||||
*
|
||||
* Kapazität:
|
||||
* 4 Reihen → 13 Items | 5 Reihen → 18 Items | 6 Reihen → 22 Items
|
||||
*/
|
||||
private List<Integer> buildPatternSlots(int rows) {
|
||||
List<Integer> slots = new ArrayList<>();
|
||||
int contentRows = rows - 1; // Letzte Reihe = Navigation
|
||||
for (int row = 0; row < contentRows; row++) {
|
||||
int base = row * 9;
|
||||
if (row % 2 == 0) {
|
||||
// Gerade Reihen (0,2,4,...): Items in geraden Spalten
|
||||
slots.add(base + 0);
|
||||
slots.add(base + 2);
|
||||
slots.add(base + 4);
|
||||
slots.add(base + 6);
|
||||
slots.add(base + 8);
|
||||
} else {
|
||||
// Ungerade Reihen (1,3,5,...): Items in ungeraden Spalten
|
||||
slots.add(base + 1);
|
||||
slots.add(base + 3);
|
||||
slots.add(base + 5);
|
||||
slots.add(base + 7);
|
||||
}
|
||||
}
|
||||
return slots;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setzt die Navigations-Slot-Defaults passend zur aktuellen Zeilenanzahl.
|
||||
* Nav-Leiste liegt immer in der letzten Reihe.
|
||||
*/
|
||||
/**
|
||||
* Nav-Leiste liegt in der letzten Reihe.
|
||||
* Gerade Spalten werden durch fillNavBar bereits mit Glas gefüllt.
|
||||
* Buttons liegen auf ungerade Spalten – passend zum Content-Muster:
|
||||
* Slot +1 = Prev | Slot +3 = Add | Slot +5 = Page | Slot +7 = Next
|
||||
*/
|
||||
private void applyNavDefaults(int rows) {
|
||||
int navBase = (rows - 1) * 9; // Erster Slot der letzten Reihe
|
||||
faqNavPrev = navBase + 1; // 2. Slot (ungerade) – Blättern zurück
|
||||
faqNavAdd = navBase + 3; // 4. Slot (ungerade) – Hinzufügen
|
||||
faqNavPage = navBase + 5; // 6. Slot (ungerade) – Seitenanzeige
|
||||
faqNavNext = navBase + 7; // 8. Slot (ungerade) – Blättern vor
|
||||
}
|
||||
|
||||
/**
|
||||
* Lädt die Konfiguration sicher mit Fallback-Werten.
|
||||
*/
|
||||
public void reloadConfig() {
|
||||
// ── 1. STANDARDWERTE SETZEN (Sicherheit gegen leere Config) ─────────
|
||||
faqRows = 6;
|
||||
|
||||
headMaterial = Material.PLAYER_HEAD;
|
||||
headTexture = DEFAULT_SKIN_URL;
|
||||
|
||||
matNavPrev = Material.ARROW;
|
||||
matNavNext = Material.ARROW;
|
||||
matNavPage = Material.PAPER;
|
||||
matNavAdd = Material.LIME_WOOL;
|
||||
|
||||
// Standard Content-Slots nach Muster: Glasscheiben in Spalte 0, 4, 8
|
||||
contentSlots = buildPatternSlots(faqRows);
|
||||
applyNavDefaults(faqRows);
|
||||
|
||||
// ── 2. VERSUCHEN AUS CONFIG ZU LADEN ─────────────────────────────────
|
||||
ConfigurationSection guiSettings = plugin.getConfig().getConfigurationSection("gui-settings");
|
||||
|
||||
if (guiSettings != null) {
|
||||
ConfigurationSection faqConf = guiSettings.getConfigurationSection("faq");
|
||||
if (faqConf != null) {
|
||||
// Rows laden
|
||||
faqRows = faqConf.getInt("rows", 6);
|
||||
if (faqRows < 4) faqRows = 4; // Minimum 4 Reihen
|
||||
if (faqRows > 6) faqRows = 6;
|
||||
|
||||
// Nav-Defaults für die gewählte Zeilenanzahl setzen
|
||||
applyNavDefaults(faqRows);
|
||||
|
||||
// Content Slots laden – nur überschreiben wenn explizit in config gesetzt
|
||||
if (faqConf.contains("content-slots") && !faqConf.getIntegerList("content-slots").isEmpty()) {
|
||||
contentSlots = faqConf.getIntegerList("content-slots");
|
||||
} else {
|
||||
// Muster für die konfigurierte Zeilenanzahl neu berechnen
|
||||
contentSlots = buildPatternSlots(faqRows);
|
||||
}
|
||||
|
||||
// Navigation Slots laden (Config überschreibt dynamische Defaults)
|
||||
faqNavPrev = getSlot(faqConf, "nav.prev", faqNavPrev, faqRows);
|
||||
faqNavNext = getSlot(faqConf, "nav.next", faqNavNext, faqRows);
|
||||
faqNavPage = getSlot(faqConf, "nav.page", faqNavPage, faqRows);
|
||||
faqNavAdd = getSlot(faqConf, "nav.add", faqNavAdd, faqRows);
|
||||
|
||||
// Head Config laden
|
||||
ConfigurationSection headConf = faqConf.getConfigurationSection("head-item");
|
||||
if (headConf != null) {
|
||||
headMaterial = getMaterial(headConf, "material", Material.PLAYER_HEAD);
|
||||
headTexture = headConf.getString("texture", DEFAULT_SKIN_URL);
|
||||
}
|
||||
}
|
||||
|
||||
// Materialien laden (Global)
|
||||
ConfigurationSection itemsSettings = guiSettings.getConfigurationSection("items");
|
||||
if (itemsSettings != null) {
|
||||
matNavPrev = getMaterial(itemsSettings, "nav-prev", Material.ARROW);
|
||||
matNavNext = getMaterial(itemsSettings, "nav-next", Material.ARROW);
|
||||
matNavPage = getMaterial(itemsSettings, "nav-page", Material.PAPER);
|
||||
matNavAdd = getMaterial(itemsSettings, "nav-add", Material.LIME_WOOL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int getSlot(ConfigurationSection section, String path, int def, int rows) {
|
||||
int val = section.getInt(path, def);
|
||||
int max = rows * 9;
|
||||
if (val >= 0 && val < max) return val;
|
||||
// Slot liegt außerhalb des Inventars → Spalte beibehalten, letzte Reihe verwenden
|
||||
int col = (val >= 0 ? val : def) % 9;
|
||||
return (rows - 1) * 9 + col;
|
||||
}
|
||||
|
||||
private Material getMaterial(ConfigurationSection section, String path, Material def) {
|
||||
try {
|
||||
return Material.valueOf(section.getString(path, def.name()));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return def;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Hilfsmethode für Sprachzugriff ─────────────────────────────────────────
|
||||
private String f(String key) {
|
||||
return plugin.lang().get("gui.faq." + key);
|
||||
}
|
||||
|
||||
private String f(String key, String... replacements) {
|
||||
return plugin.lang().format("gui.faq." + key, replacements);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════════════
|
||||
// PUBLIC OPEN-METHODEN
|
||||
// ═══════════════════════════════════════════════════════════════════════
|
||||
|
||||
/** Öffnet die Spieler-FAQ-GUI (Seite 0). */
|
||||
public void openFaqGUI(Player player) {
|
||||
openFaqGUI(player, faqPage.getOrDefault(player.getUniqueId(), 0));
|
||||
}
|
||||
|
||||
/** Öffnet die Spieler-FAQ-GUI auf der angegebenen Seite. */
|
||||
public void openFaqGUI(Player player, int page) {
|
||||
boolean isAdmin = player.hasPermission("ticket.admin");
|
||||
String title = isAdmin ? FAQ_ADMIN_TITLE : FAQ_GUI_TITLE;
|
||||
String title = isAdmin ? f("admin-title") : f("title");
|
||||
|
||||
List<FaqEntry> all = plugin.getFaqManager().getAll();
|
||||
int totalPages = Math.max(1, (int) Math.ceil((double) all.size() / PAGE_SIZE));
|
||||
List<FaqEntry> all = plugin.getFaqManager().getAll();
|
||||
|
||||
// Sicherheit gegen leere Content-Slots Liste (Division by Zero)
|
||||
int pageSize = contentSlots.isEmpty() ? 45 : contentSlots.size();
|
||||
|
||||
int totalPages = Math.max(1, (int) Math.ceil((double) all.size() / pageSize));
|
||||
page = Math.max(0, Math.min(page, totalPages - 1));
|
||||
faqPage.put(player.getUniqueId(), page);
|
||||
|
||||
Inventory inv = Bukkit.createInventory(null, 54, title);
|
||||
int invSize = faqRows * 9;
|
||||
Inventory inv = Bukkit.createInventory(null, invSize, title);
|
||||
Map<Integer, FaqEntry> sm = new HashMap<>();
|
||||
|
||||
int start = page * PAGE_SIZE;
|
||||
for (int i = 0; i < PAGE_SIZE && (start + i) < all.size(); i++) {
|
||||
int start = page * pageSize;
|
||||
int itemsOnCurrentPage = 0; // Zähler für Items auf dieser Seite
|
||||
|
||||
// Wir nutzen entweder die konfigurierten Slots oder sequentiell von 0, falls Liste leer
|
||||
for (int i = 0; i < pageSize && (start + i) < all.size(); i++) {
|
||||
FaqEntry entry = all.get(start + i);
|
||||
inv.setItem(i, buildFaqSkull(entry, isAdmin));
|
||||
sm.put(i, entry);
|
||||
int slot = contentSlots.isEmpty() ? i : contentSlots.get(i);
|
||||
|
||||
if (slot < invSize) {
|
||||
inv.setItem(slot, buildFaqItem(entry, isAdmin));
|
||||
sm.put(slot, entry);
|
||||
itemsOnCurrentPage++;
|
||||
}
|
||||
}
|
||||
|
||||
slotMap.put(player.getUniqueId(), sm);
|
||||
@@ -122,8 +249,10 @@ public class FaqGUI implements Listener {
|
||||
if (isAdmin) adminView.add(player.getUniqueId());
|
||||
else adminView.remove(player.getUniqueId());
|
||||
|
||||
// ── Navigationsleiste ──────────────────────────────────────────────
|
||||
fillNavBar(inv, page, totalPages, isAdmin, all.isEmpty());
|
||||
// Kein Glas im Content-Bereich – nur Footer (fillNavBar) hat Glasscheiben
|
||||
|
||||
// Übergeben der korrekten Anzahl an die Navigationsleiste
|
||||
fillNavBar(inv, page, totalPages, isAdmin, all.isEmpty(), itemsOnCurrentPage);
|
||||
player.openInventory(inv);
|
||||
}
|
||||
|
||||
@@ -136,15 +265,18 @@ public class FaqGUI implements Listener {
|
||||
if (!(event.getWhoClicked() instanceof Player player)) return;
|
||||
String title = event.getView().getTitle();
|
||||
|
||||
if (!title.equals(FAQ_GUI_TITLE) && !title.equals(FAQ_ADMIN_TITLE)
|
||||
&& !title.equals(FAQ_ACTION_TITLE)) return;
|
||||
String playerTitle = f("title");
|
||||
String adminTitle = f("admin-title");
|
||||
String actionTitle = f("action-title");
|
||||
|
||||
if (!title.equals(playerTitle) && !title.equals(adminTitle)
|
||||
&& !title.equals(actionTitle)) return;
|
||||
|
||||
event.setCancelled(true);
|
||||
int slot = event.getRawSlot();
|
||||
if (slot < 0) return;
|
||||
|
||||
// ── Aktions-GUI ────────────────────────────────────────────────────
|
||||
if (title.equals(FAQ_ACTION_TITLE)) {
|
||||
if (title.equals(actionTitle)) {
|
||||
FaqEntry entry = actionEntry.get(player.getUniqueId());
|
||||
if (entry == null) return;
|
||||
switch (slot) {
|
||||
@@ -155,22 +287,15 @@ public class FaqGUI implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// ── FAQ-Listen-GUI ─────────────────────────────────────────────────
|
||||
boolean isAdmin = adminView.contains(player.getUniqueId());
|
||||
int curPage = faqPage.getOrDefault(player.getUniqueId(), 0);
|
||||
|
||||
// Navigationsslots
|
||||
if (slot == 45) { openFaqGUI(player, curPage - 1); return; }
|
||||
if (slot == 53) { openFaqGUI(player, curPage + 1); return; }
|
||||
if (slot == faqNavPrev) { openFaqGUI(player, curPage - 1); return; }
|
||||
if (slot == faqNavNext) { openFaqGUI(player, curPage + 1); return; }
|
||||
if (slot == faqNavAdd && isAdmin) { startAddFlow(player); return; }
|
||||
|
||||
// Admin-spezifisch: Neues FAQ hinzufügen
|
||||
if (slot == 50 && isAdmin) {
|
||||
startAddFlow(player);
|
||||
return;
|
||||
}
|
||||
|
||||
// FAQ-Item angeklickt
|
||||
if (slot < PAGE_SIZE) {
|
||||
// Check ob Slot in contentSlots ist
|
||||
if (contentSlots.contains(slot)) {
|
||||
Map<Integer, FaqEntry> sm = slotMap.get(player.getUniqueId());
|
||||
if (sm == null) return;
|
||||
FaqEntry entry = sm.get(slot);
|
||||
@@ -179,12 +304,12 @@ public class FaqGUI implements Listener {
|
||||
if (isAdmin) {
|
||||
openActionGUI(player, entry);
|
||||
} else {
|
||||
// Spieler: Antwort im Chat ausgeben
|
||||
player.closeInventory();
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&6&lFAQ #" + entry.getId() + ": &e" + entry.getQuestion()));
|
||||
player.sendMessage(plugin.color("&f" + entry.getAnswer()));
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(plugin.lang().format("faq.list-entry",
|
||||
"{id}", String.valueOf(entry.getId()), "{question}", entry.getQuestion()));
|
||||
player.sendMessage(plugin.lang().color("§f" + entry.getAnswer()));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -193,22 +318,15 @@ public class FaqGUI implements Listener {
|
||||
|
||||
private void openActionGUI(Player player, FaqEntry entry) {
|
||||
actionEntry.put(player.getUniqueId(), entry);
|
||||
Inventory inv = Bukkit.createInventory(null, 27, FAQ_ACTION_TITLE);
|
||||
Inventory inv = Bukkit.createInventory(null, 27, f("action-title"));
|
||||
|
||||
// Slot 4: FAQ-Info
|
||||
inv.setItem(4, buildFaqSkull(entry, false));
|
||||
|
||||
// Slot 10: Bearbeiten
|
||||
inv.setItem(10, buildItem(Material.WRITABLE_BOOK, "§a§lFAQ bearbeiten",
|
||||
List.of("§7Ändere Frage und Antwort", "§7dieses FAQ-Eintrags.")));
|
||||
|
||||
// Slot 12: Löschen
|
||||
inv.setItem(12, buildItem(Material.BARRIER, "§c§lFAQ löschen",
|
||||
List.of("§7Löscht diesen FAQ-Eintrag.", "§c§lACHTUNG: §cNicht rückgängig zu machen!")));
|
||||
|
||||
// Slot 16: Zurück
|
||||
inv.setItem(16, buildItem(Material.ARROW, "§7§lZurück",
|
||||
List.of("§7Zurück zur FAQ-Übersicht.")));
|
||||
inv.setItem(4, buildFaqItem(entry, false));
|
||||
inv.setItem(10, buildItem(Material.WRITABLE_BOOK, f("edit-button"),
|
||||
List.of(f("edit-lore-1"), f("edit-lore-2"))));
|
||||
inv.setItem(12, buildItem(Material.BARRIER, f("delete-button"),
|
||||
List.of(f("delete-lore-1"), f("delete-lore-2"))));
|
||||
inv.setItem(16, buildItem(Material.ARROW, f("back-button"),
|
||||
List.of(f("back-lore"))));
|
||||
|
||||
fillGlass(inv);
|
||||
player.openInventory(inv);
|
||||
@@ -219,10 +337,10 @@ public class FaqGUI implements Listener {
|
||||
private void startAddFlow(Player player) {
|
||||
player.closeInventory();
|
||||
awaitingQuestion.put(player.getUniqueId(), "new");
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&6&lNeues FAQ erstellen"));
|
||||
player.sendMessage(plugin.color("&7Gib die &eFrage &7ein (oder &ccancel&7):"));
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(f("chat-create-title"));
|
||||
player.sendMessage(f("chat-question-prompt"));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
}
|
||||
|
||||
// ─────────────────────────── Chat-Flow: Bearbeiten ─────────────────────
|
||||
@@ -230,11 +348,11 @@ public class FaqGUI implements Listener {
|
||||
private void startEditFlow(Player player, FaqEntry entry) {
|
||||
player.closeInventory();
|
||||
awaitingQuestion.put(player.getUniqueId(), "edit:" + entry.getId());
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.color("&6&lFAQ #" + entry.getId() + " bearbeiten"));
|
||||
player.sendMessage(plugin.color("&7Aktuelle Frage: &e" + entry.getQuestion()));
|
||||
player.sendMessage(plugin.color("&7Gib die neue &eFrage &7ein (oder &ccancel&7):"));
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(f("chat-edit-title", "{id}", String.valueOf(entry.getId())));
|
||||
player.sendMessage(f("chat-current-question", "{question}", entry.getQuestion()));
|
||||
player.sendMessage(f("chat-question-prompt"));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
}
|
||||
|
||||
// ─────────────────────────── Löschen ───────────────────────────────────
|
||||
@@ -243,15 +361,15 @@ public class FaqGUI implements Listener {
|
||||
player.closeInventory();
|
||||
boolean success = plugin.getFaqManager().delete(entry.getId());
|
||||
if (success) {
|
||||
player.sendMessage(plugin.color("&aFAQ #" + entry.getId() + " &a(§e" + entry.getQuestion() + "§a) wurde gelöscht."));
|
||||
player.sendMessage(plugin.lang().format("faq.deleted", "{id}", String.valueOf(entry.getId())));
|
||||
} else {
|
||||
player.sendMessage(plugin.color("&cFehler: FAQ #" + entry.getId() + " konnte nicht gelöscht werden."));
|
||||
player.sendMessage(f("delete-error", "{id}", String.valueOf(entry.getId())));
|
||||
}
|
||||
openFaqGUI(player);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════════════
|
||||
// CHAT-EVENTS (Frage & Antwort Eingabe)
|
||||
// CHAT-EVENTS
|
||||
// ═══════════════════════════════════════════════════════════════════════
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
@@ -262,24 +380,22 @@ public class FaqGUI implements Listener {
|
||||
// ── Schritt 1: Warte auf Frage ─────────────────────────────────────
|
||||
if (awaitingQuestion.containsKey(uuid)) {
|
||||
event.setCancelled(true);
|
||||
String state = awaitingQuestion.remove(uuid);
|
||||
String input = event.getMessage().trim();
|
||||
String state = awaitingQuestion.remove(uuid);
|
||||
String input = event.getMessage().trim();
|
||||
|
||||
if (input.equalsIgnoreCase("cancel")) {
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
player.sendMessage(plugin.color("&cAbgebrochen."));
|
||||
player.sendMessage(plugin.lang().get("gui.close-cancelled"));
|
||||
openFaqGUI(player);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Frage gespeichert → jetzt auf Antwort warten
|
||||
// Encoded state: "new" oder "edit:<id>"
|
||||
awaitingAnswer.put(uuid, state + "§§" + input); // "§§" as internal separator
|
||||
awaitingAnswer.put(uuid, state + "\u0000" + input);
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
player.sendMessage(plugin.color("&7Frage gesetzt: &e" + input));
|
||||
player.sendMessage(plugin.color("&7Gib jetzt die &eAntwort &7ein (oder &ccancel&7):"));
|
||||
player.sendMessage(f("question-set", "{question}", input));
|
||||
player.sendMessage(f("chat-answer-prompt"));
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -292,36 +408,32 @@ public class FaqGUI implements Listener {
|
||||
|
||||
if (input.equalsIgnoreCase("cancel")) {
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
player.sendMessage(plugin.color("&cAbgebrochen."));
|
||||
player.sendMessage(plugin.lang().get("gui.close-cancelled"));
|
||||
openFaqGUI(player);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// stateAndQuestion = "<state>§§<question>"
|
||||
int sep = stateAndQuestion.indexOf("§§");
|
||||
int sep = stateAndQuestion.indexOf("\u0000");
|
||||
String state = stateAndQuestion.substring(0, sep);
|
||||
String question = stateAndQuestion.substring(sep + 2);
|
||||
String answer = input;
|
||||
String question = stateAndQuestion.substring(sep + 1);
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
if (state.equals("new")) {
|
||||
// Hinzufügen
|
||||
FaqEntry created = plugin.getFaqManager().add(question, answer);
|
||||
player.sendMessage(plugin.color("&aFAQ #" + created.getId() + " wurde erfolgreich erstellt!"));
|
||||
FaqEntry created = plugin.getFaqManager().add(question, input);
|
||||
player.sendMessage(plugin.lang().format("faq.created", "{id}", String.valueOf(created.getId())));
|
||||
} else {
|
||||
// Bearbeiten: state = "edit:<id>"
|
||||
int id;
|
||||
try {
|
||||
id = Integer.parseInt(state.substring(5)); // "edit:".length() = 5
|
||||
id = Integer.parseInt(state.substring(5));
|
||||
} catch (NumberFormatException e) {
|
||||
player.sendMessage(plugin.color("&cInterner Fehler beim Bearbeiten des FAQs."));
|
||||
player.sendMessage(f("internal-error"));
|
||||
openFaqGUI(player);
|
||||
return;
|
||||
}
|
||||
boolean ok = plugin.getFaqManager().edit(id, question, answer);
|
||||
if (ok) player.sendMessage(plugin.color("&aFAQ #" + id + " wurde erfolgreich aktualisiert!"));
|
||||
else player.sendMessage(plugin.color("&cFAQ #" + id + " wurde nicht gefunden."));
|
||||
boolean ok = plugin.getFaqManager().edit(id, question, input);
|
||||
if (ok) player.sendMessage(plugin.lang().format("faq.updated", "{id}", String.valueOf(id)));
|
||||
else player.sendMessage(plugin.lang().format("faq.not-found", "{id}", String.valueOf(id)));
|
||||
}
|
||||
openFaqGUI(player);
|
||||
});
|
||||
@@ -332,70 +444,71 @@ public class FaqGUI implements Listener {
|
||||
// ITEM-BUILDER
|
||||
// ═══════════════════════════════════════════════════════════════════════
|
||||
|
||||
/**
|
||||
* Baut ein Custom-Skull-Item für einen FAQ-Eintrag.
|
||||
* Nutzt die Textur: da2fde34d34c8588e58bfd790ce18025f7843399dee2ab4cedc2c0b463fd1e
|
||||
*
|
||||
* Bei einem Fehler mit der Textur wird auf BOOK zurückgefallen.
|
||||
*/
|
||||
private ItemStack buildFaqSkull(FaqEntry entry, boolean adminHint) {
|
||||
ItemStack skull;
|
||||
|
||||
try {
|
||||
skull = new ItemStack(Material.PLAYER_HEAD);
|
||||
SkullMeta meta = (SkullMeta) skull.getItemMeta();
|
||||
if (meta != null) {
|
||||
PlayerProfile profile = Bukkit.createPlayerProfile(
|
||||
UUID.nameUUIDFromBytes(("FAQ_" + entry.getId()).getBytes()), "FAQ_" + entry.getId());
|
||||
PlayerTextures textures = profile.getTextures();
|
||||
textures.setSkin(new URL(FAQ_SKIN_URL));
|
||||
profile.setTextures(textures);
|
||||
meta.setOwnerProfile(profile);
|
||||
meta.setDisplayName("§e§l" + entry.getQuestion());
|
||||
meta.setLore(buildFaqLore(entry, adminHint));
|
||||
skull.setItemMeta(meta);
|
||||
private ItemStack buildFaqItem(FaqEntry entry, boolean adminHint) {
|
||||
ItemStack item;
|
||||
|
||||
if (headMaterial == Material.PLAYER_HEAD) {
|
||||
try {
|
||||
item = new ItemStack(Material.PLAYER_HEAD);
|
||||
SkullMeta meta = (SkullMeta) item.getItemMeta();
|
||||
if (meta != null) {
|
||||
PlayerProfile profile = Bukkit.createPlayerProfile(
|
||||
UUID.nameUUIDFromBytes(("FAQ_" + entry.getId()).getBytes()), "FAQ_" + entry.getId());
|
||||
PlayerTextures textures = profile.getTextures();
|
||||
textures.setSkin(new URL(headTexture));
|
||||
profile.setTextures(textures);
|
||||
meta.setOwnerProfile(profile);
|
||||
meta.setDisplayName("§e§l" + entry.getQuestion());
|
||||
meta.setLore(buildFaqLore(entry, adminHint));
|
||||
item.setItemMeta(meta);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
item = buildFallbackItem(entry, adminHint);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// Fallback auf BOOK wenn Textur nicht gesetzt werden kann
|
||||
skull = new ItemStack(Material.BOOK);
|
||||
ItemMeta meta = skull.getItemMeta();
|
||||
} else {
|
||||
item = new ItemStack(headMaterial);
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
if (meta != null) {
|
||||
meta.setDisplayName("§e§l" + entry.getQuestion());
|
||||
meta.setLore(buildFaqLore(entry, adminHint));
|
||||
skull.setItemMeta(meta);
|
||||
item.setItemMeta(meta);
|
||||
}
|
||||
}
|
||||
|
||||
return skull;
|
||||
return item;
|
||||
}
|
||||
|
||||
private ItemStack buildFallbackItem(FaqEntry entry, boolean adminHint) {
|
||||
ItemStack item = new ItemStack(Material.BOOK);
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
if (meta != null) {
|
||||
meta.setDisplayName("§e§l" + entry.getQuestion());
|
||||
meta.setLore(buildFaqLore(entry, adminHint));
|
||||
item.setItemMeta(meta);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
/** Erstellt die Lore-Zeilen für ein FAQ-Item (Antwort aufgeteilt in 40er-Zeilen). */
|
||||
private List<String> buildFaqLore(FaqEntry entry, boolean adminHint) {
|
||||
List<String> lore = new ArrayList<>();
|
||||
lore.add("§8§m ");
|
||||
lore.add("§7FAQ #" + entry.getId());
|
||||
lore.add("§8§m ");
|
||||
lore.add(f("lore-separator"));
|
||||
lore.add(f("lore-id", "{id}", String.valueOf(entry.getId())));
|
||||
lore.add(f("lore-separator"));
|
||||
|
||||
// Antwort in 40-Zeichen-Abschnitte aufteilen
|
||||
String answer = entry.getAnswer();
|
||||
int chunkSize = 40;
|
||||
String answer = entry.getAnswer();
|
||||
int chunkSize = 40;
|
||||
for (int i = 0; i < answer.length(); i += chunkSize) {
|
||||
int end = Math.min(i + chunkSize, answer.length());
|
||||
// Wortgrenzen bevorzugen
|
||||
if (end < answer.length() && answer.charAt(end) != ' ') {
|
||||
int lastSpace = answer.lastIndexOf(' ', end);
|
||||
if (lastSpace > i) end = lastSpace;
|
||||
}
|
||||
lore.add("§f" + answer.substring(i, end).trim());
|
||||
i = end - chunkSize; // Schleifeninkrement korrigieren
|
||||
i = end - chunkSize;
|
||||
}
|
||||
|
||||
lore.add("§8§m ");
|
||||
if (adminHint) {
|
||||
lore.add("§e» Klicken zum Bearbeiten / Löschen");
|
||||
} else {
|
||||
lore.add("§e» Klicken für mehr Details im Chat");
|
||||
}
|
||||
lore.add(f("lore-separator"));
|
||||
if (adminHint) lore.add(f("click-edit"));
|
||||
else lore.add(f("click-detail"));
|
||||
return lore;
|
||||
}
|
||||
|
||||
@@ -411,25 +524,31 @@ public class FaqGUI implements Listener {
|
||||
|
||||
// ─────────────────────────── Navigationsleiste ─────────────────────────
|
||||
|
||||
private void fillNavBar(Inventory inv, int page, int totalPages, boolean isAdmin, boolean isEmpty) {
|
||||
private void fillNavBar(Inventory inv, int page, int totalPages, boolean isAdmin, boolean isEmpty, int itemCount) {
|
||||
ItemStack glass = makeGlass();
|
||||
for (int i = 45; i < 54; i++) inv.setItem(i, glass);
|
||||
// Untere Reihe füllen (Nav-Bar)
|
||||
for (int i = inv.getSize() - 9; i < inv.getSize(); i++) inv.setItem(i, glass);
|
||||
|
||||
if (page > 0) {
|
||||
inv.setItem(45, buildItem(Material.ARROW, "§7§l◄ Zurück",
|
||||
List.of("§7Seite " + page + " von " + totalPages)));
|
||||
inv.setItem(faqNavPrev, buildActionItem(matNavPrev,
|
||||
f("nav-prev"),
|
||||
List.of(f("nav-prev-lore", "{page}", String.valueOf(page), "{total}", String.valueOf(totalPages)))));
|
||||
}
|
||||
if (page < totalPages - 1) {
|
||||
inv.setItem(53, buildItem(Material.ARROW, "§7§lWeiter ►",
|
||||
List.of("§7Seite " + (page + 2) + " von " + totalPages)));
|
||||
inv.setItem(faqNavNext, buildActionItem(matNavNext,
|
||||
f("nav-next"),
|
||||
List.of(f("nav-next-lore", "{page}", String.valueOf(page + 2), "{total}", String.valueOf(totalPages)))));
|
||||
}
|
||||
|
||||
inv.setItem(49, buildItem(Material.PAPER, "§8Seite " + (page + 1) + "/" + totalPages,
|
||||
List.of("§7Gesamt: " + (isEmpty ? 0 : Math.min(PAGE_SIZE, totalPages * PAGE_SIZE)) + " FAQ(s)")));
|
||||
// itemCount ist jetzt die tatsächliche Anzahl der Items auf der Seite
|
||||
int displayCount = isEmpty ? 0 : itemCount;
|
||||
|
||||
inv.setItem(faqNavPage, buildActionItem(matNavPage, f("nav-page", "{page}", String.valueOf(page + 1), "{total}", String.valueOf(totalPages)),
|
||||
List.of(f("nav-page-lore", "{count}", String.valueOf(displayCount)))));
|
||||
|
||||
if (isAdmin) {
|
||||
inv.setItem(50, buildItem(Material.LIME_WOOL, "§a§lNeues FAQ hinzufügen",
|
||||
List.of("§7Fügt einen neuen FAQ-Eintrag hinzu.", "§7Du wirst nach Frage und Antwort gefragt.")));
|
||||
inv.setItem(faqNavAdd, buildActionItem(matNavAdd, f("add-button"),
|
||||
List.of(f("add-lore-1"), f("add-lore-2"))));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -446,4 +565,14 @@ public class FaqGUI implements Listener {
|
||||
if (meta != null) { meta.setDisplayName(" "); glass.setItemMeta(meta); }
|
||||
return glass;
|
||||
}
|
||||
|
||||
private ItemStack buildActionItem(Material material, String displayName, List<String> lore) {
|
||||
ItemStack item = new ItemStack(material);
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
if (meta == null) return item;
|
||||
meta.setDisplayName(displayName);
|
||||
meta.setLore(lore);
|
||||
item.setItemMeta(meta);
|
||||
return item;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@ 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;
|
||||
@@ -33,18 +32,15 @@ public class PlayerJoinListener implements Listener {
|
||||
int count = plugin.getDatabaseManager().countOpenTickets();
|
||||
if (count > 0) {
|
||||
Bukkit.getScheduler().runTaskLater(plugin, () -> {
|
||||
String msg = plugin.formatMessage("messages.join-open-tickets")
|
||||
.replace("{count}", String.valueOf(count));
|
||||
player.sendMessage(msg);
|
||||
player.sendMessage(plugin.color("&7» Tippe &e/ticket list &7für die Übersicht."));
|
||||
player.sendMessage(plugin.lang().format("join.open-tickets",
|
||||
"{count}", String.valueOf(count)));
|
||||
player.sendMessage(plugin.lang().get("join.open-tickets-hint"));
|
||||
}, 40L);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ── 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, () -> {
|
||||
@@ -58,23 +54,20 @@ public class PlayerJoinListener implements Listener {
|
||||
if (!player.isOnline()) return;
|
||||
World world = Bukkit.getWorld(pt.world());
|
||||
if (world == null) {
|
||||
player.sendMessage(plugin.color(
|
||||
"&cTeleport-Zielwelt &e" + pt.world() + " &cnicht gefunden!"));
|
||||
player.sendMessage(plugin.lang().format("join.teleport-world-missing",
|
||||
"{world}", pt.world()));
|
||||
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()) + ")"));
|
||||
String coords = String.format("%.0f, %.0f, %.0f", pt.x(), pt.y(), pt.z());
|
||||
player.sendMessage(plugin.lang().format("join.teleport-success", "{coords}", coords));
|
||||
});
|
||||
});
|
||||
// 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, () -> {
|
||||
@@ -82,36 +75,30 @@ public class PlayerJoinListener implements Listener {
|
||||
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):"));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(plugin.lang().get("join.pending-header"));
|
||||
for (String msg : pending) {
|
||||
player.sendMessage(plugin.color(msg));
|
||||
player.sendMessage(plugin.lang().color(msg));
|
||||
}
|
||||
player.sendMessage(plugin.color("&8&m "));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
});
|
||||
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
|
||||
// ── Spieler: Ticket-claimed-Benachrichtigung für Offline-Zeit ──────
|
||||
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.
|
||||
// ── Spieler: über geschlossene Tickets informieren ────────────────
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
// Nur Tickets dieses Spielers laden (nicht ALLE closed Tickets)
|
||||
List<Ticket> closed = plugin.getDatabaseManager()
|
||||
.getTicketsByStatus(TicketStatus.CLOSED);
|
||||
.getUnnotifiedClosedTicketsByPlayer(player.getUniqueId());
|
||||
|
||||
for (Ticket t : closed) {
|
||||
if (!t.getCreatorUUID().equals(player.getUniqueId())) continue;
|
||||
// DB-Feld prüfen – funktioniert serverübergreifend
|
||||
if (t.isCloseNotified()) continue;
|
||||
|
||||
Bukkit.getScheduler().runTask(plugin, () ->
|
||||
plugin.getTicketManager().notifyCreatorClosed(t));
|
||||
}
|
||||
@@ -124,13 +111,13 @@ public class PlayerJoinListener implements Listener {
|
||||
new de.ticketsystem.UpdateChecker(plugin, resourceId).getVersion(version -> {
|
||||
String current = plugin.getDescription().getVersion();
|
||||
if (!current.equals(version)) {
|
||||
String bar = ChatColor.GOLD + "====================================================";
|
||||
player.sendMessage(bar);
|
||||
player.sendMessage(ChatColor.GOLD + "[TicketSystem] "
|
||||
+ ChatColor.YELLOW + "NEUES UPDATE VERFÜGBAR: v" + version);
|
||||
player.sendMessage(ChatColor.GOLD + "[TicketSystem] "
|
||||
+ ChatColor.YELLOW + "Download: https://www.spigotmc.org/resources/132757");
|
||||
player.sendMessage(bar);
|
||||
String bar = plugin.lang().get("update.available-bar");
|
||||
String line1 = plugin.lang().format("update.available-line1", "{version}", version);
|
||||
String line2 = plugin.lang().get("update.available-line2");
|
||||
player.sendMessage(ChatColor.GOLD + bar);
|
||||
player.sendMessage(line1);
|
||||
player.sendMessage(line2);
|
||||
player.sendMessage(ChatColor.GOLD + bar);
|
||||
}
|
||||
});
|
||||
}, 20L);
|
||||
|
||||
@@ -93,9 +93,9 @@ public class FaqManager {
|
||||
writeEntry(4, "Wie kann ich meinen Support bewerten?",
|
||||
"Nach dem Schließen eines Tickets kannst du mit /ticket rate <ID> good/bad eine Bewertung abgeben.");
|
||||
nextId = 5;
|
||||
// Sync entries list with what we just wrote
|
||||
// Sync entries list with what we just wrote – Text muss identisch sein!
|
||||
entries.add(new FaqEntry(1, "Wie erstelle ich ein Ticket?",
|
||||
"Nutze den Befehl /ticket create [Kategorie] [Beschreibung] um ein neues Ticket zu erstellen."));
|
||||
"Nutze den Befehl /ticket create [Kategorie] [Prio][Beschreibung] um ein neues Ticket zu erstellen."));
|
||||
entries.add(new FaqEntry(2, "Wie lange dauert die Bearbeitung?",
|
||||
"Unser Support-Team bearbeitet Tickets so schnell wie möglich. Bitte habe etwas Geduld."));
|
||||
entries.add(new FaqEntry(3, "Kann ich mein Ticket löschen?",
|
||||
|
||||
346
src/main/java/de/ticketsystem/manager/LanguageManager.java
Normal file
346
src/main/java/de/ticketsystem/manager/LanguageManager.java
Normal file
@@ -0,0 +1,346 @@
|
||||
package de.ticketsystem.manager;
|
||||
|
||||
import de.ticketsystem.TicketPlugin;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* Lädt alle Plugin-Texte aus der aktiven Sprachdatei (lang_de.yml / lang_en.yml)
|
||||
* und ersetzt {cmd_X}-Platzhalter durch die passenden Befehlsnamen.
|
||||
*
|
||||
* Unterstützt Hex-Farbcodes (z.B. &#FF0055 oder <#FF0055>).
|
||||
* Funktioniert ab Spigot 1.16+.
|
||||
*
|
||||
* ┌─────────────────────────────────────────────────────────┐
|
||||
* │ Einziger Konfigurations-Schlüssel: language │
|
||||
* │ │
|
||||
* │ language: de → deutsche Texte + deutsche Befehle │
|
||||
* │ language: en → englische Texte + englische Befehle │
|
||||
* │ language: both → deutsche Texte + beide Befehlsnamen │
|
||||
* │ │
|
||||
* │ "command-language" existiert nicht mehr und wird │
|
||||
* │ vollständig ignoriert. │
|
||||
* └─────────────────────────────────────────────────────────┘
|
||||
*
|
||||
* Verfügbare {cmd_X}-Platzhalter in lang.yml:
|
||||
* {cmd_create} {cmd_list} {cmd_comment} {cmd_rate}
|
||||
* {cmd_claim} {cmd_close} {cmd_forward} {cmd_reload}
|
||||
* {cmd_stats} {cmd_archive} {cmd_migrate} {cmd_export}
|
||||
* {cmd_import} {cmd_blacklist} {cmd_setpriority} {cmd_faq} {cmd_top}
|
||||
*/
|
||||
public class LanguageManager {
|
||||
|
||||
// ── Konstanten ──────────────────────────────────────────────────────────
|
||||
|
||||
private static final Set<String> SUPPORTED = Set.of("de", "en", "both");
|
||||
private static final String FALLBACK = "de";
|
||||
|
||||
/** Nachrichten-Pfade die KEINEN Plugin-Prefix erhalten. */
|
||||
private static final String[] NO_PREFIX_PATHS = {
|
||||
"general.separator", "help.", "stats.", "top.", "faq.list-",
|
||||
"blacklist.list-", "gui.", "join.pending-header", "update."
|
||||
};
|
||||
|
||||
// ── Befehlsnamen-Tabellen (statisch, ändern sich nie) ───────────────────
|
||||
|
||||
private static final LinkedHashMap<String, String> DE = new LinkedHashMap<>();
|
||||
private static final LinkedHashMap<String, String> EN = new LinkedHashMap<>();
|
||||
|
||||
static {
|
||||
DE.put("create", "erstellen");
|
||||
DE.put("list", "liste");
|
||||
DE.put("comment", "kommentar");
|
||||
DE.put("rate", "bewerten");
|
||||
DE.put("claim", "übernehmen");
|
||||
DE.put("close", "schließen");
|
||||
DE.put("forward", "weiterleiten");
|
||||
DE.put("reload", "neuladen");
|
||||
DE.put("stats", "statistik");
|
||||
DE.put("archive", "archivieren");
|
||||
DE.put("migrate", "migrieren");
|
||||
DE.put("export", "exportieren");
|
||||
DE.put("import", "importieren");
|
||||
DE.put("blacklist", "sperrliste");
|
||||
DE.put("setpriority", "priorität");
|
||||
DE.put("faq", "faq");
|
||||
DE.put("top", "top");
|
||||
|
||||
EN.put("create", "create");
|
||||
EN.put("list", "list");
|
||||
EN.put("comment", "comment");
|
||||
EN.put("rate", "rate");
|
||||
EN.put("claim", "claim");
|
||||
EN.put("close", "close");
|
||||
EN.put("forward", "forward");
|
||||
EN.put("reload", "reload");
|
||||
EN.put("stats", "stats");
|
||||
EN.put("archive", "archive");
|
||||
EN.put("migrate", "migrate");
|
||||
EN.put("export", "export");
|
||||
EN.put("import", "import");
|
||||
EN.put("blacklist", "blacklist");
|
||||
EN.put("setpriority", "setpriority");
|
||||
EN.put("faq", "faq");
|
||||
EN.put("top", "top");
|
||||
}
|
||||
|
||||
// ── Felder ───────────────────────────────────────────────────────────────
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
private YamlConfiguration lang;
|
||||
private String prefix;
|
||||
|
||||
/**
|
||||
* Aktiver Sprachmodus – wird bei jedem load() DIREKT aus der Config gelesen.
|
||||
* Kein Cache, kein Zwischenwert. Immer frisch nach reloadConfig().
|
||||
*/
|
||||
private String activeLang;
|
||||
|
||||
/**
|
||||
* Dateiname-Kürzel: "de" oder "en".
|
||||
* "both" verwendet die DE-Datei für die Texte.
|
||||
*/
|
||||
private String fileLang;
|
||||
|
||||
/**
|
||||
* Ersetzungsmap {cmd_X} → Anzeigename.
|
||||
* Wird bei jedem load() komplett neu gebaut.
|
||||
*/
|
||||
private Map<String, String> cmdNames = new LinkedHashMap<>();
|
||||
|
||||
// ── Konstruktor ──────────────────────────────────────────────────────────
|
||||
|
||||
public LanguageManager(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
load();
|
||||
}
|
||||
|
||||
// ── Laden ────────────────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Lädt (oder relädt) die Sprachdatei und baut alle Befehlsnamen neu.
|
||||
* Muss nach plugin.reloadConfig() aufgerufen werden, damit die frische
|
||||
* language-Einstellung übernommen wird.
|
||||
*/
|
||||
public void load() {
|
||||
|
||||
// 1. language aus der (bereits neu geladenen) Config lesen
|
||||
String raw = plugin.getConfig().getString("language", FALLBACK)
|
||||
.toLowerCase().trim();
|
||||
|
||||
if (!SUPPORTED.contains(raw)) {
|
||||
plugin.getLogger().warning("[LanguageManager] Unbekannter Wert language='"
|
||||
+ raw + "' in config.yml – verwende '" + FALLBACK + "'.");
|
||||
raw = FALLBACK;
|
||||
}
|
||||
|
||||
activeLang = raw;
|
||||
fileLang = "en".equals(activeLang) ? "en" : "de";
|
||||
|
||||
// 2. Sprachdatei einlesen (ggf. aus JAR extrahieren)
|
||||
String fileName = "lang_" + fileLang + ".yml";
|
||||
File file = new File(plugin.getDataFolder(), fileName);
|
||||
|
||||
if (!file.exists()) {
|
||||
try {
|
||||
plugin.saveResource(fileName, false);
|
||||
} catch (IllegalArgumentException ex) {
|
||||
plugin.getLogger().severe("[LanguageManager] '" + fileName
|
||||
+ "' nicht im Plugin-JAR – Plugin neu installieren!");
|
||||
lang = new YamlConfiguration();
|
||||
prefix = color("&8[&6Ticket&8] &r");
|
||||
cmdNames = buildCmdNames();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
lang = YamlConfiguration.loadConfiguration(file);
|
||||
|
||||
// 3. Fehlende Schlüssel aus JAR-Defaults ergänzen & ggf. speichern
|
||||
InputStream defaultStream = plugin.getResource(fileName);
|
||||
if (defaultStream != null) {
|
||||
YamlConfiguration defaults = YamlConfiguration.loadConfiguration(
|
||||
new InputStreamReader(defaultStream, StandardCharsets.UTF_8));
|
||||
lang.setDefaults(defaults);
|
||||
|
||||
boolean changed = false;
|
||||
for (String key : defaults.getKeys(true)) {
|
||||
if (!lang.isSet(key)) {
|
||||
lang.set(key, defaults.get(key));
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if (changed) {
|
||||
try { lang.save(file); }
|
||||
catch (IOException ex) {
|
||||
plugin.getLogger().log(Level.WARNING,
|
||||
"[LanguageManager] Konnte " + fileName + " nicht speichern.", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Prefix & Befehlsnamen aufbauen
|
||||
prefix = color(lang.getString("prefix", "&8[&6Ticket&8] &r"));
|
||||
cmdNames = buildCmdNames();
|
||||
|
||||
plugin.getLogger().info("[LanguageManager] Geladen: " + fileName
|
||||
+ " | language=" + activeLang
|
||||
+ " | Befehle: " + describeMode());
|
||||
}
|
||||
|
||||
// ── Befehlsnamen ─────────────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Baut {cmd_X} → Anzeigename anhand von activeLang.
|
||||
*
|
||||
* de → /ticket erstellen
|
||||
* en → /ticket create
|
||||
* both → /ticket create §8(§7erstellen§8)
|
||||
*/
|
||||
private Map<String, String> buildCmdNames() {
|
||||
Map<String, String> map = new LinkedHashMap<>();
|
||||
for (String key : EN.keySet()) {
|
||||
String display = switch (activeLang) {
|
||||
case "en" -> "/ticket " + EN.get(key);
|
||||
case "both" -> "/ticket " + EN.get(key) + " §8(§7" + DE.get(key) + "§8)";
|
||||
default -> "/ticket " + DE.get(key); // "de" + alle unbekannten
|
||||
};
|
||||
map.put("{cmd_" + key + "}", display);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private String describeMode() {
|
||||
return switch (activeLang) {
|
||||
case "en" -> "Englisch (/ticket create ...)";
|
||||
case "both" -> "Beides (/ticket create (erstellen) ...)";
|
||||
default -> "Deutsch (/ticket erstellen ...)";
|
||||
};
|
||||
}
|
||||
|
||||
// ── Befehlssprache-Abfragen (für TicketCommand) ──────────────────────────
|
||||
|
||||
/** true wenn deutsche Subkommandos akzeptiert werden sollen (Tab-Complete & Eingabe). */
|
||||
public boolean acceptsGerman() { return "de".equals(activeLang) || "both".equals(activeLang); }
|
||||
|
||||
/** true wenn englische Subkommandos akzeptiert werden sollen (Tab-Complete & Eingabe). */
|
||||
public boolean acceptsEnglish() { return "en".equals(activeLang) || "both".equals(activeLang); }
|
||||
|
||||
// ── Interne Platzhalter-Ersetzung ───────────────────────────────────────
|
||||
|
||||
private String applyCmdNames(String text) {
|
||||
if (text == null) return "";
|
||||
for (Map.Entry<String, String> e : cmdNames.entrySet())
|
||||
text = text.replace(e.getKey(), e.getValue());
|
||||
return text;
|
||||
}
|
||||
|
||||
// ── Public API ───────────────────────────────────────────────────────────
|
||||
|
||||
/** Roher Wert aus der Sprachdatei – ohne Farbe oder Platzhalter-Ersetzung. */
|
||||
public String getRaw(String key) {
|
||||
String value = lang.getString(key);
|
||||
if (value == null) {
|
||||
plugin.getLogger().warning("[LanguageManager] Fehlender Schlüssel: " + key);
|
||||
return key;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/** Übersetzter, eingefärbter Text. {cmd_X}-Platzhalter werden ersetzt. */
|
||||
public String get(String key) {
|
||||
return color(applyCmdNames(getRaw(key)));
|
||||
}
|
||||
|
||||
/** Übersetzter Text mit zusätzlichen {placeholder} → Wert Ersetzungen. */
|
||||
public String format(String key, String... replacements) {
|
||||
String text = applyCmdNames(getRaw(key));
|
||||
if (replacements.length % 2 != 0)
|
||||
plugin.getLogger().warning("[LanguageManager] format() benötigt eine gerade Anzahl an Argumenten für: " + key);
|
||||
for (int i = 0; i + 1 < replacements.length; i += 2)
|
||||
text = text.replace(replacements[i], replacements[i + 1]);
|
||||
return color(text);
|
||||
}
|
||||
|
||||
/** Gibt prefix + format(...) zurück. */
|
||||
public String formatWithPrefix(String key, String... replacements) {
|
||||
return prefix + format(key, replacements);
|
||||
}
|
||||
|
||||
/** Sendet eine Nachricht (mit Prefix wenn nötig) an einen CommandSender. */
|
||||
public void send(CommandSender sender, String key, String... replacements) {
|
||||
sender.sendMessage(needsPrefix(key)
|
||||
? prefix + format(key, replacements)
|
||||
: format(key, replacements));
|
||||
}
|
||||
|
||||
/** Sendet die Trennlinie. */
|
||||
public void sendSeparator(CommandSender sender) {
|
||||
sender.sendMessage(get("general.separator"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt den vollständigen Befehlsstring zurück.
|
||||
* Beispiel: getCmdName("create") → "/ticket create" bei language=en
|
||||
*/
|
||||
public String getCmdName(String internalKey) {
|
||||
String full = cmdNames.get("{cmd_" + internalKey + "}");
|
||||
return full != null ? full : "/ticket " + internalKey;
|
||||
}
|
||||
|
||||
/**
|
||||
* Übersetzt &-Farbcodes und Hex-Farbcodes (&#RRGGBB oder <#RRGGBB>) in §-Codes.
|
||||
*/
|
||||
public String color(String text) {
|
||||
if (text == null || text.isEmpty()) return "";
|
||||
|
||||
// Regex für Hex Codes: &#RRGGBB oder <#RRGGBB>
|
||||
Pattern hexPattern = Pattern.compile("&#([A-Fa-f0-9]{6})|<#([A-Fa-f0-9]{6})>");
|
||||
Matcher matcher = hexPattern.matcher(text);
|
||||
StringBuffer buffer = new StringBuffer();
|
||||
|
||||
while (matcher.find()) {
|
||||
String group = matcher.group(1) != null ? matcher.group(1) : matcher.group(2);
|
||||
try {
|
||||
// Fix: Explizite Nutzung von net.md_5.bungee.api.ChatColor für Hex-Support (Spigot 1.16+)
|
||||
// Dies verhindert den "Symbol nicht gefunden"-Fehler beim Kompilieren mit der reinen Bukkit-API.
|
||||
net.md_5.bungee.api.ChatColor hexColor = net.md_5.bungee.api.ChatColor.of("#" + group);
|
||||
matcher.appendReplacement(buffer, hexColor.toString());
|
||||
} catch (IllegalArgumentException e) {
|
||||
// Falls der Farbcode ungültig ist, Tag entfernen
|
||||
matcher.appendReplacement(buffer, "");
|
||||
}
|
||||
}
|
||||
|
||||
String parsed = matcher.appendTail(buffer).toString();
|
||||
|
||||
// Übersetzung der klassischen &-Farbcodes (Bukkit Standard)
|
||||
return org.bukkit.ChatColor.translateAlternateColorCodes('&', parsed);
|
||||
}
|
||||
|
||||
public String getPrefix() { return prefix; }
|
||||
public String getActiveLang() { return activeLang; }
|
||||
public String getFileLang() { return fileLang; }
|
||||
|
||||
/** Relädt die Sprachdatei. Muss NACH plugin.reloadConfig() aufgerufen werden. */
|
||||
public void reload() { load(); }
|
||||
|
||||
// ── Intern ───────────────────────────────────────────────────────────────
|
||||
|
||||
private boolean needsPrefix(String key) {
|
||||
for (String p : NO_PREFIX_PATHS) if (key.startsWith(p)) return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -15,76 +15,68 @@ public class TicketManager {
|
||||
|
||||
private final TicketPlugin plugin;
|
||||
|
||||
/** Cooldown Map: UUID → Zeitstempel letztes Ticket */
|
||||
/** UUID → Zeitstempel der letzten Ticket-Erstellung */
|
||||
private final Map<UUID, Long> cooldowns = new HashMap<>();
|
||||
|
||||
public TicketManager(TicketPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
// ─────────────────────────── Cooldown ──────────────────────────────────
|
||||
// ── Cooldown ──────────────────────────────────────────────────────────
|
||||
|
||||
public boolean hasCooldown(UUID uuid) {
|
||||
if (!cooldowns.containsKey(uuid)) return false;
|
||||
long cooldownSeconds = plugin.getConfig().getLong("ticket-cooldown", 60) * 1000L;
|
||||
return (System.currentTimeMillis() - cooldowns.get(uuid)) < cooldownSeconds;
|
||||
long cdMillis = plugin.getConfig().getLong("ticket-cooldown", 60) * 1000L;
|
||||
return (System.currentTimeMillis() - cooldowns.get(uuid)) < cdMillis;
|
||||
}
|
||||
|
||||
public long getRemainingCooldown(UUID uuid) {
|
||||
long cooldownMillis = plugin.getConfig().getLong("ticket-cooldown", 60) * 1000L;
|
||||
long elapsed = System.currentTimeMillis() - cooldowns.getOrDefault(uuid, 0L);
|
||||
return Math.max(0, (cooldownMillis - elapsed) / 1000);
|
||||
long cdMillis = plugin.getConfig().getLong("ticket-cooldown", 60) * 1000L;
|
||||
long elapsed = System.currentTimeMillis() - cooldowns.getOrDefault(uuid, 0L);
|
||||
return Math.max(0, (cdMillis - elapsed) / 1000);
|
||||
}
|
||||
|
||||
public void setCooldown(UUID uuid) { cooldowns.put(uuid, System.currentTimeMillis()); }
|
||||
public void setCooldown(UUID uuid) {
|
||||
cooldowns.put(uuid, System.currentTimeMillis());
|
||||
}
|
||||
|
||||
// ─────────────────────────── Benachrichtigungen ────────────────────────
|
||||
// ── Team-Benachrichtigungen ───────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* Benachrichtigt alle Supporter/Admins über ein neues Ticket.
|
||||
* Bei BungeeCord wird die Nachricht an alle Server weitergeleitet.
|
||||
*/
|
||||
public void notifyTeam(Ticket ticket) {
|
||||
String creatorName = ticket.getCreatorName() != null ? ticket.getCreatorName() : "Unbekannt";
|
||||
String message = ticket.getMessage() != null ? ticket.getMessage() : "";
|
||||
|
||||
// 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]";
|
||||
categoryInfo = plugin.lang().format("notify.team-category", "{category}", cat.getColored());
|
||||
}
|
||||
if (plugin.getConfig().getBoolean("priorities-enabled", true)) {
|
||||
priorityInfo = " §7Priorität: §r" + ticket.getPriority().getColored();
|
||||
priorityInfo = plugin.lang().format("notify.team-priority", "{priority}", ticket.getPriority().getColored());
|
||||
}
|
||||
|
||||
// BungeeCord: Server-Herkunft anzeigen wenn BungeeCord aktiviert
|
||||
String serverInfo = "";
|
||||
if (plugin.isBungeeCordEnabled() && !"unknown".equals(ticket.getServerName())) {
|
||||
serverInfo = " §7Server: §b" + ticket.getServerName();
|
||||
serverInfo = plugin.lang().format("notify.team-server", "{server}", ticket.getServerName());
|
||||
}
|
||||
|
||||
String msg = plugin.formatMessage("messages.new-ticket-notify")
|
||||
.replace("{player}", creatorName)
|
||||
.replace("{message}", message)
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
String msg = plugin.lang().format("ticket.new-notify",
|
||||
"{player}", creatorName,
|
||||
"{message}", message,
|
||||
"{id}", String.valueOf(ticket.getId()))
|
||||
+ categoryInfo + priorityInfo + serverInfo;
|
||||
|
||||
String guiHint = plugin.color("&7» Klicke &e/ticket list &7um die GUI zu öffnen.");
|
||||
String guiHint = plugin.lang().get("notify.gui-hint");
|
||||
|
||||
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);
|
||||
@@ -96,239 +88,227 @@ public class TicketManager {
|
||||
plugin.getDiscordWebhook().sendNewTicket(ticket);
|
||||
}
|
||||
|
||||
// ── Ersteller-Benachrichtigungen ──────────────────────────────────────
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* Benachrichtigt den Ersteller, dass sein Ticket angenommen wurde.
|
||||
*/
|
||||
public void notifyCreatorClaimed(Ticket ticket) {
|
||||
String claimerName = resolveClaimerName(ticket);
|
||||
|
||||
String msg = plugin.formatMessage("messages.ticket-claimed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{claimer}", claimerName);
|
||||
|
||||
String msg = plugin.lang().format("ticket.claimed-notify",
|
||||
"{id}", String.valueOf(ticket.getId()),
|
||||
"{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.
|
||||
* Prüft beim Server-Join ob Tickets während der Offline-Zeit
|
||||
* geclaimt oder weitergeleitet wurden, und informiert den Spieler.
|
||||
*/
|
||||
public void notifyClaimedWhileOffline(Player player) {
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
var tickets = plugin.getDatabaseManager().getTicketsByStatus(
|
||||
TicketStatus.CLAIMED, TicketStatus.FORWARDED);
|
||||
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;
|
||||
final String name = t.getClaimerName() != null ? t.getClaimerName() : "Support";
|
||||
|
||||
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);
|
||||
player.sendMessage(plugin.lang().format("ticket.claimed-notify",
|
||||
"{id}", String.valueOf(t.getId()), "{claimer}", name));
|
||||
} 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);
|
||||
player.sendMessage(plugin.lang().format("ticket.forwarded-creator",
|
||||
"{id}", String.valueOf(t.getId()), "{supporter}", forwardedTo));
|
||||
}
|
||||
// Flag NACH der Nachricht setzen – sicher im Hauptthread
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin,
|
||||
() -> plugin.getDatabaseManager().markClaimerNotified(t.getId()));
|
||||
});
|
||||
|
||||
plugin.getDatabaseManager().markClaimerNotified(t.getId());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket weitergeleitet wurde.
|
||||
* BungeeCord: Cross-Server-Zustellung.
|
||||
* Benachrichtigt den Ersteller, dass sein Ticket weitergeleitet wurde.
|
||||
*/
|
||||
public void notifyCreatorForwarded(Ticket ticket) {
|
||||
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);
|
||||
|
||||
String msg = plugin.lang().format("ticket.forwarded-creator",
|
||||
"{id}", String.valueOf(ticket.getId()), "{supporter}", forwardedTo);
|
||||
deliverToPlayer(ticket.getCreatorUUID(), ticket.getCreatorName(), msg);
|
||||
|
||||
// Auch bei Weiterleitung notified setzen
|
||||
plugin.getDatabaseManager().markClaimerNotified(ticket.getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Sendet dem weitergeleiteten Supporter eine Benachrichtigung.
|
||||
* BungeeCord: Zustellung auch wenn der Supporter auf einem anderen Server ist.
|
||||
* Benachrichtigt den Supporter, an den ein Ticket weitergeleitet wurde.
|
||||
*/
|
||||
public void notifyForwardedTo(Ticket ticket, String fromName) {
|
||||
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()));
|
||||
|
||||
String msg = plugin.lang().format("ticket.forwarded-notify",
|
||||
"{player}", creatorName, "{id}", String.valueOf(ticket.getId()));
|
||||
deliverToPlayer(ticket.getForwardedToUUID(), ticket.getForwardedToName(), msg);
|
||||
|
||||
plugin.getDiscordWebhook().sendTicketForwarded(ticket, fromName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Benachrichtigt den Ersteller, wenn sein Ticket geschlossen wurde.
|
||||
* BungeeCord: Cross-Server-Zustellung + Fallback in Pending-DB.
|
||||
*/
|
||||
public void notifyCreatorClosed(Ticket ticket) { notifyCreatorClosed(ticket, null); }
|
||||
/** Benachrichtigt den Ersteller über die Schließung seines Tickets. */
|
||||
public void notifyCreatorClosed(Ticket ticket) {
|
||||
notifyCreatorClosed(ticket, null);
|
||||
}
|
||||
|
||||
public void notifyCreatorClosed(Ticket ticket, String closerName) {
|
||||
// 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()));
|
||||
|
||||
String comment = (ticket.getCloseComment() != null && !ticket.getCloseComment().isEmpty())
|
||||
? ticket.getCloseComment() : "";
|
||||
|
||||
// Hauptnachricht
|
||||
String msg = plugin.formatMessage("messages.ticket-closed-notify")
|
||||
.replace("{id}", String.valueOf(ticket.getId()))
|
||||
.replace("{comment}", comment);
|
||||
String msg = plugin.lang().format("ticket.closed-notify", "{id}", String.valueOf(ticket.getId()));
|
||||
|
||||
// Bewertungsaufforderung
|
||||
// Bewertungsaufforderung aufbauen
|
||||
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 ");
|
||||
String id = String.valueOf(ticket.getId());
|
||||
ratingMsg = plugin.lang().get("rating.prompt-header") + "\n"
|
||||
+ plugin.lang().get("rating.prompt-title") + "\n"
|
||||
+ plugin.lang().format("rating.prompt-good", "{id}", id) + "\n"
|
||||
+ plugin.lang().format("rating.prompt-bad", "{id}", id) + "\n"
|
||||
+ plugin.lang().get("rating.prompt-footer");
|
||||
}
|
||||
|
||||
// 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);
|
||||
creator.sendMessage(plugin.lang().format("ticket.close-comment-label", "{comment}", 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);
|
||||
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));
|
||||
plugin.lang().format("ticket.close-comment-label", "{comment}", comment));
|
||||
if (ratingMsg != null)
|
||||
plugin.getBungeeMessenger().sendMessageToPlayer(
|
||||
ticket.getCreatorUUID(), ticket.getCreatorName(), ratingMsg);
|
||||
|
||||
} else {
|
||||
// ─ Standalone, Spieler offline: in Pending-DB speichern ──────
|
||||
savePendingClosedNotification(ticket, comment);
|
||||
}
|
||||
|
||||
String closer = closerName != null ? closerName : "Unbekannt";
|
||||
plugin.getDiscordWebhook().sendTicketClosed(ticket, closer);
|
||||
plugin.getDiscordWebhook().sendTicketClosed(ticket,
|
||||
closerName != null ? closerName : "Unbekannt");
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* @deprecated Bitte ticket.isCloseNotified() direkt verwenden.
|
||||
*/
|
||||
@Deprecated
|
||||
public boolean wasClosedNotificationSent(int 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 ──────────────────
|
||||
// ── Ticket-Limit ──────────────────────────────────────────────────────
|
||||
|
||||
// ── 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.
|
||||
// ────────────────────────────────────────────────────────────────────────
|
||||
public boolean hasReachedTicketLimit(UUID uuid) {
|
||||
int max = plugin.getConfig().getInt("max-open-tickets-per-player", 2);
|
||||
if (max <= 0) return false;
|
||||
return plugin.getDatabaseManager().countOpenTicketsByPlayer(uuid) >= max;
|
||||
}
|
||||
|
||||
// ── Hilfe-Nachricht ───────────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Zustellung einer Nachricht an einen Spieler.
|
||||
* Sendet die Hilfe-Nachricht an den 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)
|
||||
* Die Befehlsnamen in den lang.yml-Schlüsseln (z.B. help.create) enthalten
|
||||
* {cmd_X}-Platzhalter. Der LanguageManager ersetzt diese automatisch
|
||||
* anhand von language in config.yml:
|
||||
*
|
||||
* @param uuid UUID des Empfängers
|
||||
* @param name Spielername (für BungeeCord-Lookup)
|
||||
* @param message Bereits color-übersetzter Text
|
||||
* language: de → /ticket erstellen
|
||||
* language: en → /ticket create
|
||||
* language: both → /ticket create (erstellen)
|
||||
*
|
||||
* Hier muss kein manueller Sprachcode gelesen werden.
|
||||
*/
|
||||
public void sendHelpMessage(Player player) {
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(plugin.lang().get("help.header"));
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
player.sendMessage(plugin.lang().get("help.create"));
|
||||
player.sendMessage(plugin.lang().get("help.list"));
|
||||
player.sendMessage(plugin.lang().get("help.comment"));
|
||||
|
||||
if (plugin.getConfig().getBoolean("rating-enabled", true))
|
||||
player.sendMessage(plugin.lang().get("help.rate"));
|
||||
|
||||
if (player.hasPermission("ticket.support") || player.hasPermission("ticket.admin")) {
|
||||
player.sendMessage(plugin.lang().get("help.claim"));
|
||||
player.sendMessage(plugin.lang().get("help.close"));
|
||||
}
|
||||
if (player.hasPermission("ticket.admin")) {
|
||||
player.sendMessage(plugin.lang().get("help.forward"));
|
||||
player.sendMessage(plugin.lang().get("help.blacklist"));
|
||||
player.sendMessage(plugin.lang().get("help.reload"));
|
||||
player.sendMessage(plugin.lang().get("help.stats"));
|
||||
}
|
||||
player.sendMessage(plugin.lang().get("general.separator"));
|
||||
|
||||
if (player.hasPermission("ticket.admin") && plugin.isBungeeCordEnabled())
|
||||
player.sendMessage(plugin.lang().format("help.bungee-status", "{server}", plugin.getServerName()));
|
||||
}
|
||||
|
||||
// ── Interne Hilfsmethoden ─────────────────────────────────────────────
|
||||
|
||||
/**
|
||||
* Zustellung einer Nachricht an einen Spieler:
|
||||
* 1. Lokal online → direkt senden
|
||||
* 2. BungeeCord → via Plugin-Messaging
|
||||
* 3. Offline → in Pending-DB speichern
|
||||
*/
|
||||
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.
|
||||
* Speichert eine Schließ-Benachrichtigung für einen Offline-Spieler
|
||||
* in der Pending-DB, damit sie beim nächsten Login zugestellt wird.
|
||||
*/
|
||||
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" : "");
|
||||
String commentPart = comment.isEmpty()
|
||||
? ""
|
||||
: plugin.lang().format("ticket.pending-closed-comment", "{comment}", comment);
|
||||
String ratingPart = plugin.getConfig().getBoolean("rating-enabled", true)
|
||||
? plugin.lang().format("ticket.pending-closed-rating", "{id}", String.valueOf(ticket.getId()))
|
||||
: "";
|
||||
String pendingMsg = plugin.lang().format("ticket.pending-closed",
|
||||
"{id}", String.valueOf(ticket.getId()),
|
||||
"{comment}", commentPart,
|
||||
"{rating}", ratingPart);
|
||||
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) {
|
||||
@@ -337,40 +317,4 @@ public class TicketManager {
|
||||
}
|
||||
return "Support";
|
||||
}
|
||||
|
||||
public boolean hasReachedTicketLimit(UUID uuid) {
|
||||
int max = plugin.getConfig().getInt("max-open-tickets-per-player", 2);
|
||||
if (max <= 0) return false;
|
||||
return plugin.getDatabaseManager().countOpenTicketsByPlayer(uuid) >= max;
|
||||
}
|
||||
|
||||
public void sendHelpMessage(Player player) {
|
||||
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 [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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user