more stuff (tm)
This commit is contained in:
parent
e4e973449b
commit
7e171194ce
10 changed files with 45 additions and 43 deletions
|
|
@ -1,11 +1,10 @@
|
||||||
package de.lunarakai.minecleaner;
|
package de.lunarakai.minecleaner;
|
||||||
|
|
||||||
|
import de.lunarakai.minecleaner.utils.ChatUtils;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
|
@ -56,14 +55,13 @@ public class MinecleanerGroupManager {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
iteratorPlayer.sendMessage(Component.text("Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde.");
|
||||||
|
|
||||||
}
|
}
|
||||||
deleteGroup(getGroup(Bukkit.getPlayer(owner)));
|
deleteGroup(getGroup(Bukkit.getPlayer(owner)));
|
||||||
}
|
}
|
||||||
players.remove(playerUUID);
|
players.remove(playerUUID);
|
||||||
if(players.size() < 2) {
|
if(players.size() < 2) {
|
||||||
Bukkit.getPlayer(owner).sendMessage(Component.text("Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(Bukkit.getPlayer(owner), "Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist");
|
||||||
deleteGroup(getGroup(Bukkit.getPlayer(owner)));
|
deleteGroup(getGroup(Bukkit.getPlayer(owner)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
package de.lunarakai.minecleaner;
|
package de.lunarakai.minecleaner;
|
||||||
|
|
||||||
|
import de.lunarakai.minecleaner.utils.ChatUtils;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
|
|
@ -26,7 +25,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
import org.bukkit.inventory.EquipmentSlot;
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
import org.bukkit.util.RayTraceResult;
|
import org.bukkit.util.RayTraceResult;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
import net.md_5.bungee.api.ChatColor;
|
|
||||||
|
|
||||||
public class MinecleanerListener implements Listener {
|
public class MinecleanerListener implements Listener {
|
||||||
private final MinecleanerPlugin plugin;
|
private final MinecleanerPlugin plugin;
|
||||||
|
|
@ -121,7 +119,7 @@ public class MinecleanerListener implements Listener {
|
||||||
}
|
}
|
||||||
plugin.getManager().joinArena(players, arena);
|
plugin.getManager().joinArena(players, arena);
|
||||||
} else {
|
} else {
|
||||||
e.getPlayer().sendMessage(ChatColor.YELLOW + "Hier spielt schon jemand anderes");
|
ChatUtils.sendSimpleInfoMessage(e.getPlayer(), "Hier spielt schon jemand anderes");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -196,7 +194,7 @@ public class MinecleanerListener implements Listener {
|
||||||
if(arena != null) {
|
if(arena != null) {
|
||||||
if(plugin.getGroupManager().getGroup(player) == null) {
|
if(plugin.getGroupManager().getGroup(player) == null) {
|
||||||
if((arena.isTooFarAway(player))) {
|
if((arena.isTooFarAway(player))) {
|
||||||
player.sendMessage(ChatColor.YELLOW + "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
|
ChatUtils.sendSimpleInfoMessage(player, "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
|
||||||
Player[] players = new Player[] {
|
Player[] players = new Player[] {
|
||||||
player
|
player
|
||||||
};
|
};
|
||||||
|
|
@ -210,11 +208,11 @@ public class MinecleanerListener implements Listener {
|
||||||
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
if(iteratorPlayer == ownerPlayer) {
|
if(iteratorPlayer == ownerPlayer) {
|
||||||
iteratorPlayer.sendMessage(Component.text("Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
assert iteratorPlayer != null;
|
assert iteratorPlayer != null;
|
||||||
iteratorPlayer.sendMessage(Component.text("Der Ersteller der Gruppe hat sich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Der Ersteller der Gruppe hat sich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
|
||||||
}
|
}
|
||||||
Player[] players = new Player[] {
|
Player[] players = new Player[] {
|
||||||
ownerPlayer
|
ownerPlayer
|
||||||
|
|
@ -273,7 +271,7 @@ public class MinecleanerListener implements Listener {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
players[i] = iteratorPlayer;
|
players[i] = iteratorPlayer;
|
||||||
iteratorPlayer.sendMessage(Component.text(player.getName() + " hat den Server verlassen und wurde aus der Gruppe entfernt.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, player.getName() + " hat den Server verlassen und wurde aus der Gruppe entfernt.");
|
||||||
}
|
}
|
||||||
group.removePlayerFromGroup(player);
|
group.removePlayerFromGroup(player);
|
||||||
}
|
}
|
||||||
|
|
@ -288,7 +286,7 @@ public class MinecleanerListener implements Listener {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
players[i] = iteratorPlayer;
|
players[i] = iteratorPlayer;
|
||||||
iteratorPlayer.sendMessage(Component.text("Die " + plugin.getDisplayedPluginName() + "gruppe in der du dich befindest wurde aufgelöst. Die Person, welche die Gruppe erstellt hat, hat den Server verlassen", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Die " + plugin.getDisplayedPluginName() + "gruppe in der du dich befindest wurde aufgelöst. Die Person, welche die Gruppe erstellt hat, hat den Server verlassen");
|
||||||
}
|
}
|
||||||
groupManager.deleteGroup(group);
|
groupManager.deleteGroup(group);
|
||||||
return players;
|
return players;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package de.lunarakai.minecleaner;
|
package de.lunarakai.minecleaner;
|
||||||
|
|
||||||
import de.iani.cubesidestats.api.SettingKey;
|
import de.iani.cubesidestats.api.SettingKey;
|
||||||
|
import de.lunarakai.minecleaner.utils.ChatUtils;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
@ -209,10 +210,10 @@ public class MinecleanerManager {
|
||||||
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(players[0]).getPlayers().iterator(); iterator.hasNext();) {
|
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(players[0]).getPlayers().iterator(); iterator.hasNext();) {
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
assert iteratorPlayer != null;
|
assert iteratorPlayer != null;
|
||||||
iteratorPlayer.sendMessage(Component.text("Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
players[0].sendMessage(Component.text("Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(players[0], "Du hast eine neue Runde " + plugin.getDisplayedPluginName() + " gestartet.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -227,7 +228,7 @@ public class MinecleanerManager {
|
||||||
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player[0]).getPlayers().iterator(); iterator.hasNext();) {
|
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player[0]).getPlayers().iterator(); iterator.hasNext();) {
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
assert iteratorPlayer != null;
|
assert iteratorPlayer != null;
|
||||||
iteratorPlayer.sendMessage(Component.text("Game Over! Ihr konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!", NamedTextColor.YELLOW));
|
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Game Over! Ihr konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!");
|
||||||
if(plugin.isStatisticsEnabled()) {
|
if(plugin.isStatisticsEnabled()) {
|
||||||
|
|
||||||
PlayerStatistics ps = plugin.getCubesideStatistics().getStatistics(iteratorPlayer.getUniqueId());
|
PlayerStatistics ps = plugin.getCubesideStatistics().getStatistics(iteratorPlayer.getUniqueId());
|
||||||
|
|
@ -278,7 +279,7 @@ public class MinecleanerManager {
|
||||||
|
|
||||||
if(!isSuccessfullyCleared) {
|
if(!isSuccessfullyCleared) {
|
||||||
world.playSound(player[0].getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
|
world.playSound(player[0].getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
|
||||||
player[0].sendMessage(ChatColor.YELLOW + "Game Over! Du konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!");
|
ChatUtils.sendSimpleInfoMessage(player[0], "Game Over! Du konntest das " + plugin.getDisplayedPluginName() + "-Feld nicht erfolgreich lösen!");
|
||||||
arena.showMines();
|
arena.showMines();
|
||||||
|
|
||||||
if(sg != null && plugin.isStatisticsEnabled()) {
|
if(sg != null && plugin.isStatisticsEnabled()) {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.*;
|
||||||
import de.iani.cubesideutils.commands.ArgsParser;
|
import de.iani.cubesideutils.commands.ArgsParser;
|
||||||
import de.lunarakai.minecleaner.MinecleanerArena;
|
import de.lunarakai.minecleaner.MinecleanerArena;
|
||||||
import de.lunarakai.minecleaner.MinecleanerPlugin;
|
import de.lunarakai.minecleaner.MinecleanerPlugin;
|
||||||
import net.kyori.adventure.text.Component;
|
import de.lunarakai.minecleaner.utils.ChatUtils;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
|
|
@ -49,9 +49,9 @@ public class ListPlayersInArenaCommand extends SubCommand {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(arena != null) {
|
if(arena != null) {
|
||||||
player.sendMessage(Component.text("Players in Arena: " + Arrays.toString(arena.getCurrentPlayers()), NamedTextColor.GRAY));
|
ChatUtils.sendSimpleSpecialMessage(player, "Players in Arena: " + Arrays.toString(arena.getCurrentPlayers()), NamedTextColor.GRAY);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("Hier befindet sich keine Arena.", NamedTextColor.GRAY));
|
ChatUtils.sendSimpleSpecialMessage(player, "Hier befindet sich keine Arena.", NamedTextColor.GRAY);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,17 +43,17 @@ public class AcceptCommand extends SubCommand {
|
||||||
if(plugin.getGroupManager().getInvitedGroup(player) != null && plugin.getGroupManager().getGroup(player) == null) {
|
if(plugin.getGroupManager().getInvitedGroup(player) != null && plugin.getGroupManager().getGroup(player) == null) {
|
||||||
Player groupOwner = Bukkit.getPlayer(plugin.getGroupManager().getInvitedGroup(player).getOwner());
|
Player groupOwner = Bukkit.getPlayer(plugin.getGroupManager().getInvitedGroup(player).getOwner());
|
||||||
if(plugin.getArenaList().getPlayerArena(groupOwner) != null) {
|
if(plugin.getArenaList().getPlayerArena(groupOwner) != null) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du kannst keine Einladung annehmen während die Person, die dich eingeladen hat, in einer Runde ist.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du kannst keine Einladung annehmen während die Person, die dich eingeladen hat, in einer Runde ist.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
plugin.getGroupManager().getInvitedGroup(player).addPlayerToGroup(player);
|
plugin.getGroupManager().getInvitedGroup(player).addPlayerToGroup(player);
|
||||||
|
|
||||||
assert groupOwner != null;
|
assert groupOwner != null;
|
||||||
ChatUtils.sendSingleLineSuccessMessage(groupOwner, player.getName() + " hat deine Einladung angenommen.");
|
ChatUtils.sendSimpleSuccessMessage(groupOwner, player.getName() + " hat deine Einladung angenommen.");
|
||||||
ChatUtils.sendSingleLineSuccessMessage(player, "Du hast die Einladung angenommen");
|
ChatUtils.sendSimpleSuccessMessage(player, "Du hast die Einladung angenommen");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du wurdest in keine Gruppe eingeladen.");
|
ChatUtils.sendSimpleInfoMessage(player, "Du wurdest in keine Gruppe eingeladen.");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,11 +52,11 @@ public class DenyCommand extends SubCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
assert groupOwner != null;
|
assert groupOwner != null;
|
||||||
ChatUtils.sendSingleLineWarningMessage(groupOwner, player.getName() + " hat deine Einladung abgelehnt.");
|
ChatUtils.sendSimpleWarningMessage(groupOwner, player.getName() + " hat deine Einladung abgelehnt.");
|
||||||
ChatUtils.sendSingleLineInfoMessage(player, "Du hast die Einladung abgelehnt");
|
ChatUtils.sendSimpleInfoMessage(player, "Du hast die Einladung abgelehnt");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du wurdest in keine Gruppe eingeladen.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du wurdest in keine Gruppe eingeladen.");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,19 +43,19 @@ public class DismantleGroupCommand extends SubCommand {
|
||||||
public boolean onCommand(CommandSender commandSender, Command command, String s, String s1, ArgsParser argsParser) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
|
public boolean onCommand(CommandSender commandSender, Command command, String s, String s1, ArgsParser argsParser) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
|
||||||
Player player = (Player) commandSender;
|
Player player = (Player) commandSender;
|
||||||
if(plugin.getGroupManager().getGroup(player) == null) {
|
if(plugin.getGroupManager().getGroup(player) == null) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du bist in keiner Gruppe die du auflösen könntest.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du bist in keiner Gruppe die du auflösen könntest.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Player groupOwnerPlayer = Bukkit.getPlayer(plugin.getGroupManager().getGroup(player).getOwner());
|
Player groupOwnerPlayer = Bukkit.getPlayer(plugin.getGroupManager().getGroup(player).getOwner());
|
||||||
|
|
||||||
if(player != groupOwnerPlayer) {
|
if(player != groupOwnerPlayer) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du bist nicht berechtigt deine Gruppe aufzulösen.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du bist nicht berechtigt deine Gruppe aufzulösen.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
ChatUtils.sendSingleLineWarningMessage(iteratorPlayer, "Die Gruppe in der du dich befindest wurde aufgelöst.");
|
ChatUtils.sendSimpleWarningMessage(iteratorPlayer, "Die Gruppe in der du dich befindest wurde aufgelöst.");
|
||||||
}
|
}
|
||||||
plugin.getGroupManager().deleteGroup(plugin.getGroupManager().getGroup(player));
|
plugin.getGroupManager().deleteGroup(plugin.getGroupManager().getGroup(player));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,35 +51,40 @@ public class InviteCommand extends SubCommand {
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
|
|
||||||
if(plugin.getArenaList().getPlayerArena(player) != null) {
|
if(plugin.getArenaList().getPlayerArena(player) != null) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du kannst keine Einladung verschicken während du in einer Runde bist.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du kannst keine Einladung verschicken während du in einer Runde bist.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(args.remaining() < 1 || args.remaining() >= 2) {
|
if(args.remaining() < 1 || args.remaining() >= 2) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, commandString + getUsage());
|
ChatUtils.sendSimpleWarningMessage(player, commandString + getUsage());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
String playerName = args.getNext().trim();
|
String playerName = args.getNext().trim();
|
||||||
Player invitedPlayer = plugin.getServer().getPlayer(playerName);
|
Player invitedPlayer = plugin.getServer().getPlayer(playerName);
|
||||||
|
|
||||||
|
if(invitedPlayer == null) {
|
||||||
|
ChatUtils.sendSimpleWarningMessage(player, "Du kannst keine Person einladen, die entweder offline oder auf einen anderen Server ist.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if(invitedPlayer == player) {
|
if(invitedPlayer == player) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du kannst dich nicht selber in eine Gruppe einladen.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du kannst dich nicht selber in eine Gruppe einladen.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(plugin.getArenaList().getPlayerArena(invitedPlayer) != null) {
|
if(plugin.getArenaList().getPlayerArena(invitedPlayer) != null) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du kannst Spieler nicht einladen, die bereits in einer Runde sind.");
|
ChatUtils.sendSimpleWarningMessage(player, "Du kannst Spieler nicht einladen, die bereits in einer Runde sind.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MinecleanerGroupManager groupManager = plugin.getGroupManager();
|
MinecleanerGroupManager groupManager = plugin.getGroupManager();
|
||||||
if(groupManager.getInvitedGroup(player) != null) {
|
if(groupManager.getInvitedGroup(player) != null) {
|
||||||
ChatUtils.sendSingleLineInfoMessage(player, "Du wurdest bereits in eine Gruppe eingeladen. Bitte kümmere dich zuerst um die Einladung bevor du eine eigene Gruppe erstellst.");
|
ChatUtils.sendSimpleInfoMessage(player, "Du wurdest bereits in eine Gruppe eingeladen. Bitte kümmere dich zuerst um die Einladung bevor du eine eigene Gruppe erstellst.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(groupManager.getGroup(player) != null && !Bukkit.getPlayer(groupManager.getGroup(player).getOwner()).equals(player)) {
|
if(groupManager.getGroup(player) != null && !Bukkit.getPlayer(groupManager.getGroup(player).getOwner()).equals(player)) {
|
||||||
ChatUtils.sendSingleLineInfoMessage(player, "Nur als Ersteller der Gruppe bist du berechtigt Leute einzuladen.");
|
ChatUtils.sendSimpleInfoMessage(player, "Nur als Ersteller der Gruppe bist du berechtigt Leute einzuladen.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,11 +45,11 @@ public class ListGroupMembersCommand extends SubCommand {
|
||||||
Player player = (Player) commandSender;
|
Player player = (Player) commandSender;
|
||||||
|
|
||||||
if(plugin.getGroupManager().getGroup(player) == null) {
|
if(plugin.getGroupManager().getGroup(player) == null) {
|
||||||
ChatUtils.sendSingleLineWarningMessage(player, "Du bist in keiner Gruppe.");
|
ChatUtils.sendSimpleInfoMessage(player, "Du bist in keiner Gruppe.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ChatUtils.sendSingleLineSpecialMessage(player, "-- Mitglieder deiner " + plugin.getDisplayedPluginName() + "gruppe --", NamedTextColor.AQUA);
|
ChatUtils.sendSimpleSpecialMessage(player, "-- Mitglieder deiner " + plugin.getDisplayedPluginName() + "gruppe --", NamedTextColor.AQUA);
|
||||||
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
|
||||||
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
|
||||||
String ownerString = "";
|
String ownerString = "";
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
|
||||||
public class ChatUtils {
|
public class ChatUtils {
|
||||||
static Pattern langKeyPattern = Pattern.compile("^\\w+\\.\\w+\\.\\w+$");
|
static Pattern langKeyPattern = Pattern.compile("^\\w+\\.\\w+\\.\\w+$");
|
||||||
|
|
||||||
public static void sendSingleLineSuccessMessage(Player player, String message) {
|
public static void sendSimpleSuccessMessage(Player player, String message) {
|
||||||
if(message.matches(langKeyPattern.pattern())) {
|
if(message.matches(langKeyPattern.pattern())) {
|
||||||
player.sendMessage(Component.translatable(message, NamedTextColor.GREEN));
|
player.sendMessage(Component.translatable(message, NamedTextColor.GREEN));
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -16,7 +16,7 @@ public class ChatUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSingleLineInfoMessage(Player player, String message) {
|
public static void sendSimpleInfoMessage(Player player, String message) {
|
||||||
if(message.matches(langKeyPattern.pattern())) {
|
if(message.matches(langKeyPattern.pattern())) {
|
||||||
player.sendMessage(Component.translatable(message, NamedTextColor.GOLD));
|
player.sendMessage(Component.translatable(message, NamedTextColor.GOLD));
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -24,7 +24,7 @@ public class ChatUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSingleLineWarningMessage(Player player, String message) {
|
public static void sendSimpleWarningMessage(Player player, String message) {
|
||||||
if(message.matches(langKeyPattern.pattern())) {
|
if(message.matches(langKeyPattern.pattern())) {
|
||||||
player.sendMessage(Component.translatable(message, NamedTextColor.DARK_RED));
|
player.sendMessage(Component.translatable(message, NamedTextColor.DARK_RED));
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -32,7 +32,7 @@ public class ChatUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSingleLineSpecialMessage(Player player, String message, NamedTextColor color) {
|
public static void sendSimpleSpecialMessage(Player player, String message, NamedTextColor color) {
|
||||||
if(message.matches(langKeyPattern.pattern())) {
|
if(message.matches(langKeyPattern.pattern())) {
|
||||||
player.sendMessage(Component.translatable(message, color));
|
player.sendMessage(Component.translatable(message, color));
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue