M_Viper/NexusLobby
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Update from Git Manager GUI

Browse Source
This commit is contained in:
M_Viper
2026-02-28 13:37:23 +01:00
parent 7fe5bd62c7
commit 0dddc0dfb5
13 changed files with 813 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/de/nexuslobby/commands/LobbyTabCompleter.java
View File

@@ -19,7 +19,7 @@ public class LobbyTabCompleter implements TabCompleter {
private final HologramModule hologramModule; private final HologramModule hologramModule;
public LobbyTabCompleter(PortalManager portalManager, HologramModule hologramModule) { public LobbyTabCompleter(PortalManager portalManager, HologramModule hologramModule) {
this.portalManager = portalManager; this.portalManager = portalManager;
this.hologramModule = hologramModule; this.hologramModule = hologramModule;
} }
@@ -28,14 +28,14 @@ public class LobbyTabCompleter implements TabCompleter {
List<String> suggestions = new ArrayList<>(); List<String> suggestions = new ArrayList<>();
String cmdName = command.getName().toLowerCase(); String cmdName = command.getName().toLowerCase();
// ── NexusLobby Hauptbefehl (/nexus oder /nexuslobby) ───────────────── // ── NexusLobby Hauptbefehl (/nexus oder /nexuslobby) ──────────────────
if (cmdName.equals("nexuslobby") || cmdName.equals("nexus")) { if (cmdName.equals("nexuslobby") || cmdName.equals("nexus")) {
// /nexuslobby <?> // /nexuslobby <?>
if (args.length == 1) { if (args.length == 1) {
if (sender.hasPermission("nexuslobby.admin")) { if (sender.hasPermission("nexuslobby.admin")) {
suggestions.addAll(Arrays.asList( suggestions.addAll(Arrays.asList(
"reload", "setspawn", "silentjoin", "parkour", "ball" "reload", "setspawn", "silentjoin", "parkour", "ball", "cleanbubbles", "gadgetshield"
)); ));
} }
suggestions.add("sb"); suggestions.add("sb");
@@ -49,9 +49,17 @@ public class LobbyTabCompleter implements TabCompleter {
suggestions.addAll(Arrays.asList("admin", "spieler")); suggestions.addAll(Arrays.asList("admin", "spieler"));
} }
case "silentjoin" -> suggestions.addAll(Arrays.asList("on", "off")); case "silentjoin" -> suggestions.addAll(Arrays.asList("on", "off"));
case "parkour" -> suggestions.addAll(Arrays.asList( case "parkour" -> {
"setstart", "setfinish", "setcheckpoint", "reset", "clear", "removeall" if (sender.hasPermission("nexuslobby.admin")) {
)); suggestions.addAll(Arrays.asList(
"setstart", "setfinish", "setcheckpoint",
"reset", "clear", "removeall", "info"
));
} else {
// Normale Spieler können nur ihren Run abbrechen
suggestions.add("reset");
}
}
case "ball" -> { case "ball" -> {
if (sender.hasPermission("nexuslobby.admin")) { if (sender.hasPermission("nexuslobby.admin")) {
suggestions.addAll(Arrays.asList( suggestions.addAll(Arrays.asList(
@@ -64,17 +72,20 @@ public class LobbyTabCompleter implements TabCompleter {
// /nexuslobby <sub> <sub2> <?> // /nexuslobby <sub> <sub2> <?>
} else if (args.length == 3) { } else if (args.length == 3) {
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
// Für setstart / setfinish / setcheckpoint → Strecken-Nummer 1 oder 2
case "parkour" -> { case "parkour" -> {
if (args[1].equalsIgnoreCase("setcheckpoint")) String parkSub = args[1].toLowerCase();
suggestions.addAll(Arrays.asList("1","2","3","4","5","6","7","8","9")); if (parkSub.equals("setstart")
|| parkSub.equals("setfinish")
|| parkSub.equals("setcheckpoint")) {
suggestions.addAll(Arrays.asList("1", "2"));
}
} }
case "ball" -> { case "ball" -> {
switch (args[1].toLowerCase()) { switch (args[1].toLowerCase()) {
// /nexuslobby ball goal <?> case "goal" -> suggestions.addAll(Arrays.asList(
case "goal" -> suggestions.addAll(Arrays.asList(
"pos1", "pos2", "save", "delete", "list", "show", "debug" "pos1", "pos2", "save", "delete", "list", "show", "debug"
)); ));
// /nexuslobby ball score <?>
case "score" -> suggestions.add("reset"); case "score" -> suggestions.add("reset");
} }
} }
@@ -84,19 +95,16 @@ public class LobbyTabCompleter implements TabCompleter {
} else if (args.length == 4) { } else if (args.length == 4) {
if (args[0].equalsIgnoreCase("ball") && args[1].equalsIgnoreCase("goal")) { if (args[0].equalsIgnoreCase("ball") && args[1].equalsIgnoreCase("goal")) {
switch (args[2].toLowerCase()) { switch (args[2].toLowerCase()) {
// /nexuslobby ball goal save <Name> <?> → Tor-Name (Freitext)
case "save" -> suggestions.add("<TorName>"); case "save" -> suggestions.add("<TorName>");
// /nexuslobby ball goal delete <Name>
case "delete" -> { case "delete" -> {
// Tor-Namen aus Config laden und vorschlagen
var section = NexusLobby.getInstance().getConfig() var section = NexusLobby.getInstance().getConfig()
.getConfigurationSection("ball.goals"); .getConfigurationSection("ball.goals");
if (section != null) suggestions.addAll(section.getKeys(false)); if (section != null) suggestions.addAll(section.getKeys(false));
} }
} }
} }
// /nexuslobby ball goal save <Name> <?> → Team 1 oder 2 // /nexuslobby ball goal save <Name> <?> → Team 1 oder 2
} else if (args.length == 5) { } else if (args.length == 5) {
if (args[0].equalsIgnoreCase("ball") if (args[0].equalsIgnoreCase("ball")
&& args[1].equalsIgnoreCase("goal") && args[1].equalsIgnoreCase("goal")
@@ -111,15 +119,13 @@ public class LobbyTabCompleter implements TabCompleter {
if (args.length == 1) { if (args.length == 1) {
suggestions.addAll(Arrays.asList("create", "delete")); suggestions.addAll(Arrays.asList("create", "delete"));
} else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) {
if (hologramModule != null) if (hologramModule != null) suggestions.addAll(hologramModule.getHologramIds());
suggestions.addAll(hologramModule.getHologramIds());
} }
} }
// ── Wartungsmodus ───────────────────────────────────────────────────── // ── Wartungsmodus ─────────────────────────────────────────────────────
else if (cmdName.equals("maintenance")) { else if (cmdName.equals("maintenance")) {
if (args.length == 1) if (args.length == 1) suggestions.addAll(Arrays.asList("on", "off"));
suggestions.addAll(Arrays.asList("on", "off"));
} }
// ── Portalsystem ────────────────────────────────────────────────────── // ── Portalsystem ──────────────────────────────────────────────────────
@@ -127,8 +133,7 @@ public class LobbyTabCompleter implements TabCompleter {
if (args.length == 1) { if (args.length == 1) {
suggestions.addAll(Arrays.asList("create", "delete", "list")); suggestions.addAll(Arrays.asList("create", "delete", "list"));
} else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) {
if (portalManager != null) if (portalManager != null) suggestions.addAll(portalManager.getPortalNames());
suggestions.addAll(portalManager.getPortalNames());
} }
} }
@@ -143,8 +148,7 @@ public class LobbyTabCompleter implements TabCompleter {
// ── Intro System ────────────────────────────────────────────────────── // ── Intro System ──────────────────────────────────────────────────────
else if (cmdName.equals("intro")) { else if (cmdName.equals("intro")) {
if (args.length == 1) if (args.length == 1) suggestions.addAll(Arrays.asList("add", "clear", "start"));
suggestions.addAll(Arrays.asList("add", "clear", "start"));
} }
// ── WorldBorder ─────────────────────────────────────────────────────── // ── WorldBorder ───────────────────────────────────────────────────────
@@ -160,7 +164,7 @@ public class LobbyTabCompleter implements TabCompleter {
else if (cmdName.equals("nexuscmd") || cmdName.equals("ncmd") else if (cmdName.equals("nexuscmd") || cmdName.equals("ncmd")
|| cmdName.equals("ascmd") || cmdName.equals("conv")) { || cmdName.equals("ascmd") || cmdName.equals("conv")) {
if (args.length == 1) { if (args.length == 1) {
suggestions.addAll(Arrays.asList("add", "remove", "list", "name", "lookat", "conv", "say")); suggestions.addAll(Arrays.asList("add", "remove", "list", "name", "lookat", "conv", "say", "clearbubbles"));
} else if (args.length == 2) { } else if (args.length == 2) {
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
case "add" -> suggestions.addAll(Arrays.asList("0","1","2","3","4","5","6","7","8","9")); case "add" -> suggestions.addAll(Arrays.asList("0","1","2","3","4","5","6","7","8","9"));
@@ -201,7 +205,6 @@ public class LobbyTabCompleter implements TabCompleter {
} }
} }
// Filtert die Liste basierend auf der bisherigen Eingabe
return suggestions.stream() return suggestions.stream()
.filter(s -> s.toLowerCase().startsWith(args[args.length - 1].toLowerCase())) .filter(s -> s.toLowerCase().startsWith(args[args.length - 1].toLowerCase()))
.collect(Collectors.toList()); .collect(Collectors.toList());

193
src/main/java/de/nexuslobby/commands/NexusLobbyCommand.java
View File

@@ -22,7 +22,7 @@ public class NexusLobbyCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player player)) { if (!(sender instanceof Player player)) {
sender.sendMessage(de.nexuslobby.utils.LangManager.get("only_player")); sender.sendMessage(de.nexuslobby.utils.LangManager.get("only_player"));
return true; return true;
@@ -34,19 +34,18 @@ public class NexusLobbyCommand implements CommandExecutor {
// --- DIREKTE KURZ-BEFEHLE --- // --- DIREKTE KURZ-BEFEHLE ---
if (cmdName.equalsIgnoreCase("setstart")) { if (cmdName.equalsIgnoreCase("setstart")) {
if (!player.hasPermission("nexuslobby.admin")) return noPerm(player); if (!player.hasPermission("nexuslobby.admin")) return noPerm(player);
handleSetStart(player, pm); // Standard: Strecke 1 setzen
pm.setStartLocation(player, 1);
return true; return true;
} }
if (cmdName.equalsIgnoreCase("setcheckpoint")) { if (cmdName.equalsIgnoreCase("setcheckpoint")) {
if (!player.hasPermission("nexuslobby.admin")) return noPerm(player); if (!player.hasPermission("nexuslobby.admin")) return noPerm(player);
pm.setCheckpoint(player, player.getLocation()); pm.setCheckpoint(player, 1);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_checkpoint_set"));
return true; return true;
} }
if (cmdName.equalsIgnoreCase("setfinish")) { if (cmdName.equalsIgnoreCase("setfinish")) {
if (!player.hasPermission("nexuslobby.admin")) return noPerm(player); if (!player.hasPermission("nexuslobby.admin")) return noPerm(player);
pm.setFinishLocation(player.getLocation()); pm.setFinishLocation(player, 1);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_finish_set"));
return true; return true;
} }
@@ -75,6 +74,7 @@ public class NexusLobbyCommand implements CommandExecutor {
} }
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
case "reload": case "reload":
if (!player.hasPermission("nexuslobby.admin")) return noPerm(player); if (!player.hasPermission("nexuslobby.admin")) return noPerm(player);
NexusLobby.getInstance().reloadPlugin(); NexusLobby.getInstance().reloadPlugin();
@@ -83,7 +83,6 @@ public class NexusLobbyCommand implements CommandExecutor {
break; break;
case "cleanbubbles": case "cleanbubbles":
// Bereinigt alle hängengebliebenen Sprechblasen-ArmorStands im gesamten Server.
if (!player.hasPermission("nexuslobby.admin")) return noPerm(player); if (!player.hasPermission("nexuslobby.admin")) return noPerm(player);
handleCleanBubbles(player); handleCleanBubbles(player);
break; break;
@@ -96,7 +95,7 @@ public class NexusLobbyCommand implements CommandExecutor {
config.set("spawn.x", loc.getX()); config.set("spawn.x", loc.getX());
config.set("spawn.y", loc.getY()); config.set("spawn.y", loc.getY());
config.set("spawn.z", loc.getZ()); config.set("spawn.z", loc.getZ());
config.set("spawn.yaw", (double) loc.getYaw()); config.set("spawn.yaw", (double) loc.getYaw());
config.set("spawn.pitch", (double) loc.getPitch()); config.set("spawn.pitch", (double) loc.getPitch());
NexusLobby.getInstance().saveConfig(); NexusLobby.getInstance().saveConfig();
player.sendMessage(de.nexuslobby.utils.LangManager.get("spawn_set")); player.sendMessage(de.nexuslobby.utils.LangManager.get("spawn_set"));
@@ -117,7 +116,12 @@ public class NexusLobbyCommand implements CommandExecutor {
handleScoreboard(player, args); handleScoreboard(player, args);
break; break;
case "ball": // NEU: Weiterleitung an das SoccerModule case "gadgetshield":
if (!player.hasPermission("nexuslobby.admin") && !player.isOp()) return noPerm(player);
de.nexuslobby.modules.gadgets.GadgetShield.toggle(player);
break;
case "ball":
if (NexusLobby.getInstance().getSoccerModule() != null) { if (NexusLobby.getInstance().getSoccerModule() != null) {
return NexusLobby.getInstance().getSoccerModule().onCommand(sender, command, label, args); return NexusLobby.getInstance().getSoccerModule().onCommand(sender, command, label, args);
} }
@@ -125,42 +129,7 @@ public class NexusLobbyCommand implements CommandExecutor {
break; break;
case "parkour": case "parkour":
if (args.length < 2) { handleParkour(player, args, pm);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_usage"));
return true;
}
String sub = args[1].toLowerCase();
if (!player.hasPermission("nexuslobby.admin") && !sub.equals("reset")) return noPerm(player);
switch (sub) {
case "setstart":
handleSetStart(player, pm);
break;
case "setfinish":
pm.setFinishLocation(player.getLocation());
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_finish_set"));
break;
case "setcheckpoint":
pm.setCheckpoint(player, player.getLocation());
break;
case "reset":
pm.stopParkour(player);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_run_aborted"));
break;
case "clear":
pm.clearStats();
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_besttimes_cleared"));
break;
case "removeall":
pm.removeAllPoints();
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_track_removed"));
player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
break;
default:
player.sendMessage(de.nexuslobby.utils.LangManager.get("unknown_subcommand"));
break;
}
break; break;
default: default:
@@ -171,13 +140,109 @@ public class NexusLobbyCommand implements CommandExecutor {
return true; return true;
} }
private void handleSetStart(Player player, ParkourManager pm) { // ─────────────────────────────────────────────────────────────────────────
// NPC Erkennung (Blickrichtung auf ArmorStand) // Parkour-Handler
// ─────────────────────────────────────────────────────────────────────────
private void handleParkour(Player player, String[] args, ParkourManager pm) {
if (args.length < 2) {
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_usage"));
// Strecken-Info ausgeben
player.sendMessage(pm.getTrackInfo());
return;
}
String sub = args[1].toLowerCase();
// Nur "reset" kann auch ohne Admin-Recht ausgeführt werden (eigenen Lauf abbrechen)
if (!player.hasPermission("nexuslobby.admin") && !sub.equals("reset")) {
noPerm(player);
return;
}
switch (sub) {
// /nexus parkour setstart <1|2>
case "setstart": {
int track = parseTrack(args, 2, player);
if (track == -1) return;
handleSetStart(player, pm, track);
break;
}
// /nexus parkour setfinish <1|2>
case "setfinish": {
int track = parseTrack(args, 2, player);
if (track == -1) return;
pm.setFinishLocation(player, track);
break;
}
// /nexus parkour setcheckpoint <1|2>
case "setcheckpoint": {
int track = parseTrack(args, 2, player);
if (track == -1) return;
pm.setCheckpoint(player, track);
break;
}
case "reset":
pm.stopParkour(player);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_run_aborted"));
break;
case "clear":
pm.clearStats();
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_besttimes_cleared"));
break;
case "removeall":
pm.removeAllPoints();
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_track_removed"));
player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
break;
case "info":
player.sendMessage(pm.getTrackInfo());
break;
default:
player.sendMessage(de.nexuslobby.utils.LangManager.get("unknown_subcommand"));
break;
}
}
/**
* Liest die Track-Nummer aus args[index].
* Gibt 1 oder 2 zurück; bei Fehler sendet er eine Nachricht und gibt -1 zurück.
*/
private int parseTrack(String[] args, int index, Player player) {
if (args.length <= index) {
player.sendMessage("§8[§6Nexus§8] §cBitte gib eine Strecken-Nummer an: §e1 §7oder §e2");
return -1;
}
int track;
try {
track = Integer.parseInt(args[index]);
} catch (NumberFormatException e) {
player.sendMessage("§8[§6Nexus§8] §cUngültige Strecken-Nummer. Bitte §e1 §7oder §e2 §7verwenden.");
return -1;
}
if (track < 1 || track > 2) {
player.sendMessage("§8[§6Nexus§8] §cNur Strecke §e1 §7oder §e2 §7sind erlaubt.");
return -1;
}
return track;
}
private void handleSetStart(Player player, ParkourManager pm, int track) {
// NPC-Erkennung: schaut der Spieler auf einen ArmorStand?
ArmorStand targetAs = null; ArmorStand targetAs = null;
List<Entity> nearby = player.getNearbyEntities(4, 4, 4); List<Entity> nearby = player.getNearbyEntities(4, 4, 4);
for (Entity e : nearby) { for (Entity e : nearby) {
if (e instanceof ArmorStand as) { if (e instanceof ArmorStand as) {
double dot = player.getLocation().getDirection().dot(as.getLocation().toVector().subtract(player.getLocation().toVector()).normalize()); double dot = player.getLocation().getDirection()
.dot(as.getLocation().toVector().subtract(player.getLocation().toVector()).normalize());
if (dot > 0.9) { if (dot > 0.9) {
targetAs = as; targetAs = as;
break; break;
@@ -189,13 +254,16 @@ public class NexusLobbyCommand implements CommandExecutor {
targetAs.addScoreboardTag("parkour_npc"); targetAs.addScoreboardTag("parkour_npc");
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_npc_marked")); player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_npc_marked"));
} }
pm.setStartLocation(player.getLocation()); pm.setStartLocation(player, track);
player.sendMessage(de.nexuslobby.utils.LangManager.get("parkour_start_set"));
} }
// ─────────────────────────────────────────────────────────────────────────
// Sonstige Handler
// ─────────────────────────────────────────────────────────────────────────
private void handleCleanBubbles(Player player) { private void handleCleanBubbles(Player player) {
de.nexuslobby.modules.armorstandtools.ConversationManager cm = de.nexuslobby.modules.armorstandtools.ConversationManager cm =
NexusLobby.getInstance().getConversationManager(); NexusLobby.getInstance().getConversationManager();
if (cm == null) { if (cm == null) {
player.sendMessage("§8[§6Nexus§8] §cConversationManager ist nicht aktiv."); player.sendMessage("§8[§6Nexus§8] §cConversationManager ist nicht aktiv.");
return; return;
@@ -220,18 +288,17 @@ public class NexusLobbyCommand implements CommandExecutor {
player.sendMessage(de.nexuslobby.utils.LangManager.get("scoreboard_module_disabled")); player.sendMessage(de.nexuslobby.utils.LangManager.get("scoreboard_module_disabled"));
return; return;
} }
String sub = args[1].toLowerCase(); switch (args[1].toLowerCase()) {
switch (sub) { case "on" -> sbModule.setVisibility(player, true);
case "on": sbModule.setVisibility(player, true); break; case "off" -> sbModule.setVisibility(player, false);
case "off": sbModule.setVisibility(player, false); break; case "admin" -> {
case "admin":
if (player.hasPermission("nexuslobby.scoreboard.admin")) sbModule.setAdminMode(player, true); if (player.hasPermission("nexuslobby.scoreboard.admin")) sbModule.setAdminMode(player, true);
else player.sendMessage(de.nexuslobby.utils.LangManager.get("no_permission")); else player.sendMessage(de.nexuslobby.utils.LangManager.get("no_permission"));
break; }
case "spieler": case "spieler" -> {
if (player.hasPermission("nexuslobby.scoreboard.admin")) sbModule.setAdminMode(player, false); if (player.hasPermission("nexuslobby.scoreboard.admin")) sbModule.setAdminMode(player, false);
else player.sendMessage(de.nexuslobby.utils.LangManager.get("no_permission")); else player.sendMessage(de.nexuslobby.utils.LangManager.get("no_permission"));
break; }
} }
} }
@@ -248,13 +315,19 @@ public class NexusLobbyCommand implements CommandExecutor {
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_title")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_title"));
player.sendMessage(""); player.sendMessage("");
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_spawn")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_spawn"));
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_parkour")); player.sendMessage("§e/nexus parkour setstart <1|2> §7- Start setzen");
player.sendMessage("§e/nexus parkour setcheckpoint <1|2> §7- Checkpoint setzen");
player.sendMessage("§e/nexus parkour setfinish <1|2> §7- Ziel setzen");
player.sendMessage("§e/nexus parkour reset §7- Eigenen Run abbrechen");
player.sendMessage("§e/nexus parkour clear §7- §cTop-10 Liste löschen");
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_removeall")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_removeall"));
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_ball")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_ball"));
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_setspawn")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_setspawn"));
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_scoreboard")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_scoreboard"));
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_reload")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_reload"));
player.sendMessage("§e/nexuslobby cleanbubbles §7- Hängende Sprechblasen entfernen"); player.sendMessage("§e/nexuslobby cleanbubbles §7- Hängende Sprechblasen entfernen");
if (player.hasPermission("nexuslobby.admin") || player.isOp())
player.sendMessage("§e/nexuslobby gadgetshield §7- Gadget-Schutz für Admins ein/ausschalten");
player.sendMessage(de.nexuslobby.utils.LangManager.get("info_footer")); player.sendMessage(de.nexuslobby.utils.LangManager.get("info_footer"));
} }
} }

95
src/main/java/de/nexuslobby/modules/ScoreboardModule.java
View File

@@ -10,8 +10,10 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scoreboard.*; import org.bukkit.scoreboard.*;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@@ -23,10 +25,12 @@ public class ScoreboardModule implements Module, Listener {
private final NexusLobby plugin = NexusLobby.getInstance(); private final NexusLobby plugin = NexusLobby.getInstance();
private boolean placeholderAPIEnabled; private boolean placeholderAPIEnabled;
// Speicher für die aktuellen Spieler-Einstellungen (bis zum Restart/Reload)
private final Set<UUID> hiddenPlayers = new HashSet<>(); private final Set<UUID> hiddenPlayers = new HashSet<>();
private final Set<UUID> adminModePlayers = new HashSet<>(); private final Set<UUID> adminModePlayers = new HashSet<>();
// WICHTIG: Hier speichern wir die Scoreboards pro Spieler, um sie wiederzuverwenden
private final Map<UUID, Scoreboard> playerBoards = new HashMap<>();
@Override @Override
public String getName() { public String getName() {
@@ -38,7 +42,6 @@ public class ScoreboardModule implements Module, Listener {
FileConfiguration vConfig = plugin.getVisualsConfig(); FileConfiguration vConfig = plugin.getVisualsConfig();
if (!vConfig.getBoolean("scoreboard.enabled", true)) return; if (!vConfig.getBoolean("scoreboard.enabled", true)) return;
// Listener registrieren
Bukkit.getPluginManager().registerEvents(this, plugin); Bukkit.getPluginManager().registerEvents(this, plugin);
placeholderAPIEnabled = Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null; placeholderAPIEnabled = Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
@@ -53,9 +56,6 @@ public class ScoreboardModule implements Module, Listener {
}.runTaskTimer(plugin, 0L, vConfig.getLong("scoreboard.update_ticks", 20L)); }.runTaskTimer(plugin, 0L, vConfig.getLong("scoreboard.update_ticks", 20L));
} }
/**
* Setzt Scoreboard-Status beim Join gemäß config.yml (scoreboard-default-visible)
*/
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
@@ -63,13 +63,19 @@ public class ScoreboardModule implements Module, Listener {
if (!defaultVisible) { if (!defaultVisible) {
hiddenPlayers.add(player.getUniqueId()); hiddenPlayers.add(player.getUniqueId());
player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
// Sicherstellen, dass kein altes Board gespeichert ist
playerBoards.remove(player.getUniqueId());
} else { } else {
hiddenPlayers.remove(player.getUniqueId()); hiddenPlayers.remove(player.getUniqueId());
// Beim Einloggen initialisieren, damit es nicht beim ersten Tick flackert
if (!playerBoards.containsKey(player.getUniqueId())) {
playerBoards.put(player.getUniqueId(), Bukkit.getScoreboardManager().getNewScoreboard());
player.setScoreboard(playerBoards.get(player.getUniqueId()));
}
} }
} }
private void updateSidebar(Player player) { private void updateSidebar(Player player) {
// 1. Prüfen, ob der Spieler das Scoreboard ausgeblendet hat
if (hiddenPlayers.contains(player.getUniqueId())) { if (hiddenPlayers.contains(player.getUniqueId())) {
if (player.getScoreboard() != Bukkit.getScoreboardManager().getMainScoreboard()) { if (player.getScoreboard() != Bukkit.getScoreboardManager().getMainScoreboard()) {
player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
@@ -78,49 +84,50 @@ public class ScoreboardModule implements Module, Listener {
} }
FileConfiguration vConfig = plugin.getVisualsConfig(); FileConfiguration vConfig = plugin.getVisualsConfig();
Scoreboard board = player.getScoreboard();
String configPath = (adminModePlayers.contains(player.getUniqueId())
&& player.hasPermission("nexuslobby.scoreboard.admin"))
? "scoreboard.owner"
: "scoreboard.default";
String title = vConfig.getString(configPath + ".title", "&6&lNexusLobby");
List<String> lines = vConfig.getStringList(configPath + ".lines");
// ---------------------------------------------------------
// FIX: Statt getNewScoreboard() holen wir das gespeicherte Board
// oder erstellen es genau einmal beim ersten Mal.
// ---------------------------------------------------------
Scoreboard board = playerBoards.get(player.getUniqueId());
if (board == Bukkit.getScoreboardManager().getMainScoreboard()) { if (board == null) {
board = Bukkit.getScoreboardManager().getNewScoreboard(); board = Bukkit.getScoreboardManager().getNewScoreboard();
playerBoards.put(player.getUniqueId(), board);
player.setScoreboard(board); player.setScoreboard(board);
} }
Objective obj = board.getObjective("lobby"); // Altes Objective entfernen, damit wir die Zeilen aktualisieren können
if (obj == null) { // Dasboard selbst bleibt bestehen (wichtig für Tablist-Teams!)
obj = board.registerNewObjective("lobby", "dummy", "title"); Objective oldObj = board.getObjective("lobby");
obj.setDisplaySlot(DisplaySlot.SIDEBAR); if (oldObj != null) {
oldObj.unregister();
} }
// 2. Pfad-Logik basierend auf dem Modus (/nexus sb admin/spieler) Objective obj = board.registerNewObjective("lobby", "dummy",
String configPath = "scoreboard.default"; translate(player, title));
obj.setDisplaySlot(DisplaySlot.SIDEBAR);
// Wenn im Admin-Modus UND Rechte vorhanden -> owner Sektion
if (adminModePlayers.contains(player.getUniqueId()) && player.hasPermission("nexuslobby.scoreboard.admin")) {
configPath = "scoreboard.owner";
} else {
// Standardmäßig default nutzen
configPath = "scoreboard.default";
}
String title = vConfig.getString(configPath + ".title", "&6&lNexusLobby");
obj.setDisplayName(translate(player, title));
List<String> lines = vConfig.getStringList(configPath + ".lines");
// Scores zurücksetzen um Duplikate zu vermeiden
board.getEntries().forEach(board::resetScores);
for (int i = 0; i < lines.size(); i++) { for (int i = 0; i < lines.size(); i++) {
String line = translate(player, lines.get(i)); String line = translate(player, lines.get(i));
// Verhindert das Verschwinden leerer Zeilen if (line.isEmpty() || line.isBlank()) {
if (line.isEmpty() || line.trim().isEmpty()) { line = ChatColor.values()[i % ChatColor.values().length].toString();
line = "" + ChatColor.values()[i] + ChatColor.RESET;
} }
Score score = obj.getScore(line); obj.getScore(line).setScore(lines.size() - i);
score.setScore(lines.size() - i);
} }
// Kein player.setScoreboard(board) nötig, da wir das Objekt 'board'
// direkt verändert haben, das der Spieler bereits hat.
} }
// --- Methoden für den /nexus sb Befehl --- // --- Methoden für den /nexus sb Befehl ---
@@ -128,7 +135,13 @@ public class ScoreboardModule implements Module, Listener {
public void setVisibility(Player player, boolean visible) { public void setVisibility(Player player, boolean visible) {
if (visible) { if (visible) {
hiddenPlayers.remove(player.getUniqueId()); hiddenPlayers.remove(player.getUniqueId());
// Wenn wir es wieder einschalten, ggf. Board zurücksetzen oder neu holen
if (!playerBoards.containsKey(player.getUniqueId())) {
playerBoards.put(player.getUniqueId(), Bukkit.getScoreboardManager().getNewScoreboard());
}
player.setScoreboard(playerBoards.get(player.getUniqueId()));
player.sendMessage("§7[§6Nexus§7] §aScoreboard eingeschaltet."); player.sendMessage("§7[§6Nexus§7] §aScoreboard eingeschaltet.");
updateSidebar(player); // Sofort aktualisieren
} else { } else {
hiddenPlayers.add(player.getUniqueId()); hiddenPlayers.add(player.getUniqueId());
player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
@@ -144,7 +157,6 @@ public class ScoreboardModule implements Module, Listener {
adminModePlayers.remove(player.getUniqueId()); adminModePlayers.remove(player.getUniqueId());
player.sendMessage("§7[§6Nexus§7] §eModus: §6Spieler-Scoreboard §7(Default-Sektion)"); player.sendMessage("§7[§6Nexus§7] §eModus: §6Spieler-Scoreboard §7(Default-Sektion)");
} }
// Sofortiges Update erzwingen
updateSidebar(player); updateSidebar(player);
} }
@@ -153,9 +165,7 @@ public class ScoreboardModule implements Module, Listener {
if (placeholderAPIEnabled) { if (placeholderAPIEnabled) {
try { try {
translated = PlaceholderAPI.setPlaceholders(player, text); translated = PlaceholderAPI.setPlaceholders(player, text);
} catch (NoClassDefFoundError ignored) { } catch (NoClassDefFoundError ignored) {}
// PlaceholderAPI fehlt zur Laufzeit
}
} }
return ChatColor.translateAlternateColorCodes('&', translated); return ChatColor.translateAlternateColorCodes('&', translated);
} }
@@ -168,5 +178,6 @@ public class ScoreboardModule implements Module, Listener {
} }
hiddenPlayers.clear(); hiddenPlayers.clear();
adminModePlayers.clear(); adminModePlayers.clear();
playerBoards.clear(); // Speicher freigeben
} }
} }

13
src/main/java/de/nexuslobby/modules/armorstandtools/ArmorStandCmdExecutor.java
View File

@@ -238,6 +238,18 @@ public class ArmorStandCmdExecutor implements CommandExecutor {
return true; return true;
} }
if (args[0].equalsIgnoreCase("clearbubbles")) {
ConversationManager cm = NexusLobby.getInstance().getConversationManager();
if (cm == null) {
p.sendMessage(prefix + "§cConversationManager ist nicht aktiv.");
return true;
}
cm.clearHangingBubbles();
p.sendMessage(prefix + "§aAlle hängenden Sprechblasen wurden entfernt.");
p.playSound(p.getLocation(), org.bukkit.Sound.BLOCK_NOTE_BLOCK_PLING, 1f, 2f);
return true;
}
return sendHelp(p); return sendHelp(p);
} }
@@ -284,6 +296,7 @@ public class ArmorStandCmdExecutor implements CommandExecutor {
p.sendMessage("§e/nexuscmd conv §7- Gesprächs-Menü"); p.sendMessage("§e/nexuscmd conv §7- Gesprächs-Menü");
p.sendMessage("§e/nexuscmd list §7- Zeigt alle Tags"); p.sendMessage("§e/nexuscmd list §7- Zeigt alle Tags");
p.sendMessage("§e/nexuscmd remove §7- Löscht Befehle"); p.sendMessage("§e/nexuscmd remove §7- Löscht Befehle");
p.sendMessage("§e/nexuscmd clearbubbles §7- Entfernt hängende Sprechblasen");
return true; return true;
} }
} }

