From cfa3ff0d8d214cf45f692838bb58506518b3fd77 Mon Sep 17 00:00:00 2001
From: jojo <yoyosource@nidido.de>
Date: Wed, 30 Dec 2020 14:40:30 +0100
Subject: [PATCH] Remove SWCommandBundle.java Add utility from
 SWCommandBundle.java to SWCommand

---
 .../src/de/steamwar/command/SWCommand.java    | 14 +++++
 .../de/steamwar/command/SWCommandBundle.java  | 51 -------------------
 2 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java

diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 502bd4a..faf90f4 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.command;
 
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
@@ -57,4 +58,17 @@ public class SWCommand {
         return arguments[index].tabCompleteSupplier(args[index]);
     }
 
+    public static boolean execute(List<SWCommand> swCommandList, Player player, String[] args) {
+        for (SWCommand swCommand : swCommandList) {
+            if (swCommand.execute(player, args)) return true;
+        }
+        return false;
+    }
+
+    public static List<String> tabComplete(List<SWCommand> swCommandList, String[] args) {
+        List<String> strings = new ArrayList<>();
+        swCommandList.forEach(swCommand -> swCommand.tabComplete(args).ifPresent(strings::addAll));
+        return strings;
+    }
+
 }
diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java b/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java
deleted file mode 100644
index c99b343..0000000
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommandBundle.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- *     This file is a part of the SteamWar software.
- *
- *     Copyright (C) 2020  SteamWar.de-Serverteam
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.command;
-
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SWCommandBundle {
-
-    private List<SWCommand> swCommandList = new ArrayList<>();
-
-    public SWCommandBundle add(SWCommand swCommand) {
-        if (swCommand == null) return this;
-        swCommandList.add(swCommand);
-        return this;
-    }
-
-    public boolean execute(Player player, String[] args) {
-        for (SWCommand swCommand : swCommandList) {
-            if (swCommand.execute(player, args)) return true;
-        }
-        return false;
-    }
-
-    public List<String> tabComplete(String[] args) {
-        List<String> strings = new ArrayList<>();
-        swCommandList.forEach(swCommand -> swCommand.tabComplete(args).ifPresent(strings::addAll));
-        return strings;
-    }
-
-}