a little bit of refactoring

.gitignore

@@ -114,3 +114,9 @@ buildNumber.properties
 
 # Common working directory
 run/
+
+# eclipse
+/.classpath
+/.project
+/.settings
+/target

pom.xml

@@ -86,7 +86,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.6-R0.1-SNAPSHOT</version>
+            <version>1.21.3-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/de/lunarakai/minecleaner/ArenaList.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.UUID;
 import java.util.logging.Level;
+import de.lunarakai.minecleaner.utils.MinecleanerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -100,6 +101,13 @@ public class ArenaList {
         save();
     }
 
+    /**
+     * checks for any other arena that might be at the same location as the new MinecleanerArena
+     *
+     * @param newArena  the new Arena that is set to be created
+     * @return          true if another MinecleanerArena (or at least one Block of another arena) is at the same location as newArena otherwise false
+     * @see             MinecleanerArena
+     */
     public boolean collidesWithArena(MinecleanerArena newArena) {
         for(Location location : newArena.getBlocks()) {
             if(arenaBlocks.get(location) != null) {
@@ -125,7 +133,7 @@ public class ArenaList {
         if(playersInArena.get(player.getUniqueId()) == null) {
             return null;
         }
-        int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+        int arraySize = MinecleanerUtils.isPlayerInGroup(plugin, player) ? plugin.getGroupManager().getGroupSize(player) : 1;
         Player[] players = new Player[arraySize];
 
         if(plugin.getGroupManager().getGroup(player) != null) {
@@ -192,17 +200,26 @@ public class ArenaList {
             plugin.getManager().leaveArena(arena.getCurrentPlayers(), true, true);
         }
 
-        for(UUID id : arena.getBlockDisplays()) {
+        removeArenaBlockDisplayIDs(arena);
-            if(id != null) {
+        removeArenaBlocks(arena);
-                arenaBlockDisplays.remove(id);
+
-            }
-        }
-        for(Location block : arena.getBlocks()) { 
-            arenaBlocks.remove(block);
-        }
         arena.removeBlockDisplays();
 
         arenas.remove(arena.getName());
         save();
     }
+
+    private void removeArenaBlocks(MinecleanerArena arena) {
+        for(Location block : arena.getBlocks()) {
+            arenaBlocks.remove(block);
+        }
+    }
+
+    private void removeArenaBlockDisplayIDs(MinecleanerArena arena) {
+        for(UUID id : arena.getBlockDisplays()) {
+            if(id != null) {
+                arenaBlockDisplays.remove(id);
+            }
+        }
+    }
 } 

src/main/java/de/lunarakai/minecleaner/ArenaStatus.java

@@ -1,8 +1,35 @@
 package de.lunarakai.minecleaner;
 
+/**
+ *  Possible Status of a MinecleanerArena
+ *  <li>{@link #INACTIVE}</li>
+ *  <li>{@link #CONFIRM_PLAYING}</li>
+ *  <li>{@link #PLAYING}</li>
+ *  <li>{@link #COMPLETED}</li>
+ *
+ * @see MinecleanerArena
+ *
+ */
 public enum ArenaStatus {
+    /**
+     * default state
+     */
     INACTIVE,
+
+    /**
+     * Active when the player (or group leader) has interacted with an {@link #INACTIVE} arena and
+     * sees the confirmPlayingInventory to decide if they start a Game or not
+     * @see MinecleanerManager#getConfirmPlayingInventory()
+     */
     CONFIRM_PLAYING,
+
+    /**
+     * Active when a Player (or Group) has confirmed to start a Minecleaner Game (and while playing)
+     */
     PLAYING,
+
+    /**
+     * Active when a Player (or Group) has either won or lost a Mineclenaer Game and the Arena the scheduled for a reset -> {@link #INACTIVE}
+     */
     COMPLETED
 }

src/main/java/de/lunarakai/minecleaner/MinecleanerGroupManager.java

@@ -1,11 +1,10 @@
 package de.lunarakai.minecleaner;
 
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.UUID;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -56,14 +55,13 @@ public class MinecleanerGroupManager {
                         continue;
                     }
                     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, "group.creator.removed");
-
                 }
                 deleteGroup(getGroup(Bukkit.getPlayer(owner)));
             }
             players.remove(playerUUID);
             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), "group.dismantled.alone");
                 deleteGroup(getGroup(Bukkit.getPlayer(owner)));
             }
         }
@@ -118,6 +116,12 @@ public class MinecleanerGroupManager {
         return null;
     }
 
+    /**
+     *  loops through all MinecleanerGroups to check if the player is invited to any group
+     *
+     * @param player    Minecraft Player
+     * @return          the MinecleanerGroup the Player is invited to or null
+     */
     public MinecleanerGroup getInvitedGroup(Player player){
         UUID playerUUID = player.getUniqueId();
         for (MinecleanerGroup group : groups) {
@@ -132,7 +136,20 @@ public class MinecleanerGroupManager {
         groups.remove(minecleanerGroup);
     }
 
+    /**
+     * removes all MinecleanerGroups
+     */
     public void deleteAllGroups() {
         groups.clear();
     }
+
+    /**
+     * Returns the size of the MinecleanerGroup the player is in
+     *
+     * @param player    the Minecraft Player
+     * @return          the size of the group the player is in
+     */
+    public int getGroupSize(Player player) {
+        return getGroup(player).getPlayers().size();
+    }
 }

src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java

@@ -1,10 +1,10 @@
 package de.lunarakai.minecleaner;
 
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.UUID;
-import net.kyori.adventure.text.Component;
+import java.util.logging.Level;
-import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -25,7 +25,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
-import net.md_5.bungee.api.ChatColor;
 
 public class MinecleanerListener implements Listener {
     private final MinecleanerPlugin plugin;
@@ -93,6 +92,7 @@ public class MinecleanerListener implements Listener {
                     }
                 } else if(arena.hasPlayers() && arena.getArenaStatus() == ArenaStatus.COMPLETED && !hasRightClicked && (plugin.getManager().getSettingsValue("allowmanualreset", e.getPlayer()) == 1)) {
                     plugin.getManager().getSchedulerGameOver().cancel();
+                    plugin.getLogger().log(Level.INFO, "canceled reset for arena " + arena.getName() + " loc: " + arena.getLocation());
                     plugin.getManager().leaveArena(arenaClicked.getCurrentPlayers(), false, true);
                 }
             } else {
@@ -105,6 +105,11 @@ public class MinecleanerListener implements Listener {
                             if(plugin.getGroupManager().getGroup(e.getPlayer()) != null) {
                                 arraySize = plugin.getGroupManager().getGroup(e.getPlayer()).getPlayers().size();
                             }
+
+                            if(plugin.getGroupManager().getGroup(e.getPlayer()) != null && plugin.getGroupManager().getGroup(e.getPlayer()).getOwner() != e.getPlayer().getUniqueId()) {
+                                ChatUtils.sendSimpleWarningMessage(e.getPlayer(), "group.game.nopermission");
+                                return;
+                            }
                             Player[] players = new Player[arraySize];
 
                             if(plugin.getGroupManager().getGroup(e.getPlayer()) != null) {
@@ -119,7 +124,7 @@ public class MinecleanerListener implements Listener {
                             }
                             plugin.getManager().joinArena(players, arena);
                         } else {
-                            e.getPlayer().sendMessage(ChatColor.YELLOW + "Hier spielt schon jemand anderes");
+                            ChatUtils.sendSimpleInfoMessage(e.getPlayer(), "Hier spielt schon jemand anderes");
                         }
                     }
                 }
