From 4facf588c5f7c221d30403f075b5a1db17d6aca9 Mon Sep 17 00:00:00 2001 From: DaniFoldi Date: Thu, 17 Jun 2021 16:58:12 +0200 Subject: [PATCH] Fix build issue and bungeecord issue Closes #75 --- .../bungeegui/command/PluginCommand.java | 14 +++++++------- .../bungeegui/inject/BungeeGuiComponent.java | 1 + .../bungeegui/main/BungeeGuiLoader.java | 2 +- .../com/danifoldi/bungeegui/main/GuiHandler.java | 3 ++- .../bungeegui/main/PlaceholderHandler.java | 16 ++++++++-------- .../com/danifoldi/bungeegui/util/SoundUtil.java | 2 +- .../com/danifoldi/bungeegui/util/UpdateUtil.java | 4 ++-- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java b/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java index acdc7fd..c1b9b1b 100644 --- a/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java +++ b/src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java @@ -204,7 +204,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[] if (args.length > 3) { try { category = SoundCategory.valueOf(args[3]); - } catch (final @NotNull IllegalArgumentException ignored) { + } catch (IllegalArgumentException ignored) { } } @@ -213,7 +213,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[] if (args.length > 4) { try { volume = Float.parseFloat(args[4]); - } catch (final @NotNull IllegalArgumentException ignored) { + } catch (IllegalArgumentException ignored) { } } @@ -222,7 +222,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[] if (args.length > 5) { try { pitch = Float.parseFloat(args[5]); - } catch (final @NotNull IllegalArgumentException ignored) { + } catch (IllegalArgumentException ignored) { } } @@ -245,21 +245,21 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[] int fadeIn = 20; try { fadeIn = Integer.parseInt(args[3]); - } catch (final @NotNull NumberFormatException ignored) { + } catch (NumberFormatException ignored) { } int stay = 60; try { stay = Integer.parseInt(args[4]); - } catch (final @NotNull NumberFormatException ignored) { + } catch (NumberFormatException ignored) { } int fadeOut = 20; try { fadeOut = Integer.parseInt(args[5]); - } catch (final @NotNull NumberFormatException ignored) { + } catch (NumberFormatException ignored) { } @@ -289,7 +289,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[] case "p": return List.of(ProxyServer.getInstance().getPlayer(target.getSecond())); case "s": - return ProxyServer.getInstance().getServers().get(target.getSecond()).getPlayers(); + return ProxyServer.getInstance().getServersCopy().get(target.getSecond()).getPlayers(); default: return Collections.emptyList(); } diff --git a/src/main/java/com/danifoldi/bungeegui/inject/BungeeGuiComponent.java b/src/main/java/com/danifoldi/bungeegui/inject/BungeeGuiComponent.java index 33a6297..6ff7d2a 100644 --- a/src/main/java/com/danifoldi/bungeegui/inject/BungeeGuiComponent.java +++ b/src/main/java/com/danifoldi/bungeegui/inject/BungeeGuiComponent.java @@ -7,6 +7,7 @@ import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.PluginManager; import net.md_5.bungee.api.scheduler.TaskScheduler; +import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.NotNull; import javax.inject.Singleton; diff --git a/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiLoader.java b/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiLoader.java index f19aa62..090673b 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiLoader.java +++ b/src/main/java/com/danifoldi/bungeegui/main/BungeeGuiLoader.java @@ -82,7 +82,7 @@ void load() { } pluginManager.registerListener(plugin, listener); - } catch (final @NotNull IOException e) { + } catch (IOException e) { StringUtil.blockPrint(logger::severe, "Could not enable plugin, please see the error below"); logger.severe(e.getMessage()); e.printStackTrace(); diff --git a/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java b/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java index b417e25..d219350 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java +++ b/src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java @@ -11,6 +11,7 @@ import com.danifoldi.bungeegui.util.StringUtil; import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.EnumGetMethod; +import dagger.Module; import de.exceptionflug.protocolize.inventory.Inventory; import de.exceptionflug.protocolize.inventory.InventoryModule; import de.exceptionflug.protocolize.items.ItemStack; @@ -136,7 +137,7 @@ void load(@NotNull Config config) { .build(); addGui(name, grid); - } catch (final @NotNull Exception e) { + } catch (Exception e) { logger.warning("Could not load gui " + name); logger.warning(e.getClass().getName() + ": " + e.getMessage()); e.printStackTrace(); diff --git a/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java b/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java index af2978d..bcfe706 100644 --- a/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java +++ b/src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java @@ -83,7 +83,7 @@ void registerBuiltin(final @NotNull String name, final @NotNull Function lastStatus = new ConcurrentHashMap<>(); refreshData = proxyServer.getScheduler().schedule(plugin, () -> { - for (ServerInfo server: Map.copyOf(proxyServer.getServers()).values()) { + for (ServerInfo server: proxyServer.getServersCopy().values()) { server.ping((ping, error) -> { if (lastStatus.containsKey(server) && lastStatus.get(server) != (error == null)) { if (error != null) { @@ -149,7 +149,7 @@ void registerBuiltins() { return String.valueOf(count); }); registerBuiltin("guicount", player -> String.valueOf(BungeeGuiAPI.getInstance().getAvailableGuis().size())); - registerBuiltin("servercount", player -> String.valueOf(proxyServer.getServers().size())); + registerBuiltin("servercount", player -> String.valueOf(proxyServer.getServersCopy().size())); registerBuiltin("plugincount", player -> String.valueOf(pluginManager.getPlugins().size())); registerBuiltin("placeholdercount", player -> String.valueOf(placeholders.size() + builtinPlaceholders.size())); registerBuiltin("displayname", player -> { @@ -268,7 +268,7 @@ void registerBuiltins() { return ""; } return user.getFriendlyName(); - } catch (final @NotNull IllegalStateException | NullPointerException e) { + } catch (IllegalStateException | NullPointerException e) { return ""; } }); @@ -283,7 +283,7 @@ void registerBuiltins() { } final @Nullable String value = user.getCachedData().getMetaData().getPrefix(); return value == null ? "" : value; - } catch (final @NotNull IllegalStateException | NullPointerException e) { + } catch (IllegalStateException | NullPointerException e) { return ""; } }); @@ -298,7 +298,7 @@ void registerBuiltins() { } final @Nullable String value = user.getCachedData().getMetaData().getSuffix(); return value == null ? "" : value; - } catch (final @NotNull IllegalStateException | NullPointerException e) { + } catch (IllegalStateException | NullPointerException e) { return ""; } }); @@ -313,12 +313,12 @@ void registerBuiltins() { } final @Nullable String value = user.getCachedData().getMetaData().getPrimaryGroup(); return value == null ? "" : value; - } catch (final @NotNull IllegalStateException | NullPointerException e) { + } catch (IllegalStateException | NullPointerException e) { return ""; } }); - for (Map.Entry server: Map.copyOf(proxyServer.getServers()).entrySet()) { + for (Map.Entry server: proxyServer.getServersCopy().entrySet()) { registerBuiltin("status@" + server.getKey(), player -> { final boolean online = lastStatus.get(server.getValue()); return online ? "Online" : "Offline"; diff --git a/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java b/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java index fe2ee2f..380b1d2 100644 --- a/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java +++ b/src/main/java/com/danifoldi/bungeegui/util/SoundUtil.java @@ -33,7 +33,7 @@ public static boolean isValidSound(final @NotNull String soundName) { final @NotNull Pair value = StringUtil.get(soundName); try { Sound.valueOf(value.getSecond()); - } catch (final @NotNull IllegalArgumentException e) { + } catch (IllegalArgumentException e) { if (!value.getFirst().equals("custom")) { return false; } diff --git a/src/main/java/com/danifoldi/bungeegui/util/UpdateUtil.java b/src/main/java/com/danifoldi/bungeegui/util/UpdateUtil.java index 89ee27e..03e0820 100644 --- a/src/main/java/com/danifoldi/bungeegui/util/UpdateUtil.java +++ b/src/main/java/com/danifoldi/bungeegui/util/UpdateUtil.java @@ -31,7 +31,7 @@ public static CompletableFuture getNewest() { .thenApply(o -> o.get("tag_name").getAsString()) .join(); - } catch (final @NotNull Exception e) { + } catch (Exception e) { Logger.getAnonymousLogger().warning(e.getMessage()); final @NotNull HttpRequest sgRequest = HttpRequest .newBuilder() @@ -45,7 +45,7 @@ public static CompletableFuture getNewest() { .thenApply(b -> new Gson().fromJson(b, JsonElement.class).getAsJsonObject()) .thenApply(o -> o.get("name").getAsString()) .join(); - } catch (final @NotNull Exception e2) { + } catch (Exception e2) { Logger.getAnonymousLogger().warning(e2.getMessage()); return ""; }