From fe75c73bfea503e6f855f46aa45cd237ca9b9e7a Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 18:08:52 +0200 Subject: [PATCH 1/7] Rebuild --- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 - 1 file changed, 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index b98ea77..f7ad403 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -27,5 +27,4 @@ public interface ScoreboardCallback { String getTitle(); - } From 981832f43d92df96a8dbe28e6a6f3e3629c3d754 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 18:23:37 +0200 Subject: [PATCH 2/7] Rebuild --- CommonCore | 2 +- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CommonCore b/CommonCore index 6cb3bc5..3829cd6 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 6cb3bc5ff5ee955ccdde281183991d0877e54169 +Subproject commit 3829cd6706ab6ee9d22f4684b135b5e7eca1d6b6 diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index f7ad403..11e403b 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -26,5 +26,4 @@ public interface ScoreboardCallback { HashMap getData(); String getTitle(); - } From 036531091ebeafe30db2e73f49247f387e4b01c1 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 18:30:49 +0200 Subject: [PATCH 3/7] Rebuild --- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 + 1 file changed, 1 insertion(+) diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index 11e403b..f7ad403 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -26,4 +26,5 @@ public interface ScoreboardCallback { HashMap getData(); String getTitle(); + } From d230333bf4a5b522fc7e80e3cdc9e4913a291a15 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 18:33:04 +0200 Subject: [PATCH 4/7] Rebuild --- CommonCore | 2 +- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CommonCore b/CommonCore index 3829cd6..2c6ebc8 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 3829cd6706ab6ee9d22f4684b135b5e7eca1d6b6 +Subproject commit 2c6ebc82f3d8177191bcd7444dfe9607c35c952b diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index f7ad403..11e403b 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -26,5 +26,4 @@ public interface ScoreboardCallback { HashMap getData(); String getTitle(); - } From 797139a94fc67954f6cc3ed44a95aa165c6764d5 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 20:37:39 +0200 Subject: [PATCH 5/7] Remove deprecated guard api --- .../src/de/steamwar/command/GuardChecker.java | 30 ------------------- .../src/de/steamwar/command/SWCommand.java | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 SpigotCore_Main/src/de/steamwar/command/GuardChecker.java diff --git a/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java b/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java deleted file mode 100644 index 531031c..0000000 --- a/SpigotCore_Main/src/de/steamwar/command/GuardChecker.java +++ /dev/null @@ -1,30 +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 . - */ - -package de.steamwar.command; - -import org.bukkit.command.CommandSender; - -@FunctionalInterface -public interface GuardChecker extends AbstractGuardChecker { - /** - * While guarding the first parameter of the command the parameter s of this method is {@code null} - */ - GuardResult guard(CommandSender commandSender, GuardCheckType guardCheckType, String[] previousArguments, String s); -} diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java index 2c5c433..cee412d 100644 --- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java +++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java @@ -132,7 +132,7 @@ public class SWCommand extends AbstractSWCommand { } if (args.length == 0 || atomicInteger.get() == commandList.size()) { commandList.forEach(subCommand -> { - if (subCommand.guardChecker == null || subCommand.guardChecker.guard(p, GuardCheckType.TAB_COMPLETE, new String[0], null) == GuardResult.ALLOWED) { + if (subCommand.validator == null || subCommand.validator.validate(p, p, (s, args1) -> {})) { send(p, subCommand); } }); From f9ed00ca2b42bce41f997dce826f9eee92eb776a Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 21:07:41 +0200 Subject: [PATCH 6/7] Rebuild --- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 + 1 file changed, 1 insertion(+) diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index 11e403b..f7ad403 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -26,4 +26,5 @@ public interface ScoreboardCallback { HashMap getData(); String getTitle(); + } From 0d50211c84c62ee8d35cfb28a5adca5834a3f7fe Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Aug 2022 21:08:56 +0200 Subject: [PATCH 7/7] Rebuild --- CommonCore | 2 +- .../src/de/steamwar/scoreboard/ScoreboardCallback.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CommonCore b/CommonCore index 2c6ebc8..3701f6f 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 2c6ebc82f3d8177191bcd7444dfe9607c35c952b +Subproject commit 3701f6f5ff10fa97d6816d5f57c85f7213f7fb3e diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java index f7ad403..11e403b 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -26,5 +26,4 @@ public interface ScoreboardCallback { HashMap getData(); String getTitle(); - }