2
src/main/java/de/nexuslobby/modules/gadgets/Balloon.java
View File

@@ -28,6 +28,8 @@ public class Balloon {
this.balloonEntity.setInvulnerable(true); this.balloonEntity.setInvulnerable(true);
this.balloonEntity.setGravity(false); this.balloonEntity.setGravity(false);
this.balloonEntity.setLeashHolder(player); this.balloonEntity.setLeashHolder(player);
// Tag damit GadgetModule Rechtsklicks auf den Ballon abfangen kann
this.balloonEntity.addScoreboardTag("nexus_balloon");
// Der ArmorStand, der den farbigen Block trägt // Der ArmorStand, der den farbigen Block trägt
this.headStand = (ArmorStand) loc.getWorld().spawnEntity(loc, EntityType.ARMOR_STAND); this.headStand = (ArmorStand) loc.getWorld().spawnEntity(loc, EntityType.ARMOR_STAND);

49
src/main/java/de/nexuslobby/modules/gadgets/FreezeRay.java
View File

@@ -14,7 +14,6 @@ import java.util.UUID;
public class FreezeRay { public class FreezeRay {
// FIX: private statt public – Zugriff nur über isFrozen() und unfreeze()
private static final Set<UUID> frozenPlayers = new HashSet<>(); private static final Set<UUID> frozenPlayers = new HashSet<>();
public static boolean isFrozen(UUID uuid) { return frozenPlayers.contains(uuid); } public static boolean isFrozen(UUID uuid) { return frozenPlayers.contains(uuid); }
@@ -26,25 +25,28 @@ public class FreezeRay {
Location start = shooter.getEyeLocation(); Location start = shooter.getEyeLocation();
Vector direction = start.getDirection(); Vector direction = start.getDirection();
// Sound beim Schießen
shooter.getWorld().playSound(start, Sound.ENTITY_SNOW_GOLEM_SHOOT, 1.0f, 1.5f); shooter.getWorld().playSound(start, Sound.ENTITY_SNOW_GOLEM_SHOOT, 1.0f, 1.5f);
// Wir prüfen in 0.3er Schritten bis zu 15 Blöcke weit
for (double d = 0; d < 15; d += 0.3) { for (double d = 0; d < 15; d += 0.3) {
Location point = start.clone().add(direction.clone().multiply(d)); Location point = start.clone().add(direction.clone().multiply(d));
// Partikel-Strahl sichtbar machen
point.getWorld().spawnParticle(Particle.SNOWFLAKE, point, 1, 0, 0, 0, 0); point.getWorld().spawnParticle(Particle.SNOWFLAKE, point, 1, 0, 0, 0, 0);
// Prüfung auf Spieler im Umkreis von 0.8 Blöcken (etwas großzügiger)
for (Entity entity : point.getWorld().getNearbyEntities(point, 0.8, 0.8, 0.8)) { for (Entity entity : point.getWorld().getNearbyEntities(point, 0.8, 0.8, 0.8)) {
if (entity instanceof Player target && target != shooter) { if (entity instanceof Player target && target != shooter) {
// Schutz: Parkour-Spieler und Admins mit aktivem Gadget-Schutz
if (GadgetShield.isProtected(target)) {
String reason = GadgetShield.isAdminShielded(target)
? "Dieser Spieler hat Gadget-Schutz aktiviert."
: "Dieser Spieler ist gerade im Parkour.";
shooter.sendMessage("§8[§6Nexus§8] §7" + reason);
return;
}
applyFreeze(target); applyFreeze(target);
return; // Stoppt den Strahl beim ersten Treffer return;
} }
} }
// Stoppe den Strahl, falls er eine Wand trifft
if (point.getBlock().getType().isSolid()) { if (point.getBlock().getType().isSolid()) {
break; break;
} }
@@ -55,11 +57,8 @@ public class FreezeRay {
if (frozenPlayers.contains(target.getUniqueId())) return; if (frozenPlayers.contains(target.getUniqueId())) return;
frozenPlayers.add(target.getUniqueId()); frozenPlayers.add(target.getUniqueId());
// Fixiere die Position für den Stasis-Effekt
final Location freezeLocation = target.getLocation(); final Location freezeLocation = target.getLocation();
// Feedback für getroffenen Spieler
target.sendMessage("§8[§6Nexus§8] §bDu wurdest eingefroren!"); target.sendMessage("§8[§6Nexus§8] §bDu wurdest eingefroren!");
target.getWorld().playSound(target.getLocation(), Sound.BLOCK_GLASS_BREAK, 1.0f, 0.5f); target.getWorld().playSound(target.getLocation(), Sound.BLOCK_GLASS_BREAK, 1.0f, 0.5f);
@@ -67,35 +66,37 @@ public class FreezeRay {
int ticks = 0; int ticks = 0;
@Override @Override
public void run() { public void run() {
// Sicherheitscheck: Ist der Spieler noch online? if (!target.isOnline() || ticks >= 60) {
if (!target.isOnline() || ticks >= 60) {
frozenPlayers.remove(target.getUniqueId()); frozenPlayers.remove(target.getUniqueId());
this.cancel(); this.cancel();
return; return;
} }
// Stasis-Effekt: Bewegung auf 0 setzen und Position fixieren // Falls der Spieler während des Einfrierens geschützt wird → sofort freigeben
if (GadgetShield.isProtected(target)) {
frozenPlayers.remove(target.getUniqueId());
this.cancel();
return;
}
target.setVelocity(new Vector(0, 0, 0)); target.setVelocity(new Vector(0, 0, 0));
// Alle 2 Ticks zurückteleportieren, falls er versucht zu laufen
// (Behält die Blickrichtung des Spielers bei)
Location current = target.getLocation(); Location current = target.getLocation();
if (current.getX() != freezeLocation.getX() || current.getZ() != freezeLocation.getZ()) { if (current.getX() != freezeLocation.getX() || current.getZ() != freezeLocation.getZ()) {
freezeLocation.setYaw(current.getYaw()); freezeLocation.setYaw(current.getYaw());
freezeLocation.setPitch(current.getPitch()); freezeLocation.setPitch(current.getPitch());
target.teleport(freezeLocation); target.teleport(freezeLocation);
} }
// Optischer Käfig (Ring-Effekt)
Location loc = target.getLocation(); Location loc = target.getLocation();
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
double angle = i * Math.PI / 4; double angle = i * Math.PI / 4;
double x = Math.cos(angle) * 0.7; double x = Math.cos(angle) * 0.7;
double z = Math.sin(angle) * 0.7; double z = Math.sin(angle) * 0.7;
loc.getWorld().spawnParticle(Particle.SNOWFLAKE, loc.clone().add(x, 1, z), 1, 0, 0, 0, 0); loc.getWorld().spawnParticle(Particle.SNOWFLAKE, loc.clone().add(x, 1, z), 1, 0, 0, 0, 0);
loc.getWorld().spawnParticle(Particle.SNOWFLAKE, loc.clone().add(x, 0.2, z), 1, 0, 0, 0, 0); loc.getWorld().spawnParticle(Particle.SNOWFLAKE, loc.clone().add(x, 0.2, z), 1, 0, 0, 0, 0);
} }
ticks += 2; ticks += 2;
} }
}.runTaskTimer(NexusLobby.getInstance(), 0L, 2L); }.runTaskTimer(NexusLobby.getInstance(), 0L, 2L);

304
src/main/java/de/nexuslobby/modules/gadgets/GadgetModule.java
View File

@@ -11,10 +11,12 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.entity.PlayerLeashEntityEvent;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerUnleashEntityEvent;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -30,16 +32,28 @@ import java.util.UUID;
public class GadgetModule implements Module, Listener { public class GadgetModule implements Module, Listener {
private final Map<UUID, Balloon> activeBalloons = new HashMap<>(); private final Map<UUID, Balloon> activeBalloons = new HashMap<>();
private final Map<UUID, ParticleEffect> activeEffects = new HashMap<>(); private final Map<UUID, ParticleEffect> activeEffects = new HashMap<>();
private final Set<UUID> activeShields = new HashSet<>(); private final Set<UUID> activeShields = new HashSet<>();
private final String MAIN_TITLE = "§b§lGadgets §8- §7Menü"; // ── Cooldowns ─────────────────────────────────────────────────────────────
private final String BALLOON_TITLE = "§b§lGadgets §8- §eBallons"; /** Letzter Einsatz-Zeitstempel pro Spieler */
private final Map<UUID, Long> meteorCooldowns = new HashMap<>();
private final Map<UUID, Long> freezeCooldowns = new HashMap<>();
private final Map<UUID, Long> grapplingCooldowns = new HashMap<>();
/** Cooldown-Dauer in Millisekunden */
private static final long METEOR_CD_MS = 15_000L; // 15 Sekunden
private static final long FREEZE_CD_MS = 10_000L; // 10 Sekunden
private static final long GRAPPLING_CD_MS = 3_000L; // 3 Sekunden
// ──────────────────────────────────────────────────────────────────────────
private final String MAIN_TITLE = "§b§lGadgets §8- §7Menü";
private final String BALLOON_TITLE = "§b§lGadgets §8- §eBallons";
private final String PARTICLE_TITLE = "§b§lGadgets §8- §dPartikel"; private final String PARTICLE_TITLE = "§b§lGadgets §8- §dPartikel";
private final String FUN_TITLE = "§b§lGadgets §8- §6Lustiges"; private final String FUN_TITLE = "§b§lGadgets §8- §6Lustiges";
private final String HAT_TITLE = "§b§lGadgets §8- §aHüte & Köpfe"; private final String HAT_TITLE = "§b§lGadgets §8- §aHüte & Köpfe";
private final String PET_TITLE = "§b§lGadgets §8- §dBegleiter"; private final String PET_TITLE = "§b§lGadgets §8- §dBegleiter";
@Override @Override
public String getName() { return "Gadgets"; } public String getName() { return "Gadgets"; }
@@ -47,13 +61,11 @@ public class GadgetModule implements Module, Listener {
@Override @Override
public void onEnable() { public void onEnable() {
Bukkit.getPluginManager().registerEvents(this, NexusLobby.getInstance()); Bukkit.getPluginManager().registerEvents(this, NexusLobby.getInstance());
// FIX: PetManager-Listener korrekt registrieren (war vorher toter Code)
PetManager.register(); PetManager.register();
Bukkit.getScheduler().runTaskTimer(NexusLobby.getInstance(), () -> { Bukkit.getScheduler().runTaskTimer(NexusLobby.getInstance(), () -> {
PetManager.updatePets(); PetManager.updatePets();
activeBalloons.values().forEach(Balloon::update); activeBalloons.values().forEach(Balloon::update);
for (Player p : Bukkit.getOnlinePlayers()) { for (Player p : Bukkit.getOnlinePlayers()) {
UUID uuid = p.getUniqueId(); UUID uuid = p.getUniqueId();
handleSpecialHatEffects(p); handleSpecialHatEffects(p);
@@ -63,24 +75,115 @@ public class GadgetModule implements Module, Listener {
}, 1L, 1L); }, 1L, 1L);
} }
// ─────────────────────────────────────────────────────────────────────────
// Cooldown-Hilfsmethoden
// ─────────────────────────────────────────────────────────────────────────
/**
* Prüft ob der Spieler noch im Cooldown ist.
* @return true → Gadget darf benutzt werden (Cooldown abgelaufen / nicht gesetzt)
* false → Cooldown noch aktiv, Nachricht wird gesendet
*/
private boolean checkAndSetCooldown(Player player, Map<UUID, Long> cdMap, long durationMs, String gadgetName) {
long now = System.currentTimeMillis();
long last = cdMap.getOrDefault(player.getUniqueId(), 0L);
long remaining = durationMs - (now - last);
if (remaining > 0) {
long secLeft = (long) Math.ceil(remaining / 1000.0);
player.sendMessage("§8[§6Nexus§8] §c" + gadgetName + " §7hat noch §e" + secLeft + "s §7Cooldown.");
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 0.5f, 0.8f);
return false;
}
cdMap.put(player.getUniqueId(), now);
return true;
}
// ─────────────────────────────────────────────────────────────────────────
// Event Handler
// ─────────────────────────────────────────────────────────────────────────
/**
* Verhindert Rechtsklick auf den unsichtbaren Ballon-Pig
* (verhindert Leine lösen, Inventar-Öffnen, etc.).
*/
@EventHandler
public void onInteractAtEntity(org.bukkit.event.player.PlayerInteractAtEntityEvent event) {
if (event.getRightClicked().getScoreboardTags().contains("nexus_balloon")) {
event.setCancelled(true);
}
}
/**
* Verhindert das Ablösen der Leine vom Ballon-Pig durch Rechtsklick.
* Ohne diesen Handler wird die Leine gedroppt und der Ballon verschwindet.
*/
@EventHandler
public void onUnleash(PlayerUnleashEntityEvent event) {
if (event.getEntity().getScoreboardTags().contains("nexus_balloon")) {
event.setCancelled(true);
}
}
@EventHandler @EventHandler
public void onInteract(PlayerInteractEvent event) { public void onInteract(PlayerInteractEvent event) {
ItemStack item = event.getItem(); ItemStack item = event.getItem();
if (item == null || !item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return; if (item == null || !item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return;
String name = item.getItemMeta().getDisplayName(); String name = item.getItemMeta().getDisplayName();
if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
if (name.equals("§b§lFreeze-Ray")) {
FreezeRay.shoot(event.getPlayer()); Player player = event.getPlayer();
event.setCancelled(true);
} else if (name.equals("§6§lPaintball-Gun")) { // Wenn der Schütze selbst geschützt ist (Parkour oder Admin-Schutz) → kampfbezogene Gadgets sperren
PaintballGun.shoot(event.getPlayer()); if (GadgetShield.isProtected(player)) {
event.setCancelled(true); if (name.equals("§b§lFreeze-Ray") || name.equals("§c§lMeteorit")) {
} else if (name.equals("§c§lMeteorit")) { player.sendMessage("§8[§6Parkour§8] §cGadgets können während des Parkours nicht benutzt werden.");
MeteorStrike.launch(event.getPlayer());
event.setCancelled(true); event.setCancelled(true);
return;
} }
} }
if (name.equals("§b§lFreeze-Ray")) {
event.setCancelled(true);
if (checkAndSetCooldown(player, freezeCooldowns, FREEZE_CD_MS, "§b§lFreeze-Ray")) {
FreezeRay.shoot(player);
}
} else if (name.equals("§6§lPaintball-Gun")) {
PaintballGun.shoot(player);
event.setCancelled(true);
} else if (name.equals("§c§lMeteorit")) {
event.setCancelled(true);
if (checkAndSetCooldown(player, meteorCooldowns, METEOR_CD_MS, "§c§lMeteorit")) {
MeteorStrike.launch(player);
}
}
}
@EventHandler
public void onFish(PlayerFishEvent event) {
Player player = event.getPlayer();
ItemStack item = player.getInventory().getItemInMainHand();
if (item.getType() != Material.FISHING_ROD || !item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return;
if (!item.getItemMeta().getDisplayName().equals("§b§lEnterhaken")) return;
if (event.getState() == PlayerFishEvent.State.IN_GROUND
|| event.getState() == PlayerFishEvent.State.REEL_IN
|| event.getState() == PlayerFishEvent.State.CAUGHT_ENTITY) {
if (event.getHook() == null) return;
// Parkour-Check: Schütze im Parkour oder Admin-Schutz → nicht benutzen
if (GadgetShield.isProtected(player)) {
player.sendMessage("§8[§6Nexus§8] §cDer Enterhaken ist gerade nicht verfügbar.");
return;
}
if (!checkAndSetCooldown(player, grapplingCooldowns, GRAPPLING_CD_MS, "§b§lEnterhaken")) return;
GrapplingHook.pullPlayer(player, event.getHook().getLocation());
}
} }
@EventHandler @EventHandler
@@ -92,15 +195,19 @@ public class GadgetModule implements Module, Listener {
} }
} }
// ─────────────────────────────────────────────────────────────────────────
// GUI
// ─────────────────────────────────────────────────────────────────────────
private void handleSpecialHatEffects(Player p) { private void handleSpecialHatEffects(Player p) {
ItemStack hat = p.getInventory().getHelmet(); ItemStack hat = p.getInventory().getHelmet();
if (hat == null || hat.getType() == Material.AIR) return; if (hat == null || hat.getType() == Material.AIR) return;
switch (hat.getType()) { switch (hat.getType()) {
case CAMPFIRE -> p.getWorld().spawnParticle(Particle.CAMPFIRE_COSY_SMOKE, p.getLocation().add(0, 2.2, 0), 1, 0.05, 0.05, 0.05, 0.02); case CAMPFIRE -> p.getWorld().spawnParticle(Particle.CAMPFIRE_COSY_SMOKE, p.getLocation().add(0, 2.2, 0), 1, 0.05, 0.05, 0.05, 0.02);
case SPAWNER -> p.getWorld().spawnParticle(Particle.FLAME, p.getLocation().add(0, 2.1, 0), 1, 0.12, 0.12, 0.12, 0.02); case SPAWNER -> p.getWorld().spawnParticle(Particle.FLAME, p.getLocation().add(0, 2.1, 0), 1, 0.12, 0.12, 0.12, 0.02);
case SEA_LANTERN, BEACON -> p.getWorld().spawnParticle(Particle.END_ROD, p.getLocation().add(0, 2.1, 0), 1, 0.1, 0.1, 0.1, 0.03); case SEA_LANTERN, BEACON -> p.getWorld().spawnParticle(Particle.END_ROD, p.getLocation().add(0, 2.1, 0), 1, 0.1, 0.1, 0.1, 0.03);
case ENCHANTING_TABLE -> p.getWorld().spawnParticle(Particle.ENCHANT, p.getLocation().add(0, 2.3, 0), 1, 0.2, 0.2, 0.2, 0.5); case ENCHANTING_TABLE -> p.getWorld().spawnParticle(Particle.ENCHANT, p.getLocation().add(0, 2.3, 0), 1, 0.2, 0.2, 0.2, 0.5);
default -> {} default -> {}
} }
} }
@@ -108,68 +215,64 @@ public class GadgetModule implements Module, Listener {
public void openGUI(Player player) { public void openGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 27, MAIN_TITLE); Inventory gui = Bukkit.createInventory(null, 27, MAIN_TITLE);
fillEdges(gui); fillEdges(gui);
gui.setItem(10, createItem(Material.LEAD, "§e§lBallons", "§7Wähle einen fliegenden Begleiter"));
gui.setItem(10, createItem(Material.LEAD, "§e§lBallons", "§7Wähle einen fliegenden Begleiter")); gui.setItem(11, createItem(Material.GOLDEN_HELMET, "§a§lHüte", "§7Setze dir etwas auf den Kopf"));
gui.setItem(11, createItem(Material.GOLDEN_HELMET, "§a§lHüte", "§7Setze dir etwas auf den Kopf")); gui.setItem(13, createItem(Material.BONE, "§d§lBegleiter", "§7Echte Tiere, die dir folgen"));
gui.setItem(13, createItem(Material.BONE, "§d§lBegleiter", "§7Echte Tiere, die dir folgen")); gui.setItem(15, createItem(Material.FIREWORK_ROCKET,"§6§lLustiges", "§7Witzige Effekte"));
gui.setItem(15, createItem(Material.FIREWORK_ROCKET, "§6§lLustiges", "§7Witzige Effekte")); gui.setItem(16, createItem(Material.NETHER_STAR, "§d§lPartikel", "§7Magische Auren & Effekte"));
gui.setItem(16, createItem(Material.NETHER_STAR, "§d§lPartikel", "§7Magische Auren & Effekte")); gui.setItem(22, createItem(Material.BARRIER, "§c§lStopp", "§7Alle Gadgets entfernen"));
gui.setItem(22, createItem(Material.BARRIER, "§c§lStopp", "§7Alle Gadgets entfernen"));
player.openInventory(gui); player.openInventory(gui);
} }
private void openHatGUI(Player player) { private void openHatGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 45, HAT_TITLE); Inventory gui = Bukkit.createInventory(null, 45, HAT_TITLE);
fillEdges(gui); fillEdges(gui);
gui.setItem(10, createItem(Material.JACK_O_LANTERN, "§6Kürbis-Hut", "§7Es ist immer Halloween!"));
gui.setItem(10, createItem(Material.JACK_O_LANTERN, "§6Kürbis-Hut", "§7Es ist immer Halloween!")); gui.setItem(11, createItem(Material.SEA_LANTERN, "§bMeeres-Leuchten", "§7§oEffekt: Glitzern"));
gui.setItem(11, createItem(Material.SEA_LANTERN, "§bMeeres-Leuchten", "§7§oEffekt: Glitzern")); gui.setItem(12, createItem(Material.GLOWSTONE, "§eGlowstone-Kopf", "§7Werde zur Lampe"));
gui.setItem(12, createItem(Material.GLOWSTONE, "§eGlowstone-Kopf", "§7Werde zur Lampe")); gui.setItem(13, createItem(Material.TNT, "§cExplosiv-Hut", "§7Vorsicht, heiß!"));
gui.setItem(13, createItem(Material.TNT, "§cExplosiv-Hut", "§7Vorsicht, heiß!")); gui.setItem(14, createItem(Material.GLASS, "§fAstronaut", "§7Bereit für den Mond?"));
gui.setItem(14, createItem(Material.GLASS, "§fAstronaut", "§7Bereit für den Mond?")); gui.setItem(15, createItem(Material.DRAGON_HEAD, "§5Enderdrache", "§7Der König der Lüfte"));
gui.setItem(15, createItem(Material.DRAGON_HEAD, "§5Enderdrache", "§7Der König der Lüfte")); gui.setItem(16, createItem(Material.CAKE, "§dKuchen-Kopf", "§7Jeder mag Kuchen!"));
gui.setItem(16, createItem(Material.CAKE, "§dKuchen-Kopf", "§7Jeder mag Kuchen!")); gui.setItem(19, createItem(Material.SLIME_BLOCK, "§aGlibber-Block", "§7Ziemlich klebrig..."));
gui.setItem(19, createItem(Material.SLIME_BLOCK, "§aGlibber-Block", "§7Ziemlich klebrig...")); gui.setItem(20, createItem(Material.MELON, "§aMelonen-Helm", "§7Frisch und saftig"));
gui.setItem(20, createItem(Material.MELON, "§aMelonen-Helm", "§7Frisch und saftig")); gui.setItem(21, createItem(Material.HAY_BLOCK, "§eStrohhut", "§7Sommer auf dem Land"));
gui.setItem(21, createItem(Material.HAY_BLOCK, "§eStrohhut", "§7Sommer auf dem Land")); gui.setItem(22, createItem(Material.SPAWNER, "§8Monster-Käfig", "§7§oEffekt: Flammen"));
gui.setItem(22, createItem(Material.SPAWNER, "§8Monster-Käfig", "§7§oEffekt: Flammen")); gui.setItem(23, createItem(Material.CRAFTING_TABLE, "§6Werkbank", "§7Immer am Basteln"));
gui.setItem(23, createItem(Material.CRAFTING_TABLE, "§6Werkbank", "§7Immer am Basteln")); gui.setItem(24, createItem(Material.BOOKSHELF, "§fBücherregal", "§7Ein wahrer Schlaukopf"));
gui.setItem(24, createItem(Material.BOOKSHELF, "§fBücherregal", "§7Ein wahrer Schlaukopf")); gui.setItem(25, createItem(Material.HONEY_BLOCK, "§6Honig-Hut", "§7Süß und klebrig"));
gui.setItem(25, createItem(Material.HONEY_BLOCK, "§6Honig-Hut", "§7Süß und klebrig")); gui.setItem(28, createItem(Material.GOLD_BLOCK, "§6Gold-Bonze", "§7Zeig was du hast"));
gui.setItem(28, createItem(Material.GOLD_BLOCK, "§6Gold-Bonze", "§7Zeig was du hast")); gui.setItem(29, createItem(Material.DIAMOND_ORE, "§bDiamant-Erz", "§7Bau mich bloß nicht ab!"));
gui.setItem(29, createItem(Material.DIAMOND_ORE, "§bDiamant-Erz", "§7Bau mich bloß nicht ab!")); gui.setItem(30, createItem(Material.BEACON, "§fLeuchtfeuer", "§7§oEffekt: Glitzern"));
gui.setItem(30, createItem(Material.BEACON, "§fLeuchtfeuer", "§7§oEffekt: Glitzern")); gui.setItem(31, createItem(Material.CONDUIT, "§3Auge des Meeres", "§7Die Macht von Atlantis"));
gui.setItem(31, createItem(Material.CONDUIT, "§3Auge des Meeres", "§7Die Macht von Atlantis")); gui.setItem(32, createItem(Material.ENCHANTING_TABLE,"§dMagier", "§7§oEffekt: Runen"));
gui.setItem(32, createItem(Material.ENCHANTING_TABLE, "§dMagier", "§7§oEffekt: Runen")); gui.setItem(33, createItem(Material.CAMPFIRE, "§cHeißer Kopf", "§7§oEffekt: Rauch"));
gui.setItem(33, createItem(Material.CAMPFIRE, "§cHeißer Kopf", "§7§oEffekt: Rauch")); gui.setItem(34, createItem(Material.SKELETON_SKULL, "§7Skelett", "§7Ein wenig gruselig"));
gui.setItem(34, createItem(Material.SKELETON_SKULL, "§7Skelett", "§7Ein wenig gruselig")); gui.setItem(40, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
gui.setItem(40, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
player.openInventory(gui); player.openInventory(gui);
} }
private void openPetGUI(Player player) { private void openPetGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 27, PET_TITLE); Inventory gui = Bukkit.createInventory(null, 27, PET_TITLE);
fillEdges(gui); fillEdges(gui);
gui.setItem(11, createItem(Material.BONE, "§fWolf", "§7Ein treuer Begleiter")); gui.setItem(11, createItem(Material.BONE, "§fWolf", "§7Ein treuer Begleiter"));
gui.setItem(13, createItem(Material.CAT_SPAWN_EGG, "§6Katze", "§7Ein verschmuster Freund")); gui.setItem(13, createItem(Material.CAT_SPAWN_EGG, "§6Katze", "§7Ein verschmuster Freund"));
gui.setItem(15, createItem(Material.PANDA_SPAWN_EGG, "§aPanda", "§7Ein gemütlicher Zeitgenosse")); gui.setItem(15, createItem(Material.PANDA_SPAWN_EGG,"§aPanda", "§7Ein gemütlicher Zeitgenosse"));
gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü")); gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
player.openInventory(gui); player.openInventory(gui);
} }
private void openBalloonGUI(Player player) { private void openBalloonGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 36, BALLOON_TITLE); Inventory gui = Bukkit.createInventory(null, 36, BALLOON_TITLE);
fillEdges(gui); fillEdges(gui);
Material[] wools = {Material.WHITE_WOOL, Material.ORANGE_WOOL, Material.MAGENTA_WOOL, Material.LIGHT_BLUE_WOOL, Material[] wools = {Material.WHITE_WOOL, Material.ORANGE_WOOL, Material.MAGENTA_WOOL,
Material.YELLOW_WOOL, Material.LIME_WOOL, Material.PINK_WOOL, Material.GRAY_WOOL, Material.LIGHT_BLUE_WOOL, Material.YELLOW_WOOL, Material.LIME_WOOL, Material.PINK_WOOL,
Material.CYAN_WOOL, Material.PURPLE_WOOL, Material.BLUE_WOOL, Material.BROWN_WOOL, Material.GRAY_WOOL, Material.CYAN_WOOL, Material.PURPLE_WOOL, Material.BLUE_WOOL,
Material.GREEN_WOOL, Material.RED_WOOL}; Material.BROWN_WOOL, Material.GREEN_WOOL, Material.RED_WOOL};
int slot = 10; int slot = 10;
for (Material m : wools) { for (Material m : wools) {
if (slot == 17) slot = 19; if (slot == 17) slot = 19;
gui.setItem(slot++, createItem(m, "§fBallon: " + m.name().replace("_WOOL", ""), "§7Klicke zum Ausrüsten")); gui.setItem(slot++, createItem(m, "§fBallon: " + m.name().replace("_WOOL",""), "§7Klicke zum Ausrüsten"));
} }
gui.setItem(31, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü")); gui.setItem(31, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
player.openInventory(gui); player.openInventory(gui);
@@ -178,23 +281,23 @@ public class GadgetModule implements Module, Listener {
private void openParticleGUI(Player player) { private void openParticleGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 27, PARTICLE_TITLE); Inventory gui = Bukkit.createInventory(null, 27, PARTICLE_TITLE);
fillEdges(gui); fillEdges(gui);
gui.setItem(11, createItem(Material.POPPY, "§cHerzchen-Aura", "§7Verbreite Liebe in der Lobby")); gui.setItem(11, createItem(Material.POPPY, "§cHerzchen-Aura", "§7Verbreite Liebe in der Lobby"));
gui.setItem(13, createItem(Material.BLAZE_POWDER, "§6Flammen-Ring", "§7Lass es brennen!")); gui.setItem(13, createItem(Material.BLAZE_POWDER, "§6Flammen-Ring", "§7Lass es brennen!"));
gui.setItem(15, createItem(Material.WATER_BUCKET, "§bRegenwolke", "§7Deine persönliche Abkühlung")); gui.setItem(15, createItem(Material.WATER_BUCKET, "§bRegenwolke", "§7Deine persönliche Abkühlung"));
gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü")); gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
player.openInventory(gui); player.openInventory(gui);
} }
private void openFunGUI(Player player) { private void openFunGUI(Player player) {
Inventory gui = Bukkit.createInventory(null, 27, FUN_TITLE); Inventory gui = Bukkit.createInventory(null, 27, FUN_TITLE);
fillEdges(gui); fillEdges(gui);
gui.setItem(10, createItem(Material.FISHING_ROD, "§b§lEnterhaken", "§7Zieh dich durch die Luft!")); gui.setItem(10, createItem(Material.FISHING_ROD, "§b§lEnterhaken", "§7Zieh dich durch die Luft! §8(3s CD)"));
gui.setItem(11, createItem(Material.PACKED_ICE, "§b§lFreeze-Ray", "§7Friere andere Spieler ein!")); gui.setItem(11, createItem(Material.PACKED_ICE, "§b§lFreeze-Ray", "§7Friere andere ein! §8(10s CD)"));
gui.setItem(12, createItem(Material.GOLDEN_HOE, "§6§lPaintball-Gun", "§7Male die Lobby bunt aus!")); gui.setItem(12, createItem(Material.GOLDEN_HOE, "§6§lPaintball-Gun","§7Male die Lobby bunt aus!"));
gui.setItem(14, createItem(Material.FIRE_CHARGE, "§c§lMeteorit", "§7Lass es krachen!")); gui.setItem(14, createItem(Material.FIRE_CHARGE, "§c§lMeteorit", "§7Lass es krachen! §8(15s CD)"));
gui.setItem(15, createItem(Material.SHIELD, "§5§lSchutzzone", "§7Halte andere auf Distanz")); gui.setItem(15, createItem(Material.SHIELD, "§5§lSchutzzone", "§7Halte andere auf Distanz"));
gui.setItem(16, createItem(Material.EGG, "§f§lChicken-Rain", "§7Gack-Gack! Hühner überall!")); gui.setItem(16, createItem(Material.EGG, "§f§lChicken-Rain","§7Gack-Gack! Hühner überall!"));
gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü")); gui.setItem(22, createItem(Material.ARROW, "§7Zurück", "§8Zum Hauptmenü"));
player.openInventory(gui); player.openInventory(gui);
} }
@@ -210,25 +313,23 @@ public class GadgetModule implements Module, Listener {
if (item.getType() == Material.ARROW) { openGUI(player); return; } if (item.getType() == Material.ARROW) { openGUI(player); return; }
if (title.equals(MAIN_TITLE)) { if (title.equals(MAIN_TITLE)) {
if (item.getType() == Material.LEAD) openBalloonGUI(player); if (item.getType() == Material.LEAD) openBalloonGUI(player);
else if (item.getType() == Material.GOLDEN_HELMET) openHatGUI(player); else if (item.getType() == Material.GOLDEN_HELMET) openHatGUI(player);
else if (item.getType() == Material.BONE) openPetGUI(player); else if (item.getType() == Material.BONE) openPetGUI(player);
else if (item.getType() == Material.NETHER_STAR) openParticleGUI(player); else if (item.getType() == Material.NETHER_STAR) openParticleGUI(player);
else if (item.getType() == Material.FIREWORK_ROCKET) openFunGUI(player); else if (item.getType() == Material.FIREWORK_ROCKET) openFunGUI(player);
else if (item.getType() == Material.BARRIER) { removeGadgets(player); player.closeInventory(); } else if (item.getType() == Material.BARRIER) { removeGadgets(player); player.closeInventory(); }
} else if (title.equals(HAT_TITLE)) { } else if (title.equals(HAT_TITLE)) {
if (item.getType() != Material.GRAY_STAINED_GLASS_PANE) { if (item.getType() != Material.GRAY_STAINED_GLASS_PANE) {
String hatName = item.getType().name(); String hatName = item.hasItemMeta() && item.getItemMeta().hasDisplayName()
if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()) { ? item.getItemMeta().getDisplayName() : item.getType().name();
hatName = item.getItemMeta().getDisplayName();
}
HatManager.setHat(player, item.getType(), hatName); HatManager.setHat(player, item.getType(), hatName);
player.playSound(player.getLocation(), Sound.ITEM_ARMOR_EQUIP_GENERIC, 1, 1); player.playSound(player.getLocation(), Sound.ITEM_ARMOR_EQUIP_GENERIC, 1, 1);
player.closeInventory(); player.closeInventory();
} }
} else if (title.equals(PET_TITLE)) { } else if (title.equals(PET_TITLE)) {
if (item.getType() == Material.BONE) PetManager.spawnEntityPet(player, "WOLF"); if (item.getType() == Material.BONE) PetManager.spawnEntityPet(player, "WOLF");
else if (item.getType() == Material.CAT_SPAWN_EGG) PetManager.spawnEntityPet(player, "CAT"); else if (item.getType() == Material.CAT_SPAWN_EGG) PetManager.spawnEntityPet(player, "CAT");
else if (item.getType() == Material.PANDA_SPAWN_EGG) PetManager.spawnEntityPet(player, "PANDA"); else if (item.getType() == Material.PANDA_SPAWN_EGG) PetManager.spawnEntityPet(player, "PANDA");
player.sendMessage("§8[§6Nexus§8] §dDein Pet wurde gerufen!"); player.sendMessage("§8[§6Nexus§8] §dDein Pet wurde gerufen!");
player.closeInventory(); player.closeInventory();
@@ -240,7 +341,7 @@ public class GadgetModule implements Module, Listener {
player.closeInventory(); player.closeInventory();
} }
} else if (title.equals(PARTICLE_TITLE)) { } else if (title.equals(PARTICLE_TITLE)) {
if (item.getType() == Material.POPPY) activeEffects.put(player.getUniqueId(), new ParticleEffect("hearts")); if (item.getType() == Material.POPPY) activeEffects.put(player.getUniqueId(), new ParticleEffect("hearts"));
else if (item.getType() == Material.BLAZE_POWDER) activeEffects.put(player.getUniqueId(), new ParticleEffect("flames")); else if (item.getType() == Material.BLAZE_POWDER) activeEffects.put(player.getUniqueId(), new ParticleEffect("flames"));
else if (item.getType() == Material.WATER_BUCKET) activeEffects.put(player.getUniqueId(), new ParticleEffect("cloud")); else if (item.getType() == Material.WATER_BUCKET) activeEffects.put(player.getUniqueId(), new ParticleEffect("cloud"));
player.sendMessage("§8[§6Nexus§8] §aPartikel aktiviert!"); player.sendMessage("§8[§6Nexus§8] §aPartikel aktiviert!");
@@ -251,16 +352,16 @@ public class GadgetModule implements Module, Listener {
player.sendMessage("§8[§6Nexus§8] §fHühnerregen gestartet!"); player.sendMessage("§8[§6Nexus§8] §fHühnerregen gestartet!");
player.closeInventory(); player.closeInventory();
} else if (item.getType() == Material.FISHING_ROD) { } else if (item.getType() == Material.FISHING_ROD) {
player.getInventory().addItem(createItem(Material.FISHING_ROD, "§b§lEnterhaken", "§7Rechtsklick zum Katapultieren")); player.getInventory().addItem(createItem(Material.FISHING_ROD, "§b§lEnterhaken", "§7Rechtsklick zum Katapultieren §8(3s CD)"));
player.closeInventory(); player.closeInventory();
} else if (item.getType() == Material.PACKED_ICE) { } else if (item.getType() == Material.PACKED_ICE) {
player.getInventory().addItem(createItem(Material.PACKED_ICE, "§b§lFreeze-Ray", "§7Rechtsklick zum Einfrieren")); player.getInventory().addItem(createItem(Material.PACKED_ICE, "§b§lFreeze-Ray", "§7Rechtsklick zum Einfrieren §8(10s CD)"));
player.closeInventory(); player.closeInventory();
} else if (item.getType() == Material.GOLDEN_HOE) { } else if (item.getType() == Material.GOLDEN_HOE) {
player.getInventory().addItem(createItem(Material.GOLDEN_HOE, "§6§lPaintball-Gun", "§7Rechtsklick zum Schießen")); player.getInventory().addItem(createItem(Material.GOLDEN_HOE, "§6§lPaintball-Gun", "§7Rechtsklick zum Schießen"));
player.closeInventory(); player.closeInventory();
} else if (item.getType() == Material.FIRE_CHARGE) { } else if (item.getType() == Material.FIRE_CHARGE) {
player.getInventory().addItem(createItem(Material.FIRE_CHARGE, "§c§lMeteorit", "§7Rechtsklick zum Markieren")); player.getInventory().addItem(createItem(Material.FIRE_CHARGE, "§c§lMeteorit", "§7Rechtsklick zum Markieren §8(15s CD)"));
player.closeInventory(); player.closeInventory();
} else if (item.getType() == Material.SHIELD) { } else if (item.getType() == Material.SHIELD) {
if (activeShields.contains(player.getUniqueId())) { if (activeShields.contains(player.getUniqueId())) {
@@ -275,20 +376,6 @@ public class GadgetModule implements Module, Listener {
} }
} }
@EventHandler
public void onFish(PlayerFishEvent event) {
Player player = event.getPlayer();
ItemStack item = player.getInventory().getItemInMainHand();
if (item.getType() == Material.FISHING_ROD && item.hasItemMeta() && item.getItemMeta().hasDisplayName()
&& item.getItemMeta().getDisplayName().equals("§b§lEnterhaken")) {
if (event.getState() == PlayerFishEvent.State.IN_GROUND || event.getState() == PlayerFishEvent.State.REEL_IN || event.getState() == PlayerFishEvent.State.CAUGHT_ENTITY) {
if (event.getHook() != null) {
GrapplingHook.pullPlayer(player, event.getHook().getLocation());
}
}
}
}
private void removeGadgets(Player player) { private void removeGadgets(Player player) {
if (activeBalloons.containsKey(player.getUniqueId())) { if (activeBalloons.containsKey(player.getUniqueId())) {
activeBalloons.get(player.getUniqueId()).remove(); activeBalloons.get(player.getUniqueId()).remove();
@@ -307,7 +394,6 @@ public class GadgetModule implements Module, Listener {
} }
private void fillEdges(Inventory inv) { private void fillEdges(Inventory inv) {
// Bedrock braucht einen Space, um den Namen korrekt anzuzeigen
ItemStack glass = createItem(Material.GRAY_STAINED_GLASS_PANE, " ", null); ItemStack glass = createItem(Material.GRAY_STAINED_GLASS_PANE, " ", null);
for (int i = 0; i < inv.getSize(); i++) { for (int i = 0; i < inv.getSize(); i++) {
if (i < 9 || i >= inv.getSize() - 9 || i % 9 == 0 || (i + 1) % 9 == 0) inv.setItem(i, glass); if (i < 9 || i >= inv.getSize() - 9 || i % 9 == 0 || (i + 1) % 9 == 0) inv.setItem(i, glass);
@@ -319,19 +405,14 @@ public class GadgetModule implements Module, Listener {
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if (meta != null) { if (meta != null) {
meta.setDisplayName(name); meta.setDisplayName(name);
// WICHTIG FÜR BEDROCK: Saubere ArrayList für Lore
List<String> l = new ArrayList<>(); List<String> l = new ArrayList<>();
if (lore != null && !lore.isEmpty()) { if (lore != null && !lore.isEmpty()) {
l.add(ChatColor.translateAlternateColorCodes('&', lore)); l.add(ChatColor.translateAlternateColorCodes('&', lore));
meta.setLore(l); meta.setLore(l);
} }
// VERSTECKT ATTRIBUTE: Verhindert "+Armor" etc., was bei Bedrock die Lore überdeckt
meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
meta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE); meta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE);
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS); meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
item.setItemMeta(meta); item.setItemMeta(meta);
} }
return item; return item;
@@ -346,5 +427,6 @@ public class GadgetModule implements Module, Listener {
activeBalloons.clear(); activeBalloons.clear();
activeEffects.clear(); activeEffects.clear();
activeShields.clear(); activeShields.clear();
GadgetShield.clear();
} }
} }

59
src/main/java/de/nexuslobby/modules/gadgets/GadgetShield.java Normal file
View File

@@ -0,0 +1,59 @@
package de.nexuslobby.modules.gadgets;
import de.nexuslobby.NexusLobby;
import de.nexuslobby.modules.parkour.ParkourManager;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/**
* Verwaltet den Gadget-Schutz für Admins und Parkour-Spieler.
* Eigenständige Klasse – kein Eingriff in GadgetModule nötig.
*/
public class GadgetShield {
/** UUIDs der Admins, die ihren Gadget-Schutz aktiviert haben */
private static final Set<UUID> shielded = new HashSet<>();
/**
* Schaltet den Gadget-Schutz ein oder aus.
* Gibt true zurück wenn der Schutz jetzt aktiv ist.
*/
public static boolean toggle(Player player) {
UUID uuid = player.getUniqueId();
if (shielded.contains(uuid)) {
shielded.remove(uuid);
player.sendMessage("§8[§6Nexus§8] §cGadget-Schutz §7deaktiviert.");
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1f, 1f);
return false;
} else {
shielded.add(uuid);
player.sendMessage("§8[§6Nexus§8] §aGadget-Schutz §7aktiviert. §8Du bist nun immun gegen Gadgets.");
player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 1f, 1.5f);
return true;
}
}
/** Gibt zurück ob ein Spieler explizit durch den Admin-Schutz geschützt ist. */
public static boolean isAdminShielded(Player player) {
return shielded.contains(player.getUniqueId());
}
/**
* Gibt zurück ob ein Spieler durch irgendeinen Schutz immun gegen Gadgets ist
* (Admin-Schutz ODER aktiver Parkour-Run).
*/
public static boolean isProtected(Player player) {
if (shielded.contains(player.getUniqueId())) return true;
ParkourManager pm = NexusLobby.getInstance().getParkourManager();
return pm != null && pm.isIngame(player);
}
/** Beim Server-Stop / Plugin-Disable aufrufen */
public static void clear() {
shielded.clear();
}
}

16
src/main/java/de/nexuslobby/modules/gadgets/MeteorStrike.java
View File

@@ -30,14 +30,26 @@ public class MeteorStrike {
shooter.sendMessage("§8[§6Nexus§8] §cMeteorit im Anflug..."); shooter.sendMessage("§8[§6Nexus§8] §cMeteorit im Anflug...");
org.bukkit.Bukkit.getScheduler().runTaskLater(NexusLobby.getInstance(), () -> { org.bukkit.Bukkit.getScheduler().runTaskLater(NexusLobby.getInstance(), () -> {
// EXPLOSION_EMITTER ist der moderne Name für HUGE_EXPLOSION
finalTarget.getWorld().spawnParticle(Particle.EXPLOSION_EMITTER, finalTarget, 1); finalTarget.getWorld().spawnParticle(Particle.EXPLOSION_EMITTER, finalTarget, 1);
finalTarget.getWorld().spawnParticle(Particle.LAVA, finalTarget, 30, 0.5, 0.5, 0.5, 0.1); finalTarget.getWorld().spawnParticle(Particle.LAVA, finalTarget, 30, 0.5, 0.5, 0.5, 0.1);
finalTarget.getWorld().playSound(finalTarget, Sound.ENTITY_GENERIC_EXPLODE, 1.0f, 0.8f); finalTarget.getWorld().playSound(finalTarget, Sound.ENTITY_GENERIC_EXPLODE, 1.0f, 0.8f);
for (Entity entity : finalTarget.getWorld().getNearbyEntities(finalTarget, 4, 4, 4)) { for (Entity entity : finalTarget.getWorld().getNearbyEntities(finalTarget, 4, 4, 4)) {
if (entity instanceof Player p) { if (entity instanceof Player p) {
Vector v = p.getLocation().toVector().subtract(finalTarget.toVector()).normalize().multiply(1.5).setY(0.5); // Schutz: Admins mit Gadget-Schutz und Parkour-Spieler werden nicht weggeschleudert
if (GadgetShield.isProtected(p)) {
if (GadgetShield.isAdminShielded(p)) {
p.sendMessage("§8[§6Nexus§8] §7Dein Gadget-Schutzschild hat den Meteoriten abgelenkt!");
} else {
p.sendMessage("§8[§6Parkour§8] §7Dein Parkour-Schutzschild hat den Meteoriten abgelenkt!");
}
continue;
}
Vector v = p.getLocation().toVector()
.subtract(finalTarget.toVector())
.normalize()
.multiply(1.5)
.setY(0.5);
p.setVelocity(v); p.setVelocity(v);
p.sendMessage("§cBUMM!"); p.sendMessage("§cBUMM!");
} }

39
src/main/java/de/nexuslobby/modules/gadgets/ShieldTask.java
View File

@@ -6,8 +6,19 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class ShieldTask { public class ShieldTask {
/**
* Cooldown: Ein Spieler darf nur alle 3 Sekunden weggedrückt werden.
* Verhindert das permanente "Kleben" am Schutzschild-Träger.
*/
private static final Map<UUID, Long> pushCooldowns = new HashMap<>();
private static final long PUSH_COOLDOWN_MS = 3_000L;
public static void handleShield(Player owner) { public static void handleShield(Player owner) {
// Erzeuge einen Partikel-Ring um den Spieler // Erzeuge einen Partikel-Ring um den Spieler
for (double i = 0; i < Math.PI * 2; i += Math.PI / 8) { for (double i = 0; i < Math.PI * 2; i += Math.PI / 8) {
@@ -16,17 +27,27 @@ public class ShieldTask {
owner.getWorld().spawnParticle(Particle.WITCH, owner.getLocation().add(x, 0.5, z), 1, 0, 0, 0, 0); owner.getWorld().spawnParticle(Particle.WITCH, owner.getLocation().add(x, 0.5, z), 1, 0, 0, 0, 0);
} }
long now = System.currentTimeMillis();
// Stoße andere Spieler weg // Stoße andere Spieler weg
for (Entity entity : owner.getNearbyEntities(2.2, 2.0, 2.2)) { for (Entity entity : owner.getNearbyEntities(2.2, 2.0, 2.2)) {
if (entity instanceof Player && entity != owner) { if (!(entity instanceof Player target) || entity == owner) continue;
Player target = (Player) entity;
// FIX: OP-Admins mit aktivem Gadget-Schutz und Parkour-Spieler sind immun
Vector direction = target.getLocation().toVector().subtract(owner.getLocation().toVector()).normalize(); if (GadgetShield.isProtected(target)) continue;
direction.multiply(0.4).setY(0.2);
// FIX: 3-Sekunden-Cooldown – jedes Ziel wird max. 1x alle 3s weggedrückt
target.setVelocity(direction); long lastPush = pushCooldowns.getOrDefault(target.getUniqueId(), 0L);
target.playSound(target.getLocation(), Sound.ENTITY_CHICKEN_EGG, 0.5f, 0.5f); if (now - lastPush < PUSH_COOLDOWN_MS) continue;
} pushCooldowns.put(target.getUniqueId(), now);
Vector direction = target.getLocation().toVector()
.subtract(owner.getLocation().toVector())
.normalize();
direction.multiply(0.4).setY(0.2);
target.setVelocity(direction);
target.playSound(target.getLocation(), Sound.ENTITY_CHICKEN_EGG, 0.5f, 0.5f);
} }
} }
} }

62
src/main/java/de/nexuslobby/modules/parkour/ParkourListener.java
View File

@@ -18,48 +18,43 @@ import java.util.UUID;
public class ParkourListener implements Listener { public class ParkourListener implements Listener {
private final ParkourManager manager; private final ParkourManager manager;
private final String NPC_TAG = "parkour_npc"; private final String NPC_TAG = "parkour_npc";
private final HashMap<UUID, Long> startCooldown = new HashMap<>(); private final HashMap<UUID, Long> startCooldown = new HashMap<>();
public ParkourListener(ParkourManager manager) { public ParkourListener(ParkourManager manager) {
this.manager = manager; this.manager = manager;
} }
/**
* Startet den Parkour per Rechtsklick auf den ArmorStand
*/
@EventHandler @EventHandler
public void onInteract(PlayerInteractAtEntityEvent event) { public void onInteract(PlayerInteractAtEntityEvent event) {
if (!(event.getRightClicked() instanceof ArmorStand as)) return; if (!(event.getRightClicked() instanceof ArmorStand as)) return;
if (!as.getScoreboardTags().contains(NPC_TAG)) return;
// Prüfen, ob der ArmorStand den richtigen Tag hat
if (as.getScoreboardTags().contains(NPC_TAG)) {
Player player = event.getPlayer();
// Abbrechen, wenn der Spieler schon im Parkour ist
if (manager.isIngame(player)) return;
// Cooldown-Check (3 Sekunden) Player player = event.getPlayer();
if (startCooldown.containsKey(player.getUniqueId())) { event.setCancelled(true);
if (System.currentTimeMillis() - startCooldown.get(player.getUniqueId()) < 3000) {
player.sendMessage("§cBitte warte einen Moment, bevor du erneut startest."); if (manager.isIngame(player)) return;
return;
} // Cooldown-Check (3 Sekunden)
if (startCooldown.containsKey(player.getUniqueId())) {
if (System.currentTimeMillis() - startCooldown.get(player.getUniqueId()) < 3000) {
player.sendMessage("§cBitte warte einen Moment, bevor du erneut startest.");
return;
} }
// Parkour starten
manager.startParkour(player, as.getLocation());
player.sendMessage("§8[§6Parkour§8] §eViel Erfolg! Erreiche das Ziel so schnell wie möglich.");
player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1f, 1f);
// Event abbrechen, damit man keine Ausrüstung vom ArmorStand klaut
event.setCancelled(true);
} }
manager.startParkour(player, as.getLocation());
// Strecken-Nummer dem Spieler mitteilen
int track = manager.getActiveTrack(player);
if (track != -1) {
player.sendMessage("§8[§6Parkour§8] §eViel Erfolg auf §bStrecke " + track + "§e! Erreiche das Ziel so schnell wie möglich.");
}
player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1f, 1f);
} }
@EventHandler @EventHandler
public void onMove(PlayerMoveEvent event) { public void onMove(PlayerMoveEvent event) {
// Performance: Nur berechnen, wenn ein voller Block gewechselt wurde // Performance: Nur bei Block-Wechsel berechnen
if (event.getFrom().getBlockX() == event.getTo().getBlockX() && if (event.getFrom().getBlockX() == event.getTo().getBlockX() &&
event.getFrom().getBlockY() == event.getTo().getBlockY() && event.getFrom().getBlockY() == event.getTo().getBlockY() &&
event.getFrom().getBlockZ() == event.getTo().getBlockZ()) return; event.getFrom().getBlockZ() == event.getTo().getBlockZ()) return;
@@ -70,8 +65,7 @@ public class ParkourListener implements Listener {
Location loc = player.getLocation(); Location loc = player.getLocation();
// --- 1. ABSTURZ-CHECK --- // --- 1. ABSTURZ-CHECK ---
// Passe die Höhe '50' an deine Map an! if (loc.getY() < 50) {
if (loc.getY() < 50) {
Location lastCp = manager.getCheckpoint(player); Location lastCp = manager.getCheckpoint(player);
if (lastCp != null) { if (lastCp != null) {
player.teleport(lastCp); player.teleport(lastCp);
@@ -81,27 +75,25 @@ public class ParkourListener implements Listener {
return; return;
} }
// --- 2. CHECKPOINT-CHECK --- // --- 2. CHECKPOINT-CHECK (Track-spezifisch) ---
List<Location> cps = manager.getOrderedCheckpoints(); List<Location> cps = manager.getOrderedCheckpoints(player);
for (int i = 0; i < cps.size(); i++) { for (int i = 0; i < cps.size(); i++) {
if (isNearby(loc, cps.get(i))) { if (isNearby(loc, cps.get(i))) {
manager.reachCheckpoint(player, i); manager.reachCheckpoint(player, i);
} }
} }
// --- 3. ZIEL-CHECK --- // --- 3. ZIEL-CHECK (Track-spezifisch) ---
Location finish = manager.getFinishLocation(); Location finish = manager.getFinishLocation(player);
if (finish != null && isNearby(loc, finish)) { if (finish != null && isNearby(loc, finish)) {
manager.finishParkour(player); manager.finishParkour(player);
// Nach dem Ziel setzen wir einen Cooldown
startCooldown.put(player.getUniqueId(), System.currentTimeMillis()); startCooldown.put(player.getUniqueId(), System.currentTimeMillis());
} }
} }
private boolean isNearby(Location playerLoc, Location targetLoc) { private boolean isNearby(Location playerLoc, Location targetLoc) {
if (playerLoc.getWorld() == null || !playerLoc.getWorld().equals(targetLoc.getWorld())) return false; if (playerLoc.getWorld() == null || !playerLoc.getWorld().equals(targetLoc.getWorld())) return false;
// 2.25 entspricht einem Radius von ca. 1.5 Blöcken return playerLoc.distanceSquared(targetLoc) <= 2.25; // ~1.5 Blöcke Radius
return playerLoc.distanceSquared(targetLoc) <= 2.25;
} }
@EventHandler @EventHandler

315
src/main/java/de/nexuslobby/modules/parkour/ParkourManager.java
View File

@@ -17,71 +17,186 @@ import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/**
* ParkourManager – unterstützt zwei Strecken (Track 1 & 2).
*
* Config-Struktur (parkour.yml):
* tracks:
* 1:
* start: <Location>
* finish: <Location>
* checkpoints:
* 1: <Location>
* 2: <Location>
* ...
* 2:
* start: <Location>
* finish: <Location>
* checkpoints:
* 1: <Location>
* ...
* besttimes:
* <uuid>: <seconds>
* names:
* <uuid>: <playerName>
*
* Beim Start wird zufällig eine der beiden konfigurierten Strecken ausgewählt.
* Beide Strecken müssen die gleiche Anzahl an Checkpoints haben – andernfalls
* wird nur die vollständige gewählt.
*/
public class ParkourManager { public class ParkourManager {
private final NexusLobby plugin; private final NexusLobby plugin;
private final File file; private final File file;
private FileConfiguration config; private FileConfiguration config;
private final Map<UUID, Long> startTime = new HashMap<>(); // Aktive Läufe
private final Map<UUID, Location> lastCheckpointLoc = new HashMap<>(); private final Map<UUID, Long> startTime = new HashMap<>();
private final Map<UUID, Integer> nextCheckpointIndex = new HashMap<>(); private final Map<UUID, Location> lastCheckpointLoc = new HashMap<>();
private final Map<UUID, Integer> nextCheckpointIndex= new HashMap<>();
/** Welche Track-Nummer (1 oder 2) der Spieler gerade läuft */
private final Map<UUID, Integer> activeTrack = new HashMap<>();
private final Random random = new Random();
public ParkourManager(NexusLobby plugin) { public ParkourManager(NexusLobby plugin) {
this.plugin = plugin; this.plugin = plugin;
this.file = new File(plugin.getDataFolder(), "parkour.yml"); this.file = new File(plugin.getDataFolder(), "parkour.yml");
loadConfig(); loadConfig();
startParticleTask(); startParticleTask();
} }
// ─────────────────────────────────────────────────────────────────────────
// Config I/O
// ─────────────────────────────────────────────────────────────────────────
private void loadConfig() { private void loadConfig() {
if (!file.exists()) { if (!file.exists()) {
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
try { try {
file.createNewFile(); file.createNewFile();
} catch (IOException e) { } catch (IOException e) {
plugin.getLogger().severe("Fehler beim Erstellen der Parkour-Datei: " + e.getMessage()); plugin.getLogger().severe("Fehler beim Erstellen der Parkour-Datei: " + e.getMessage());
} }
} }
config = YamlConfiguration.loadConfiguration(file); config = YamlConfiguration.loadConfiguration(file);
} }
public void setCheckpoint(Player player, Location loc) { private void save() {
int nextId = 1; try {
if (config.contains("locations.checkpoints") && config.getConfigurationSection("locations.checkpoints") != null) { config.save(file);
nextId = config.getConfigurationSection("locations.checkpoints").getKeys(false).size() + 1; } catch (IOException e) {
plugin.getLogger().severe("Fehler beim Speichern der Parkour-Config: " + e.getMessage());
} }
}
addCheckpointLocation(String.valueOf(nextId), loc);
player.sendMessage("§8[§6Parkour§8] §7Checkpoint §e#" + nextId + " §7an deiner Position gesetzt."); // ─────────────────────────────────────────────────────────────────────────
// Setup-Befehle (Admin)
// ─────────────────────────────────────────────────────────────────────────
public void setStartLocation(Player player, int track) {
config.set("tracks." + track + ".start", player.getLocation());
save();
player.sendMessage("§8[§6Parkour§8] §7Start von §eStrecke " + track + " §7an deiner Position gesetzt.");
}
public void setFinishLocation(Player player, int track) {
config.set("tracks." + track + ".finish", player.getLocation());
save();
player.sendMessage("§8[§6Parkour§8] §7Ziel von §eStrecke " + track + " §7an deiner Position gesetzt.");
}
public void setCheckpoint(Player player, int track) {
String cpBase = "tracks." + track + ".checkpoints";
int nextId = 1;
if (config.contains(cpBase) && config.getConfigurationSection(cpBase) != null) {
nextId = config.getConfigurationSection(cpBase).getKeys(false).size() + 1;
}
config.set(cpBase + "." + nextId, player.getLocation());
save();
player.sendMessage("§8[§6Parkour§8] §7Checkpoint §e#" + nextId + " §7(Strecke " + track + ") §7gesetzt.");
player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 1.0f, 1.5f); player.playSound(player.getLocation(), Sound.BLOCK_AMETHYST_BLOCK_CHIME, 1.0f, 1.5f);
} }
/** /**
* Löscht die gesamte Strecke (Checkpoints und Ziel) und bricht aktuelle Läufe ab. * Löscht alle Punkte beider Strecken und bricht laufende Runs ab.
*/ */
public void removeAllPoints() { public void removeAllPoints() {
config.set("locations.checkpoints", null); config.set("tracks", null);
config.set("locations.finish", null);
save(); save();
// Alle Spieler aus dem Parkour werfen, damit keine Partikel zu gelöschten Zielen führen
for (UUID uuid : new HashSet<>(startTime.keySet())) { for (UUID uuid : new HashSet<>(startTime.keySet())) {
Player p = Bukkit.getPlayer(uuid); Player p = Bukkit.getPlayer(uuid);
if (p != null) { if (p != null) {
stopParkour(p); stopParkour(p);
p.sendMessage("§8[§6Parkour§8] §cDie aktuelle Strecke wurde soeben gelöscht."); p.sendMessage("§8[§6Parkour§8] §cDie Strecken wurden soeben gelöscht.");
} }
} }
} }
public void startParkour(Player player, Location startLoc) { // ─────────────────────────────────────────────────────────────────────────
// Getter (Track-spezifisch)
// ─────────────────────────────────────────────────────────────────────────
public Location getStartLocation(int track) {
return config.getLocation("tracks." + track + ".start");
}
public Location getFinishLocation(int track) {
return config.getLocation("tracks." + track + ".finish");
}
public List<Location> getOrderedCheckpoints(int track) {
String cpBase = "tracks." + track + ".checkpoints";
if (!config.contains(cpBase) || config.getConfigurationSection(cpBase) == null)
return new ArrayList<>();
return config.getConfigurationSection(cpBase).getKeys(false).stream()
.sorted(Comparator.comparingInt(Integer::parseInt))
.map(key -> config.getLocation(cpBase + "." + key))
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
/**
* Gibt die aktive Track-Nummer des Spielers zurück (1 oder 2), oder -1 wenn nicht aktiv.
*/
public int getActiveTrack(Player player) {
return activeTrack.getOrDefault(player.getUniqueId(), -1);
}
// Convenience-Wrapper für ParkourListener (nutzt den aktiven Track des Spielers)
public List<Location> getOrderedCheckpoints(Player player) {
return getOrderedCheckpoints(getActiveTrack(player));
}
public Location getFinishLocation(Player player) {
return getFinishLocation(getActiveTrack(player));
}
// ─────────────────────────────────────────────────────────────────────────
// Parkour-Ablauf
// ─────────────────────────────────────────────────────────────────────────
/**
* Startet den Parkour für den Spieler.
* Es wird zufällig eine der beiden Strecken gewählt, sofern beide vollständig
* konfiguriert sind (Start + Finish + mindestens gleiche Checkpoint-Anzahl).
* Falls nur eine Strecke konfiguriert ist, wird diese gewählt.
*/
public void startParkour(Player player, Location npcLocation) {
if (startTime.containsKey(player.getUniqueId())) return; if (startTime.containsKey(player.getUniqueId())) return;
int chosenTrack = pickRandomTrack();
if (chosenTrack == -1) {
player.sendMessage("§8[§6Parkour§8] §cKeine Strecke konfiguriert. Bitte einen Admin kontaktieren.");
return;
}
startTime.put(player.getUniqueId(), System.currentTimeMillis()); startTime.put(player.getUniqueId(), System.currentTimeMillis());
lastCheckpointLoc.put(player.getUniqueId(), startLoc); lastCheckpointLoc.put(player.getUniqueId(), npcLocation);
nextCheckpointIndex.put(player.getUniqueId(), 0); nextCheckpointIndex.put(player.getUniqueId(), 0);
activeTrack.put(player.getUniqueId(), chosenTrack);
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_CHIME, 1.0f, 1.2f); player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_CHIME, 1.0f, 1.2f);
new BukkitRunnable() { new BukkitRunnable() {
@@ -93,12 +208,45 @@ public class ParkourManager {
} }
long diff = System.currentTimeMillis() - startTime.get(player.getUniqueId()); long diff = System.currentTimeMillis() - startTime.get(player.getUniqueId());
double sec = diff / 1000.0; double sec = diff / 1000.0;
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, player.spigot().sendMessage(ChatMessageType.ACTION_BAR,
new TextComponent("§6⏱ Zeit: §e" + String.format("%.2f", sec) + "s §8| §bNächster Punkt: §7Partikel folgen")); new TextComponent("§6⏱ Zeit: §e" + String.format("%.2f", sec) + "s §8| §bNächster Punkt: §7Partikel folgen"));
} }
}.runTaskTimer(plugin, 0L, 1L); }.runTaskTimer(plugin, 0L, 1L);
} }
/**
* Wählt zufällig einen validen Track (1 oder 2).
* Bevorzugt Tracks mit gleichem Checkpoint-Count; fällt auf jeden konfigurierten zurück.
* Gibt -1 zurück, wenn kein Track konfiguriert ist.
*/
private int pickRandomTrack() {
boolean t1 = isTrackReady(1);
boolean t2 = isTrackReady(2);
if (t1 && t2) {
// Beide vollständig – prüfen ob gleiche Länge
int len1 = getOrderedCheckpoints(1).size();
int len2 = getOrderedCheckpoints(2).size();
if (len1 != len2) {
// Warnung ins Log, aber trotzdem zufällig wählen
plugin.getLogger().warning("[Parkour] Strecke 1 hat " + len1 + " Checkpoints, Strecke 2 hat " + len2 + ". Bitte angleichen!");
}
return random.nextBoolean() ? 1 : 2;
} else if (t1) {
return 1;
} else if (t2) {
return 2;
}
return -1;
}
/** Gibt zurück, ob Start, Finish und mindestens 1 Checkpoint für den Track gesetzt sind. */
public boolean isTrackReady(int track) {
return getStartLocation(track) != null
&& getFinishLocation(track) != null
&& !getOrderedCheckpoints(track).isEmpty();
}
private void startParticleTask() { private void startParticleTask() {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
@@ -107,8 +255,9 @@ public class ParkourManager {
Player p = Bukkit.getPlayer(uuid); Player p = Bukkit.getPlayer(uuid);
if (p == null) continue; if (p == null) continue;
int track = activeTrack.getOrDefault(uuid, 1);
int nextIdx = nextCheckpointIndex.getOrDefault(uuid, 0); int nextIdx = nextCheckpointIndex.getOrDefault(uuid, 0);
List<Location> cps = getOrderedCheckpoints(); List<Location> cps = getOrderedCheckpoints(track);
if (nextIdx < cps.size()) { if (nextIdx < cps.size()) {
Location nextCp = cps.get(nextIdx); Location nextCp = cps.get(nextIdx);
@@ -116,7 +265,7 @@ public class ParkourManager {
p.spawnParticle(Particle.SOUL_FIRE_FLAME, nextCp.clone().add(0, 0.5, 0), 5, 0.1, 0.3, 0.1, 0.02); p.spawnParticle(Particle.SOUL_FIRE_FLAME, nextCp.clone().add(0, 0.5, 0), 5, 0.1, 0.3, 0.1, 0.02);
} }
} else { } else {
Location finish = getFinishLocation(); Location finish = getFinishLocation(track);
if (finish != null && p.getWorld().equals(finish.getWorld())) { if (finish != null && p.getWorld().equals(finish.getWorld())) {
p.spawnParticle(Particle.HAPPY_VILLAGER, finish.clone().add(0, 0.5, 0), 8, 0.2, 0.5, 0.2, 0.02); p.spawnParticle(Particle.HAPPY_VILLAGER, finish.clone().add(0, 0.5, 0), 8, 0.2, 0.5, 0.2, 0.02);
} }
@@ -128,23 +277,24 @@ public class ParkourManager {
public void reachCheckpoint(Player player, int reachedIndex) { public void reachCheckpoint(Player player, int reachedIndex) {
int currentNext = nextCheckpointIndex.getOrDefault(player.getUniqueId(), 0); int currentNext = nextCheckpointIndex.getOrDefault(player.getUniqueId(), 0);
if (reachedIndex != currentNext) return;
if (reachedIndex == currentNext) {
List<Location> cps = getOrderedCheckpoints(); int track = activeTrack.getOrDefault(player.getUniqueId(), 1);
if (reachedIndex < cps.size()) { List<Location> cps = getOrderedCheckpoints(track);
lastCheckpointLoc.put(player.getUniqueId(), cps.get(reachedIndex)); if (reachedIndex >= cps.size()) return;
nextCheckpointIndex.put(player.getUniqueId(), reachedIndex + 1);
lastCheckpointLoc.put(player.getUniqueId(), cps.get(reachedIndex));
player.sendMessage("§8[§6Parkour§8] §bCheckpoint #" + (reachedIndex + 1) + " erreicht!"); nextCheckpointIndex.put(player.getUniqueId(), reachedIndex + 1);
player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 0.8f, 1.5f);
} player.sendMessage("§8[§6Parkour§8] §bCheckpoint #" + (reachedIndex + 1) + " erreicht!");
} player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 0.8f, 1.5f);
} }
public void finishParkour(Player player) { public void finishParkour(Player player) {
if (!startTime.containsKey(player.getUniqueId())) return; if (!startTime.containsKey(player.getUniqueId())) return;
if (nextCheckpointIndex.getOrDefault(player.getUniqueId(), 0) < getOrderedCheckpoints().size()) { int track = activeTrack.getOrDefault(player.getUniqueId(), 1);
if (nextCheckpointIndex.getOrDefault(player.getUniqueId(), 0) < getOrderedCheckpoints(track).size()) {
player.sendMessage("§cDu hast Checkpoints übersprungen! Folge den Partikeln."); player.sendMessage("§cDu hast Checkpoints übersprungen! Folge den Partikeln.");
return; return;
} }
@@ -153,12 +303,12 @@ public class ParkourManager {
double seconds = duration / 1000.0; double seconds = duration / 1000.0;
player.sendMessage("§8§m--------------------------------------"); player.sendMessage("§8§m--------------------------------------");
player.sendMessage("§8[§6Parkour§8] §a§lZiel erreicht!"); player.sendMessage("§8[§6Parkour§8] §a§lZiel erreicht! §8(Strecke " + track + ")");
player.sendMessage("§7Deine Zeit: §e" + String.format("%.2f", seconds) + "s"); player.sendMessage("§7Deine Zeit: §e" + String.format("%.2f", seconds) + "s");
player.sendMessage("§8§m--------------------------------------"); player.sendMessage("§8§m--------------------------------------");
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 1.0f); player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 1.0f);
saveBestTime(player, seconds); saveBestTime(player, seconds);
stopParkour(player); stopParkour(player);
} }
@@ -167,42 +317,12 @@ public class ParkourManager {
startTime.remove(player.getUniqueId()); startTime.remove(player.getUniqueId());
lastCheckpointLoc.remove(player.getUniqueId()); lastCheckpointLoc.remove(player.getUniqueId());
nextCheckpointIndex.remove(player.getUniqueId()); nextCheckpointIndex.remove(player.getUniqueId());
activeTrack.remove(player.getUniqueId());
} }
public void setStartLocation(Location loc) { config.set("locations.start", loc); save(); } // ─────────────────────────────────────────────────────────────────────────
public void setFinishLocation(Location loc) { config.set("locations.finish", loc); save(); } // Bestzeiten
public void addCheckpointLocation(String id, Location loc) { config.set("locations.checkpoints." + id, loc); save(); } // ─────────────────────────────────────────────────────────────────────────
public Location getStartLocation() { return config.getLocation("locations.start"); }
public Location getFinishLocation() { return config.getLocation("locations.finish"); }
public List<Location> getOrderedCheckpoints() {
if (!config.contains("locations.checkpoints") || config.getConfigurationSection("locations.checkpoints") == null)
return new ArrayList<>();
return config.getConfigurationSection("locations.checkpoints").getKeys(false).stream()
.sorted(Comparator.comparingInt(Integer::parseInt))
.map(key -> config.getLocation("locations.checkpoints." + key))
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
private void save() {
try {
config.save(file);
} catch (IOException e) {
plugin.getLogger().severe("Fehler beim Speichern der Parkour-Config: " + e.getMessage());
}
}
public void clearStats() {
config.set("besttimes", null);
config.set("names", null);
save();
}
public boolean isIngame(Player player) { return startTime.containsKey(player.getUniqueId()); }
public Location getCheckpoint(Player player) { return lastCheckpointLoc.get(player.getUniqueId()); }
private void saveBestTime(Player player, double time) { private void saveBestTime(Player player, double time) {
String path = "besttimes." + player.getUniqueId(); String path = "besttimes." + player.getUniqueId();
@@ -215,8 +335,19 @@ public class ParkourManager {
} }
} }
/**
* Löscht NUR die Bestzeiten-Liste (besttimes + names).
* Die Strecken-Konfiguration (tracks) bleibt vollständig erhalten.
* Wird durch "/nexus parkour clear" aufgerufen.
*/
public void clearStats() {
config.set("besttimes", null);
config.set("names", null);
save();
}
public String getTopTen() { public String getTopTen() {
if (!config.contains("besttimes") || config.getConfigurationSection("besttimes") == null) if (!config.contains("besttimes") || config.getConfigurationSection("besttimes") == null)
return "§6§l🏆 TOP 10 PARKOUR 🏆\n§7Noch keine Rekorde."; return "§6§l🏆 TOP 10 PARKOUR 🏆\n§7Noch keine Rekorde.";
Map<String, Double> allTimes = new HashMap<>(); Map<String, Double> allTimes = new HashMap<>();
@@ -233,9 +364,31 @@ public class ParkourManager {
int rank = 1; int rank = 1;
for (Map.Entry<String, Double> entry : sortedList) { for (Map.Entry<String, Double> entry : sortedList) {
String name = config.getString("names." + entry.getKey(), "Unbekannt"); String name = config.getString("names." + entry.getKey(), "Unbekannt");
builder.append("\n§e#").append(rank).append(" §f").append(name).append(" §8» §a").append(String.format("%.2f", entry.getValue())).append("s"); builder.append("\n§e#").append(rank).append(" §f").append(name)
.append(" §8» §a").append(String.format("%.2f", entry.getValue())).append("s");
rank++; rank++;
} }
return builder.toString(); return builder.toString();
} }
// ─────────────────────────────────────────────────────────────────────────
// Hilfsmethoden
// ─────────────────────────────────────────────────────────────────────────
public boolean isIngame(Player player) { return startTime.containsKey(player.getUniqueId()); }
public Location getCheckpoint(Player player) { return lastCheckpointLoc.get(player.getUniqueId()); }
/** Gibt die Strecken-Info als lesbaren String aus (für Admin-Feedback). */
public String getTrackInfo() {
StringBuilder sb = new StringBuilder("§8[§6Parkour§8] §7Track-Status:\n");
for (int t = 1; t <= 2; t++) {
int cps = getOrderedCheckpoints(t).size();
boolean ready = isTrackReady(t);
sb.append(" §eStrecke ").append(t).append(": ")
.append(ready ? "§a✔" : "§c✘")
.append(" §7(").append(cps).append(" Checkpoints)");
if (t < 2) sb.append("\n");
}
return sb.toString();
}
} }

2
src/main/resources/plugin.yml
View File

@@ -1,6 +1,6 @@
name: NexusLobby name: NexusLobby
main: de.nexuslobby.NexusLobby main: de.nexuslobby.NexusLobby
version: "1.1.3" version: "1.1.4"
api-version: "1.21" api-version: "1.21"
author: M_Viper author: M_Viper
description: Modular Lobby Plugin with an invisible Particle-Parkour system. description: Modular Lobby Plugin with an invisible Particle-Parkour system.