@@ -147,7 +152,7 @@ public class MinecleanerListener implements Listener {
                         if(hasConfirmed) {
                             Player[] players;
                             if(plugin.getGroupManager().getGroup(player) != null) {
-                                players = new Player[plugin.getGroupManager().getGroup(player).getPlayers().size()];
+                                players = new Player[plugin.getGroupManager().getGroupSize(player)];
                                 players[0] = player;
                             } else {
                                 players = new Player[1];
@@ -170,7 +175,7 @@ public class MinecleanerListener implements Listener {
             MinecleanerArena arena = plugin.getArenaList().getPlayerArena(player);
             if(arena != null) {
                 if(arena.getArenaStatus() == ArenaStatus.CONFIRM_PLAYING && e.getInventory().equals(plugin.getManager().getConfirmPlayingInventory())) {
-                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroupSize(player) : 1;
                     Player[] players = new Player[arraySize];
 
                     if(plugin.getGroupManager().getGroup(player) != null) {
@@ -194,7 +199,7 @@ public class MinecleanerListener implements Listener {
         if(arena != null) {
             if(plugin.getGroupManager().getGroup(player) == null) {
                 if((arena.isTooFarAway(player))) {
-                    player.sendMessage(ChatColor.YELLOW + "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.");
+                    ChatUtils.sendSimpleInfoMessage(player, "arena.common.toofaraway");
                     Player[] players = new Player[] {
                             player
                     };
@@ -208,11 +213,11 @@ public class MinecleanerListener implements Listener {
                         for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
                             Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
                             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, "arena.common.toofaraway");
                                 continue;
                             }
                             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, "arena.common.groupleadertoofaraway");
                         }
                         Player[] players = new Player[] {
                                 ownerPlayer
@@ -271,7 +276,7 @@ public class MinecleanerListener implements Listener {
                 continue;
             }
             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);
     }
@@ -286,7 +291,7 @@ public class MinecleanerListener implements Listener {
                 continue;
             }
             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);
         return players;

src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java

@@ -1,6 +1,7 @@
 package de.lunarakai.minecleaner;
 
 import de.iani.cubesidestats.api.SettingKey;
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -10,6 +11,7 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.logging.Level;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -34,8 +36,8 @@ import de.iani.cubesideutils.bukkit.items.ItemStacks;
 import de.iani.playerUUIDCache.CachedPlayer;
 import de.lunarakai.minecleaner.game.BoardSize;
 import de.lunarakai.minecleaner.utils.MinecleanerStringUtil;
-import net.md_5.bungee.api.ChatColor;
 
+// Todo: translatable components verwenden
 public class MinecleanerManager {
     private final MinecleanerPlugin plugin;
     private final Inventory confirmPlayingInventory;
@@ -67,10 +69,8 @@ public class MinecleanerManager {
         this.sizes.put(3, "experte");
 
         this.confirmPlayingInventory = plugin.getServer().createInventory(null, InventoryType.HOPPER, plugin.getDisplayedPluginName() + " starten?");
-        this.confirmPlayingInventory.setItem(1,
+        this.confirmPlayingInventory.setItem(1, ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), NamedTextColor.GREEN + "Bestätigen"));
-            ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), ChatColor.GREEN + "Bestätigen")));
+        this.confirmPlayingInventory.setItem(3, ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), NamedTextColor.RED + "Abbrechen"));
-        this.confirmPlayingInventory.setItem(3,
-            ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.RED_CONCRETE), ChatColor.RED + "Abbrechen")));
 
         // Settings
 
@@ -158,18 +158,11 @@ public class MinecleanerManager {
     }
 
     public void leaveArena(Player[] players, boolean message, boolean reset) {
-        MinecleanerGroupManager.MinecleanerGroup group = null;
+        getGroupLeaderOrPlayer player = getGetGroupLeaderOrPlayer(players);
-        MinecleanerArena arena;
+        Player[] players1 = player.group() != null ? new Player[player.group().getPlayers().size()] : new Player[1];
-        if(plugin.getGroupManager().getGroup(players[0]) != null) {
-            group = plugin.getGroupManager().getGroup(players[0]);
-            arena = plugin.getArenaList().getPlayerArena(Objects.requireNonNull(Bukkit.getPlayer(group.getOwner())));
-        } else {
-            arena = plugin.getArenaList().getPlayerArena(players);
-        }
-        Player[] players1 = group != null ? new Player[group.getPlayers().size()] : new Player[1];
         if(plugin.getGroupManager().getGroup(players[0]) != null) {
             int i = 0;
-            for(Iterator<UUID> iterator = group.getPlayers().iterator(); iterator.hasNext();) {
+            for(Iterator<UUID> iterator = player.group().getPlayers().iterator(); iterator.hasNext();) {
                 Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
                 players1[i] = iteratorPlayer;
                 i++;
@@ -178,17 +171,17 @@ public class MinecleanerManager {
             players1 = players;
         }
 
-        Preconditions.checkArgument(arena != null, "player is in no arena");
+        Preconditions.checkArgument(player.arena() != null, "player is in no arena");
 
         if(reset) {
-            arena.setArenaStaus(ArenaStatus.INACTIVE);
+            player.arena().setArenaStaus(ArenaStatus.INACTIVE);
             for(int i = 0; i < players1.length; i++) {
                 players1[i].closeInventory();
             }
-            arena.removePlayers();
+            player.arena().removePlayers();
             if(message) {
                 for(int i = 0; i < players.length; i++) {
-                    players1[i].sendMessage(ChatColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen.");
+                    players1[i].sendMessage(NamedTextColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen.");
                 }
             }
         }
@@ -196,6 +189,21 @@ public class MinecleanerManager {
         plugin.getArenaList().setArenaForPlayers(players1, null);
     }
 
+    private @NotNull getGroupLeaderOrPlayer getGetGroupLeaderOrPlayer(Player[] players) {
+        MinecleanerGroupManager.MinecleanerGroup group = null;
+        MinecleanerArena arena;
+        if(plugin.getGroupManager().getGroup(players[0]) != null) {
+            group = plugin.getGroupManager().getGroup(players[0]);
+            arena = plugin.getArenaList().getPlayerArena(Objects.requireNonNull(Bukkit.getPlayer(group.getOwner())));
+        } else {
+            arena = plugin.getArenaList().getPlayerArena(players);
+        }
+        return new getGroupLeaderOrPlayer(group, arena);
+    }
+
+    private record getGroupLeaderOrPlayer(MinecleanerGroupManager.MinecleanerGroup group, MinecleanerArena arena) {
+    }
+
 
     public void startGame(Player[] players) {
         MinecleanerArena arena = plugin.getArenaList().getPlayerArena(players);
@@ -208,10 +216,10 @@ public class MinecleanerManager {
             for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(players[0]).getPlayers().iterator(); iterator.hasNext();) {
                 Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
                 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 {
-            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.");
         }
     }
 
@@ -219,14 +227,14 @@ public class MinecleanerManager {
 
         if(plugin.getGroupManager().getGroup(player[0]) != null) {
             World world = player[0].getWorld();
+            MinecleanerGroupManager.MinecleanerGroup group = plugin.getGroupManager().getGroup(player[0]);
 
             if(!isSuccessfullyCleared) {
-                world.playSound(player[0].getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
+                world.playSound(Bukkit.getPlayer(group.getOwner()).getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.5f, 0.5f);
-
                 for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player[0]).getPlayers().iterator(); iterator.hasNext();) {
                         Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
                     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()) {
 
                         PlayerStatistics ps = plugin.getCubesideStatistics().getStatistics(iteratorPlayer.getUniqueId());
@@ -240,17 +248,19 @@ public class MinecleanerManager {
             }
 
             int millis = (int) (System.currentTimeMillis() - arena.getCurrentGameStartTime());
-            world.playSound(player[0].getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.5f, 0.5f);
-            MinecleanerGroupManager.MinecleanerGroup group = plugin.getGroupManager().getGroup(player[0]);
 
+
+            world.playSound(Bukkit.getPlayer(group.getOwner()).getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.5f, 0.5f);
             for(UUID currentPlayer : group.getPlayers()) {
 
                 Player iteratorPlayer = Bukkit.getPlayer(currentPlayer);
-                if(iteratorPlayer != null)
+                if(iteratorPlayer != null) {
                     iteratorPlayer.sendMessage(Component.text(
                                     "Glückwunsch, ihr konntet das " + plugin.getDisplayedPluginName() + "-Feld in ", NamedTextColor.YELLOW)
                             .append(Component.text(MinecleanerStringUtil.timeToString(millis, false), NamedTextColor.RED))
                             .append(Component.text(" erfolgreich lösen!", NamedTextColor.YELLOW)));
+                }
+
 
                 if(!plugin.isStatisticsEnabled())
                     continue;
@@ -277,7 +287,7 @@ public class MinecleanerManager {
 
         if(!isSuccessfullyCleared) {
             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();
             
             if(sg != null && plugin.isStatisticsEnabled()) {
@@ -306,9 +316,9 @@ public class MinecleanerManager {
             if(sg != null) {
                 ps.minScore(sg, millis, isUpdated -> {
                     if(isUpdated != null && isUpdated) {
-                        player[0].sendMessage(ChatColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) );
+                        player[0].sendMessage(NamedTextColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) );
                     } else {
-                        player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
+                        player[0].sendMessage(NamedTextColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) + NamedTextColor.YELLOW + " erfolgreich lösen!");
                     }
                 });
             }
@@ -316,7 +326,7 @@ public class MinecleanerManager {
             int wIndex = arena.getWidthIndex();
             increaseScore(wIndex, ps, 1);
         } else {
-            player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!");
+            player[0].sendMessage(NamedTextColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) + NamedTextColor.YELLOW + " erfolgreich lösen!");
         }
 
         scheduleArenaReset(player[0], arena);
@@ -348,12 +358,16 @@ public class MinecleanerManager {
     }
 
     private void scheduleArenaReset(Player player, MinecleanerArena arena) {
+        plugin.getLogger().log(Level.INFO, "scheduled reset for arena '" + arena.getName() + "', loc: " + arena.getLocation() + " ArenaStatus: " + arena.getArenaStatus() + " in " + plugin.getManager().getSettingsValue("resettime", player) * 20 + " ticks. Current Players: " + Arrays.toString(arena.getCurrentPlayers()));
+        Bukkit.getScheduler().runTaskLater(plugin, () -> {
+            plugin.getLogger().log(Level.INFO, "ArenaStatus for arena '" + arena.getName() + "', loc: " + arena.getLocation() + " after 5 Ticks (should be completed): " + arena.getArenaStatus());
+        }, 5L);
         schedulerGameOver = Bukkit.getScheduler().runTaskLater(plugin, () -> {
             if(arena.getArenaStatus() == ArenaStatus.COMPLETED) {
                 if (arena.getCurrentPlayers() == null) {
                     arena.removePlayers();
                 } else {
-                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroup(player).getPlayers().size() : 1;
+                    int arraySize = plugin.getGroupManager().getGroup(player) != null ? plugin.getGroupManager().getGroupSize(player) : 1;
                     Player[] players = new Player[arraySize];
                     int i = 0;
                     if(plugin.getGroupManager().getGroup(player) != null) {

src/main/java/de/lunarakai/minecleaner/MinecleanerPlugin.java

@@ -4,6 +4,7 @@ package de.lunarakai.minecleaner;
 import de.lunarakai.minecleaner.commands.CreateCommand;
 import de.lunarakai.minecleaner.commands.DeleteCommand;
 import de.lunarakai.minecleaner.commands.DeletePlayerScoreCommand;
+import de.lunarakai.minecleaner.commands.HelpCommand;
 import de.lunarakai.minecleaner.commands.InfoCommand;
 import de.lunarakai.minecleaner.commands.ListCommand;
 import de.lunarakai.minecleaner.commands.ListPlayersInArenaCommand;
@@ -22,7 +23,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import de.iani.cubesidestats.api.CubesideStatisticsAPI;
 import de.iani.cubesideutils.bukkit.commands.CommandRouter;
 import de.iani.playerUUIDCache.PlayerUUIDCache;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
@@ -56,17 +56,9 @@ public final class MinecleanerPlugin extends JavaPlugin {
     }
 
     public void onLateEnable() {
-        if(getServer().getPluginManager().getPlugin("PlayerUUIDCache") != null) {
+        checkForPlayerUUIDChache();
-            playerUUIDCache = (PlayerUUIDCache) getServer().getPluginManager().getPlugin("PlayerUUIDCache");
-        } else {
-            this.getLogger().log(Level.WARNING, "PlayerUUIDCache not found.");
-        }
 
-        if(getServer().getPluginManager().getPlugin("CubesideStatistics") != null) {
+        checkForCubesideStatistics();
-            cubesideStatistics = getServer().getServicesManager().load(CubesideStatisticsAPI.class);
-        } else {
-            this.getLogger().log(Level.WARNING, "Cubeside Statistics not found. No Statistics will be available");
-        }
 
         arenaList = new ArenaList(this);
         arenaList.load();
@@ -81,6 +73,7 @@ public final class MinecleanerPlugin extends JavaPlugin {
         minecleanerCommand.addCommandMapping(new ListCommand(this), "list");
         minecleanerCommand.addCommandMapping(new InfoCommand(this), "info");
         minecleanerCommand.addCommandMapping(new ListPlayersInArenaCommand(this), "currentplayers");
+        minecleanerCommand.addCommandMapping(new HelpCommand(this), "help");
 
         // Groups
         minecleanerCommand.addCommandMapping(new InviteCommand(this), "invite");
@@ -89,6 +82,10 @@ public final class MinecleanerPlugin extends JavaPlugin {
         minecleanerCommand.addCommandMapping(new DismantleGroupCommand(this), "dismantlegroup");
         minecleanerCommand.addCommandMapping(new ListGroupMembersCommand(this), "groupmembers");
 
+        enableCubesideStatisticsCommands(minecleanerCommand);
+    }
+
+    private void enableCubesideStatisticsCommands(CommandRouter minecleanerCommand) {
         if(isStatisticsEnabled()) {
             minecleanerCommand.addCommandMapping(new SettingsCommand(this), "settings");
             minecleanerCommand.addCommandMapping(new StatsCommand(this), "stats");
@@ -96,6 +93,22 @@ public final class MinecleanerPlugin extends JavaPlugin {
         }
     }
 
+    private void checkForCubesideStatistics() {
+        if(getServer().getPluginManager().getPlugin("CubesideStatistics") != null) {
+            cubesideStatistics = getServer().getServicesManager().load(CubesideStatisticsAPI.class);
+        } else {
+            this.getLogger().log(Level.WARNING, "Cubeside Statistics not found. No Statistics will be available");
+        }
+    }
+
+    private void checkForPlayerUUIDChache() {
+        if(getServer().getPluginManager().getPlugin("PlayerUUIDCache") != null) {
+            playerUUIDCache = (PlayerUUIDCache) getServer().getPluginManager().getPlugin("PlayerUUIDCache");
+        } else {
+            this.getLogger().log(Level.WARNING, "PlayerUUIDCache not found.");
+        }
+    }
+
     @Override
     public void onDisable() {
         if(minecleanerManager != null) {

src/main/java/de/lunarakai/minecleaner/MinecleanerSettingsInventory.java

@@ -2,7 +2,8 @@ package de.lunarakai.minecleaner;
 
 import de.iani.cubesideutils.bukkit.inventory.AbstractWindow;
 import de.lunarakai.minecleaner.utils.ItemUtil;
-import net.md_5.bungee.api.ChatColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -35,28 +36,28 @@ public class MinecleanerSettingsInventory extends AbstractWindow {
             switch (i) {
                 case SETTINGS_ALLOW_MANUEL_RESET -> {
                     if (plugin.getManager().getSettingsValue("allowmanualreset", player) == 0) {
-                        item = ItemUtil.createGuiItem(Material.SHEARS, ChatColor.RED + "Manuelles Resetten deaktiviert");
+                        item = ItemUtil.createGuiItem(Material.SHEARS, Component.translatable("settings.manualreset.deny", NamedTextColor.RED));
                     } else {
-                        item = ItemUtil.createGuiItem(Material.SHEARS, ChatColor.GREEN + "Manuelles Resetten aktiviert");
+                        item = ItemUtil.createGuiItem(Material.SHEARS, Component.translatable("settings.manualreset.allow", NamedTextColor.GREEN));
                     }
                 }
                 case SETTINGS_ADDITIONAL_DISPLAY -> {
                     if (plugin.getManager().getSettingsValue("additionaldisplay", player) == 0) {
-                        item = ItemUtil.createGuiItem(Material.NAME_TAG, ChatColor.RED + "Zusätzliche Anzeige in der Action Bar deaktiviert\"");
+                        item = ItemUtil.createGuiItem(Material.NAME_TAG, Component.translatable("settings.additionaltimer.deny", NamedTextColor.RED));
                     } else {
-                        item = ItemUtil.createGuiItem(Material.NAME_TAG, ChatColor.GREEN + "Zusätzliche Anzeige in der Action Bar aktiviert\"");
+                        item = ItemUtil.createGuiItem(Material.NAME_TAG, Component.translatable("settings.additionaltimer.allow", NamedTextColor.GREEN));
                     }
                 }
                 case SETTINGS_TIMER -> {
                     if (plugin.getManager().getSettingsValue("timer", player) == 0) {
-                        item = ItemUtil.createGuiItem(Material.CLOCK, ChatColor.RED + "Timer wird nicht angezeigt");
+                        item = ItemUtil.createGuiItem(Material.CLOCK, Component.translatable("settings.timer.deny", NamedTextColor.RED));
                     } else {
-                        item = ItemUtil.createGuiItem(Material.CLOCK, ChatColor.GREEN + "Timer wird angezeigt");
+                        item = ItemUtil.createGuiItem(Material.CLOCK, Component.translatable("settings.timer.allow", NamedTextColor.GREEN));
                     }
                 }
                 case SETTINGS_RESETTIME -> {
                     int current = plugin.getManager().getSettingsValue("resettime", player);
-                    item = ItemUtil.createGuiItem(Material.CANDLE, ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + current + "s");
+                    item = ItemUtil.createGuiItem(Material.CANDLE, Component.translatable("settings.resettime.text", NamedTextColor.GOLD).append(Component.text(": ")).append(Component.text(current, NamedTextColor.RED)).append(Component.text(" s", NamedTextColor.RED)));
                 }
                 default -> item = ItemUtil.EMPTY_ICON;
             }

src/main/java/de/lunarakai/minecleaner/commands/HelpCommand.java

@@ -0,0 +1,88 @@
+package de.lunarakai.minecleaner.commands;
+
+import de.iani.cubesideutils.bukkit.commands.SubCommand;
+import de.iani.cubesideutils.bukkit.commands.exceptions.DisallowsCommandBlockException;
+import de.iani.cubesideutils.bukkit.commands.exceptions.IllegalSyntaxException;
+import de.iani.cubesideutils.bukkit.commands.exceptions.InternalCommandException;
+import de.iani.cubesideutils.bukkit.commands.exceptions.NoPermissionException;
+import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
+import de.iani.cubesideutils.commands.ArgsParser;
+import de.lunarakai.minecleaner.MinecleanerPlugin;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class HelpCommand extends SubCommand {
+    MinecleanerPlugin plugin;
+
+    public HelpCommand(MinecleanerPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public String getUsage() {
+        return "[(empty)|group]";
+    }
+
+    @Override
+    public boolean requiresPlayer() {
+        return true;
+    }
+
+    @Override
+    public String getRequiredPermission() {
+        return MinecleanerPlugin.PERMISSION_PLAY;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String commandString, ArgsParser args) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
+        Player player = (Player) commandSender;
+
+        String subMenu = "";
+        if(args.remaining() == 1) {
+             subMenu = args.getNext().toLowerCase().trim();
+        }
+
+        if(subMenu.equals("group")) {
+            showHelpGroup(player);
+            return true;
+        } else {
+            showGeneralHelp(player);
+            return true;
+        }
+    }
+
+    private void showGeneralHelp(Player player) {
+        player.sendMessage(Component.text("--- " + plugin.getDisplayedPluginName() + " Help ---", NamedTextColor.AQUA)
+                .append(Component.newline())
+                .append(Component.text("  /... info: ", NamedTextColor.BLUE))
+                .append(Component.text("Allgemeine Auskunft zum Plugin", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... stats [playername]: ", NamedTextColor.BLUE))
+                .append(Component.text("Zeigt dir entweder deine eigenen Stats (leer lassen) oder die Stats anderer Spieler an", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... settings: ", NamedTextColor.BLUE))
+                .append(Component.text("Öffnet ein Menü in dem du Veränderungen an deinen eigenen Einstellungen für " + plugin.getDisplayedPluginName() + " vornehmen kannst", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... help [group]: ", NamedTextColor.BLUE))
+                .append(Component.text("Zeigt dieses Menü (frei lassen) oder die Hilfe für Gruppen an (group)", NamedTextColor.GREEN)));
+    }
+
+    private void showHelpGroup(Player player) {
+        player.sendMessage(Component.text("--- " + plugin.getDisplayedPluginName() + " Group Help ---", NamedTextColor.AQUA)
+                .append(Component.newline())
+                .append(Component.text("  /... invite <playername>: ", NamedTextColor.BLUE))
+                .append(Component.text("Lädt andere Spieler zu deiner " + plugin.getDisplayedPluginName() + " Gruppe ein", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... accept | deny: ", NamedTextColor.BLUE))
+                .append(Component.text("Nehme eine erhaltene Einladung an (accept), oder lehne sie ab (deny)", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... dismantlegroup: ", NamedTextColor.BLUE))
+                .append(Component.text("Löst die Gruppe, die du erstellt hast, auf", NamedTextColor.GREEN))
+                .append(Component.newline())
+                .append(Component.text("  /... groupmembers: ", NamedTextColor.BLUE))
+                .append(Component.text("Listet die Mitglieder deiner Gruppe auf", NamedTextColor.GREEN)));
+    }
+}

src/main/java/de/lunarakai/minecleaner/commands/ListCommand.java

@@ -44,7 +44,7 @@ public class ListCommand extends SubCommand{
 
     @Override
     public boolean onCommand(CommandSender sender, Command arg1, String arg2, String commandString, ArgsParser args) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
-        sender.sendMessage(createLangComponent("arena.list", plugin.getDisplayedPluginName(), NamedTextColor.YELLOW));
+        sender.sendMessage(createLangComponent("arena.list.created", plugin.getDisplayedPluginName(), NamedTextColor.YELLOW));
         boolean any = false;
         for(MinecleanerArena arena : plugin.getArenaList().getArenas()) {
             Location location = arena.getLocation();

src/main/java/de/lunarakai/minecleaner/commands/ListPlayersInArenaCommand.java

@@ -5,7 +5,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.*;
 import de.iani.cubesideutils.commands.ArgsParser;
 import de.lunarakai.minecleaner.MinecleanerArena;
 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 org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -49,9 +49,9 @@ public class ListPlayersInArenaCommand extends SubCommand {
             }
         }
         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 {
-            player.sendMessage(Component.text("Hier befindet sich keine Arena.", NamedTextColor.GRAY));
+            ChatUtils.sendSimpleSpecialMessage(player, "arena.common.noarena", NamedTextColor.GRAY);
         }
         return true;
     }

src/main/java/de/lunarakai/minecleaner/commands/StatsCommand.java

@@ -101,7 +101,7 @@ public class StatsCommand extends SubCommand {
                                 .append(Component.text(String.valueOf(totalWonMonth), NamedTextColor.GREEN))
                                 .append(Component.text(" "))
                                 .append(createLangComponent("data.player.outof", NamedTextColor.GREEN))
-                                .append(Component.text(" " + totalSize + " (" + MinecleanerStringUtil.percentageString(totalWonMonth, totalSizeMonth) + ")", NamedTextColor.GREEN)));
+                                .append(Component.text(" " + totalSizeMonth + " (" + MinecleanerStringUtil.percentageString(totalWonMonth, totalSizeMonth) + ")", NamedTextColor.GREEN)));
 
                         Integer time = data.getBestTime(e.getKey());
                         Integer timeThisMonth = data.getBestTimeThisMonth(e.getKey());

src/main/java/de/lunarakai/minecleaner/commands/groups/AcceptCommand.java

@@ -8,8 +8,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.NoPermissionException;
 import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
 import de.iani.cubesideutils.commands.ArgsParser;
 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 org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -43,15 +42,18 @@ public class AcceptCommand extends SubCommand {
 
         if(plugin.getGroupManager().getInvitedGroup(player) != null && plugin.getGroupManager().getGroup(player) == null) {
             Player groupOwner = Bukkit.getPlayer(plugin.getGroupManager().getInvitedGroup(player).getOwner());
+            if(plugin.getArenaList().getPlayerArena(groupOwner) != null) {
+                ChatUtils.sendSimpleWarningMessage(player, "group.invite.creatorinround");
+                return true;
+            }
             plugin.getGroupManager().getInvitedGroup(player).addPlayerToGroup(player);
 
             assert groupOwner != null;
-            groupOwner.sendMessage(Component.text(player.getName() + " hat deine Einladung angenommen.", NamedTextColor.GREEN));
+            ChatUtils.sendSimpleSuccessMessage(groupOwner, player.getName() + " hat deine Einladung angenommen.");
-            player.sendMessage(Component.text("Du hast die Einladung angenommen", NamedTextColor.GREEN));
+            ChatUtils.sendSimpleSuccessMessage(player, "group.invite.accepted");
-
             return true;
         } else {
-            player.sendMessage(Component.text("Du wurdest in keine Gruppe eingeladen.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleInfoMessage(player, "group.invite.notinvited");
         }
         return true;
     }

src/main/java/de/lunarakai/minecleaner/commands/groups/DenyCommand.java

@@ -9,8 +9,7 @@ import de.iani.cubesideutils.bukkit.commands.SubCommand;
 import de.iani.cubesideutils.commands.ArgsParser;
 import de.lunarakai.minecleaner.MinecleanerGroupManager;
 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 org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -53,12 +52,11 @@ public class DenyCommand extends SubCommand {
             }
 
             assert groupOwner != null;
-            groupOwner.sendMessage(Component.text(player.getName() + " hat deine Einladung abgelehnt.", NamedTextColor.RED));
+            ChatUtils.sendSimpleWarningMessage(groupOwner, player.getName() + " hat deine Einladung abgelehnt.");
-            player.sendMessage(Component.text("Du hast die Einladung abgelehnt", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleInfoMessage(player, "group.invite.denied");
-
             return true;
         } else {
-            player.sendMessage(Component.text("Du wurdest in keine Gruppe eingeladen.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleWarningMessage(player, "group.invite.notinvited");
         }
         return true;
     }

src/main/java/de/lunarakai/minecleaner/commands/groups/DismantleGroupCommand.java

@@ -8,10 +8,9 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.NoPermissionException;
 import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
 import de.iani.cubesideutils.commands.ArgsParser;
 import de.lunarakai.minecleaner.MinecleanerPlugin;
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import java.util.Iterator;
 import java.util.UUID;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -44,20 +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 {
         Player player = (Player) commandSender;
         if(plugin.getGroupManager().getGroup(player) == null) {
-            player.sendMessage(Component.text("Du bist in keiner Gruppe die du auflösen könntest.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleWarningMessage(player, "group.common.notingroup");
             return true;
         }
         Player groupOwnerPlayer = Bukkit.getPlayer(plugin.getGroupManager().getGroup(player).getOwner());
 
         if(player != groupOwnerPlayer) {
-            player.sendMessage(Component.text("Du bist nicht berechtigt deine Gruppe aufzulösen.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleWarningMessage(player, "group.dismantle.nopermission");
             return true;
         }
 
-
         for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
             Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
-            iteratorPlayer.sendMessage(Component.text("Die Gruppe in der du dich befindest wurde aufgelöst.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleWarningMessage(iteratorPlayer, "group.dismantle.yourgroup");
         }
         plugin.getGroupManager().deleteGroup(plugin.getGroupManager().getGroup(player));
 

src/main/java/de/lunarakai/minecleaner/commands/groups/InviteCommand.java

@@ -9,7 +9,9 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
 import de.iani.cubesideutils.commands.ArgsParser;
 import de.lunarakai.minecleaner.MinecleanerGroupManager;
 import de.lunarakai.minecleaner.MinecleanerPlugin;
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -48,26 +50,42 @@ public class InviteCommand extends SubCommand {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String s, String commandString, ArgsParser args) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
         Player player = (Player) sender;
+
+        if(plugin.getArenaList().getPlayerArena(player) != null) {
+            ChatUtils.sendSimpleWarningMessage(player, "group.invite.notwhileinround");
+            return true;
+        }
+
         if(args.remaining() < 1 || args.remaining() >= 2) {
-            sender.sendMessage(Component.text(commandString + getUsage(), NamedTextColor.DARK_RED));
+            ChatUtils.sendSimpleWarningMessage(player, commandString + getUsage());
             return true;
         }
         String playerName = args.getNext().trim();
         Player invitedPlayer = plugin.getServer().getPlayer(playerName);
 
+        if(invitedPlayer == null) {
+            ChatUtils.sendSimpleWarningMessage(player, "group.invite.offline");
+            return true;
+        }
+
         if(invitedPlayer == player) {
-            player.sendMessage(Component.text("Du kannst dich nicht selber in eine Gruppe einladen.", NamedTextColor.DARK_RED));
+            ChatUtils.sendSimpleWarningMessage(player, "group.invite.notyourself");
+            return true;
+        }
+
+        if(plugin.getArenaList().getPlayerArena(invitedPlayer) != null) {
+            ChatUtils.sendSimpleWarningMessage(player, "group.invite.invitedinround");
             return true;
         }
 
         MinecleanerGroupManager groupManager = plugin.getGroupManager();
         if(groupManager.getInvitedGroup(player) != null) {
-            player.sendMessage(Component.text("Du wurdest bereits in eine Gruppe eingeladen. Bitte kümmere dich zuerst um die Einladung bevor du eine eigene Gruppe erstellst.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleInfoMessage(player, "group.invite.alreadyinvited");
             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)) {
-            player.sendMessage(Component.text("Nur als Ersteller der Gruppe bist du berechtigt Leute einzuladen.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleInfoMessage(player, "group.invite.nopermission");
             return true;
         }
 
@@ -78,6 +96,7 @@ public class InviteCommand extends SubCommand {
         assert invitedPlayer != null;
         player.sendMessage(Component.text("Du hast " + invitedPlayer.getName() + " in eine " + plugin.getDisplayedPluginName() + "-Gruppe eingeladen", NamedTextColor.GREEN));
         invitedPlayer.sendMessage(Component.text("Du wurdest von " + player.getName() + " in eine " + plugin.getDisplayedPluginName() + "-Gruppe eingeladen.", NamedTextColor.GREEN));
+        invitedPlayer.sendMessage(Component.text("[Annehmen] ", NamedTextColor.GREEN).clickEvent(ClickEvent.runCommand("/minesweeper accept")).append(Component.text(" [Ablehnen]", NamedTextColor.RED).clickEvent(ClickEvent.runCommand("/minesweeper deny"))));
         groupManager.getGroup(player).invitePlayerToGroup(invitedPlayer);
 
         return true;

src/main/java/de/lunarakai/minecleaner/commands/groups/ListGroupMembersCommand.java

@@ -8,6 +8,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.NoPermissionException;
 import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
 import de.iani.cubesideutils.commands.ArgsParser;
 import de.lunarakai.minecleaner.MinecleanerPlugin;
+import de.lunarakai.minecleaner.utils.ChatUtils;
 import java.util.Iterator;
 import java.util.UUID;
 import net.kyori.adventure.text.Component;
@@ -44,11 +45,11 @@ public class ListGroupMembersCommand extends SubCommand {
         Player player = (Player) commandSender;
 
         if(plugin.getGroupManager().getGroup(player) == null) {
-            player.sendMessage(Component.text("Du bist in keiner Gruppe.", NamedTextColor.YELLOW));
+            ChatUtils.sendSimpleInfoMessage(player, "group.common.notingroup");
             return true;
         }
 
-        player.sendMessage(Component.text("-- 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();) {
             Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
             String ownerString = "";

src/main/java/de/lunarakai/minecleaner/game/Game.java

@@ -185,6 +185,7 @@ public class Game {
 
         switch (cell.getType()) {
             case Mine: {
+                resetFloodedFlaggedCellCounter();
                 explode(cell);
                 break;
             }

src/main/java/de/lunarakai/minecleaner/utils/ChatUtils.java

@@ -0,0 +1,42 @@
+package de.lunarakai.minecleaner.utils;
+
+import java.util.regex.Pattern;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.entity.Player;
+
+public class ChatUtils {
+    static Pattern langKeyPattern = Pattern.compile("^\\w+\\.\\w+\\.\\w+$");
+
+    public static void sendSimpleSuccessMessage(Player player, String message) {
+        if(message.matches(langKeyPattern.pattern())) {
+            player.sendMessage(Component.translatable(message, NamedTextColor.GREEN));
+        } else {
+            player.sendMessage(Component.text(message, NamedTextColor.GREEN));
+        }
+    }
+
+    public static void sendSimpleInfoMessage(Player player, String message) {
+        if(message.matches(langKeyPattern.pattern())) {
+            player.sendMessage(Component.translatable(message, NamedTextColor.GOLD));
+        } else {
+            player.sendMessage(Component.text(message, NamedTextColor.GOLD));
+        }
+    }
+
+    public static void sendSimpleWarningMessage(Player player, String message) {
+        if(message.matches(langKeyPattern.pattern())) {
+            player.sendMessage(Component.translatable(message, NamedTextColor.DARK_RED));
+        } else {
+            player.sendMessage(Component.text(message, NamedTextColor.DARK_RED));
+        }
+    }
+
+    public static void sendSimpleSpecialMessage(Player player, String message, NamedTextColor color) {
+        if(message.matches(langKeyPattern.pattern())) {
+            player.sendMessage(Component.translatable(message, color));
+        } else {
+            player.sendMessage(Component.text(message, color));
+        }
+    }
+}

src/main/java/de/lunarakai/minecleaner/utils/ItemUtil.java

@@ -1,6 +1,7 @@
 package de.lunarakai.minecleaner.utils;
 
 import de.iani.cubesideutils.bukkit.items.ItemBuilder;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
@@ -8,13 +9,13 @@ import org.bukkit.inventory.ItemStack;
 
 public class ItemUtil {
 
-    public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, " ", true, true);
+    public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, Component.text(" "), true, true);
 
-    public static ItemStack createGuiItem(Material material, String name, String... lore) {
+    public static ItemStack createGuiItem(Material material, Component name, String... lore) {
         return createGuiItem(material, name, false, lore);
     }
 
-    public static ItemStack createGuiItem(Material material, String name, boolean glowing, boolean showTooltip, String... lore) {
+    public static ItemStack createGuiItem(Material material, Component name, boolean glowing, boolean showTooltip, String... lore) {
         ItemBuilder builder = ItemBuilder.fromMaterial(material).displayName(name).lore(lore);
         if (glowing) {
             builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS);
@@ -26,7 +27,7 @@ public class ItemUtil {
 
     }
 
-    public static ItemStack createGuiItem(Material material, String name, boolean glowing, String... lore) {
+    public static ItemStack createGuiItem(Material material, Component name, boolean glowing, String... lore) {
         return createGuiItem(material, name, glowing, true, lore);
     }
 }

src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java

@@ -1,6 +1,7 @@
 package de.lunarakai.minecleaner.utils;
 
 import java.net.URL;
+import net.kyori.adventure.text.Component;
 
 public class MinecleanerStringUtil {
     private MinecleanerStringUtil() {
@@ -14,7 +15,7 @@ public class MinecleanerStringUtil {
         min = min % 60;
         StringBuilder timeString = new StringBuilder();
         if (hours > 0) {
-            String hoursString = " Stunden";
+            String hoursString = " " + Component.translatable("minecleaner.common.hours");
             if(shorten) {
                 hoursString = " h";
             }
@@ -24,7 +25,7 @@ public class MinecleanerStringUtil {
             if (!timeString.isEmpty()) {
                 timeString.append(", ");
             }
-            String minString = " Minuten";
+            String minString = " " + Component.translatable("minecleaner.common.minutes");
             if(shorten) {
                 minString = " min";
             }
@@ -32,9 +33,9 @@ public class MinecleanerStringUtil {
         }
         if (sec > 0 || !timeString.isEmpty()) {
             if (!timeString.isEmpty()) {
-                timeString.append(" und ");
+                timeString.append(Component.text(" ")).append(Component.translatable("minecleaner.common.and").append(Component.text(" ")));
             }
-            String secondsString = " Sekunden";
+            String secondsString = " " + Component.translatable("minecleaner.common.seconds");
             if(shorten) {
                 secondsString = " s";
             }

src/main/java/de/lunarakai/minecleaner/utils/MinecleanerUtils.java

@@ -0,0 +1,11 @@
+package de.lunarakai.minecleaner.utils;
+
+import de.lunarakai.minecleaner.MinecleanerPlugin;
+import org.bukkit.entity.Player;
+
+public class MinecleanerUtils {
+
+    public static boolean isPlayerInGroup(MinecleanerPlugin plugin, Player player) {
+        return plugin.getGroupManager().getGroup(player) != null;
+    }
+}

src/main/resources/lang/de_DE.properties

@@ -3,7 +3,21 @@ minecleaner.info.developer=Entwickelt von
 minecleaner.info.website=Website
 minecleaner.info.license=Lizenz
 
-arena.name.invalid=Ungueltiger Arenaname. Erlaubt sind Buchstaben, Zahlen und der Unterstrich
+minecleaner.common.hours=Stunden
+minecleaner.common.minutes=Minuten
+minecleaner.common.seconds=Sekunden
+minecleaner.common.and=und
+
+settings.manualreset.allow=Manuelles Resetten aktiviert
+settings.manualreset.deny=Manuelles Resetten deaktiviert
+settings.additionaltimer.allow=Zusätzliche Anzeige in der Action Bar aktiviert
+settings.additionaltimer.deny=Zusätzliche Anzeige in der Action Bar deaktiviert
+settings.timer.allow=Timer wird angezeigt
+settings.timer.deny=Timer wird nicht angezeigt
+settings.resettime.text=Resetzeit
+
+
+arena.name.invalid=Ungültiger Arenaname. Erlaubt sind Buchstaben, Zahlen und der Unterstrich
 arena.name.exists=Eine Arena mit diesem Namen existiert bereits
 arena.width.klein=Klein
 arena.width.mittel=Mittel
@@ -11,27 +25,53 @@ arena.width.gross=Gross
 arena.width.experte=Experte
 arena.widthindex.invalid=Kein Valider Arena WidthIndex!
 arena.widthindex.validOptions=0 (oder weglassen) = 9*9, 1 = 12*12, 2 = 12*18, 3 = 12*33
-arena.widthindex.toolarge=Arena WidthIndex darf nicht groesser als 3 sein
+arena.widthindex.toolarge=Arena WidthIndex darf nicht grösser als 3 sein
 arena.create.lookAtCenter=Bitte gucke den Block an, der im Zentrum des {0}-Spielfelds sein soll.
 arena.create.lookAtSide=Bitte gucke die Seite des Blockes an, wo das {0}-Spielfeld erstellt werden soll.
 arena.create.otherArena=An dieser Stelle befindet sich bereits eine Arena.
 arena.create.success=Die Arena wurde erfolgreich angelegt.
-arena.delete.success=Die {0}-Arena {1} wurde geloescht.
+arena.delete.success=Die {0}-Arena {1} wurde gelöscht.
 arena.delete.noarena=Hier befindet sich keine {0}-Arena.
 
-arena.list=Angelegte {0}-Arenen
+arena.common.noarena=Hier befindet sich keine Arena.
+arena.common.toofaraway=Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.
+arena.common.groupleadertoofaraway=Der Ersteller der Gruppe hat sich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.
+
+arena.list.created=Angelegte {0}-Arenen
 arena.list.none=(keine)
 
-data.player.noData=Fuer Spieler "{0}" existieren keine Daten.
+data.player.noData=Für Spieler "{0}" existieren keine Daten.
 data.player.self=Deine {0} Statistik
 data.player.other={0}-Statistik von {1}
 data.player.roundswon=Runden gewonnen
 data.player.pointsscored=Punkte erspielt
-data.player.from=von
+data.player.outof=von
 data.player.besttime=Bestzeit
 data.player.thismonth=Dieser Monat
 
 data.delete.playerNotFound=Ein Spieler mit dem Namen "{0}" konnte nicht gefunden werden.
-data.delete.deleted=Alle {0}-Statistiken von Spieler "{1}" wurden geloescht.
+data.delete.deleted=Alle {0}-Statistiken von Spieler "{1}" wurden gelöscht.
 
-data.console.nodata=Fuer die Konsole existieren keine Daten.
+data.console.nodata=Für die Konsole existieren keine Daten.
+
+group.common.notingroup=Du bist in keiner Gruppe.
+
+group.invite.accepted=Du hast die Einladung angenommen.
+group.invite.denied=Du hast die Einladung abgelehnt.
+group.invite.notinvited=Du wurdest in keine Gruppe eingeladen.
+group.invite.creatorinround=Du kannst keine Einladung annehmen während die Person, die dich eingeladen hat, in einer Runde ist.
+group.invite.notwhileinround=Du kannst keine Einladung verschicken während du in einer Runde bist.
+group.invite.offline=Du kannst keine Person einladen, die entweder offline oder auf einen anderen Server ist.
+group.invite.notyourself=Du kannst dich nicht selber in eine Gruppe einladen.
+group.invite.invitedinround=Du kannst Spieler nicht einladen, die bereits in einer Runde sind.
+group.invite.alreadyinvited=Du wurdest bereits in eine Gruppe eingeladen. Bitte kümmere dich zuerst um die Einladung bevor du eine eigene Gruppe erstellst.
+group.invite.nopermission=Nur als Ersteller der Gruppe bist du berechtigt Leute einzuladen.
+group.invite.accept=Annehmen
+group.invite.deny=Ablehnen
+
+group.dismantle.nopermission=Du bist nicht berechtigt deine Gruppe aufzulösen.
+group.dismantle.yourgroup=Die Gruppe in der du dich befindest wurde aufgelöst.
+
+group.game.nopermission=Nur der Ersteller der Gruppe kann eine neue Runde starten!
+group.creator.removed=Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde.
+group.dismantled.alone=Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist.

src/main/resources/lang/en_US.properties

@@ -3,6 +3,19 @@ minecleaner.info.developer=Developed by
 minecleaner.info.website=Website
 minecleaner.info.license=License
 
+minecleaner.common.hours=hours
+minecleaner.common.minutes=minutes
+minecleaner.common.seconds=seconds
+minecleaner.common.and=and
+
+settings.manualreset.allow=Manual reset activated
+settings.manualreset.deny=Manual reset deactivated
+settings.additionaltimer.allow=Additional display activated in the action bar
+settings.additionaltimer.deny=Additional display deactivated in the action bar
+settings.timer.allow=Timer is displayed
+settings.timer.deny=Timer is not displayed
+settings.resettime.text=reset time
+
 arena.name.invalid=Invalid arena name. Allowed are letters, numbers and the underscore
 arena.name.exists=An arena with this name already exists
 arena.width.klein=Small
@@ -19,7 +32,11 @@ arena.create.success=The arena has been created successfully.
 arena.delete.success=The {0}-arena {1} has been deleted.
 arena.delete.noarena=There is no {0}-arena here.
 
-arena.list=Created {0} arenas
+arena.common.noarena=There is no arena here.
+arena.common.toofaraway=You have moved too far away from the arena. The match has been abandoned.
+arena.common.groupleadertoofaraway=The creator of the group has moved too far away from the arena. The match has been abandoned.
+
+arena.list.created=Created {0} arenas
 arena.list.none=(none)
 
 data.player.noData=No data exists for player "{0}".
@@ -35,3 +52,25 @@ data.delete.playerNotFound=A player with the name "{0}" could not be found.
 data.delete.deleted=All {0} stats of player "{1}" have been deleted.
 
 data.console.nodata=No data exists for the console.
+
+group.common.notingroup=You are not in a group.
+
+group.invite.accepted=You have accepted the invitation.
+group.invite.denied=You declined the invitation.
+group.invite.notinvited=You have not been invited to any group.
+group.invite.creatorinround=You cannot accept an invitation while the person who invited you is in a round.
+group.invite.notwhileinround=You cannot send an invitation while you are in a round.
+group.invite.offline=You cannot invite a person who is either offline or on another server.
+group.invite.notyourself=You cannot invite yourself to a group.
+group.invite.invitedinround=You cannot invite players who are already in a round.
+group.invite.alreadyinvited=You have already been invited to a group. Please take care of the invitation first before you create your own group.
+group.invite.nopermission=Only as the creator of the group are you authorized to invite people.
+group.invite.accept=Accept
+group.invite.deny=Deny
+
+group.dismantle.nopermission=You are not authorized to dissolve your group.
+group.dismantle.yourgroup=The group you are in has been disbanded.
+
+group.game.nopermission=Only the creator of the group can start a new round!
+group.creator.removed=The group has been dissolved because the person who created the group has been removed from the group.
+group.dismantled.alone=The group has been dissolved as you are now only alone in the group.