From dac38c3b3625132733a1ec99cd90dbd1b012e7ce Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Sat, 1 Jun 2019 00:16:24 +0200 Subject: [PATCH] Cleanup build a bit --- pom.xml | 5 ++++- .../Minepacks/Bukkit/Command/CommandManager.java | 6 +++--- .../Minepacks/Bukkit/Command/HelpCommand.java | 12 +++++++----- .../Minepacks/Bukkit/Command/UpdateCommand.java | 3 +-- .../Minepacks/Bukkit/Command/VersionCommand.java | 3 +-- .../pcgamingfreaks/Minepacks/Bukkit/Minepacks.java | 5 +++++ 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index fdbb149..e82534f 100644 --- a/pom.xml +++ b/pom.xml @@ -186,7 +186,10 @@ at.pcgamingfreaks at.pcgamingfreaks.MinepacksStandalone.libs.at.pcgamingfreaks - at.pcgamingfreaks.Minepacks.Bukkit.API.* + at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack + at.pcgamingfreaks.Minepacks.Bukkit.API.Callback + at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin + at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java index 5c1a727..b85d9d9 100644 --- a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java +++ b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 GeorgH93 + * Copyright (C) 2019 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ import java.util.Collection; import java.util.List; -public class CommandManager extends CommandExecutorWithSubCommandsGeneric implements MinepacksCommandManager +public class CommandManager extends CommandExecutorWithSubCommandsGeneric /*if_not[STANDALONE]*/ implements MinepacksCommandManager /*end[STANDALONE]*/ { private final Minepacks plugin; private final RegisterablePluginCommand backpackCommand; @@ -77,7 +77,7 @@ public CommandManager(Minepacks plugin) registerSubCommand(new RestoreCommand(plugin)); registerSubCommand(new MigrateCommand(plugin)); registerSubCommand(new VersionCommand(plugin)); - registerSubCommand(new HelpCommand(plugin, commands)); + registerSubCommand(new HelpCommand(plugin, commands, this)); } @Override diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java index f62d3ef..23f7f42 100644 --- a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java +++ b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 GeorgH93 + * Copyright (C) 2019 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,13 +31,15 @@ public class HelpCommand extends MinepacksCommand { - private Collection commands; - private Message messageHeader, messageFooter; + private final Collection commands; + private final Message messageHeader, messageFooter; + private final CommandManager commandManager; - public HelpCommand(Minepacks plugin, Collection commands) + public HelpCommand(Minepacks plugin, Collection commands, CommandManager commandManager) { super(plugin, "help", plugin.getLanguage().getTranslated("Commands.Description.Help"), plugin.getLanguage().getCommandAliases("Help")); this.commands = commands; + this.commandManager = commandManager; messageHeader = plugin.getLanguage().getMessage("Ingame.Help.Header"); messageFooter = plugin.getLanguage().getMessage("Ingame.Help.Footer"); @@ -53,7 +55,7 @@ public void execute(@NotNull CommandSender sender, @NotNull String mainCommandAl temp = cmd.doGetHelp(sender); if(temp != null) help.addAll(temp); } - ((CommandManager) getMinepacksPlugin().getCommandManager()).sendHelp(sender, mainCommandAlias, help); + commandManager.sendHelp(sender, mainCommandAlias, help); messageFooter.send(sender); //TODO: pages } diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java index fe81ad0..c5626bb 100644 --- a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java +++ b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java @@ -45,8 +45,7 @@ public UpdateCommand(Minepacks plugin) public void execute(@NotNull final CommandSender sender, @NotNull String mainCommandAlias, @NotNull String alias, @NotNull String[] args) { messageCheckingForUpdates.send(sender); - /*if[STANDALONE] - else[STANDALONE]*/ + /*if_not[STANDALONE]*/ ((at.pcgamingfreaks.PluginLib.Bukkit.PluginLib) at.pcgamingfreaks.PluginLib.Bukkit.PluginLib.getInstance()).update(null); // Make the PluginLib check for updates too /*end[STANDALONE]*/ ((Minepacks) plugin).update(result -> { diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java index 5a0aa5e..76d8a77 100644 --- a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java +++ b/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java @@ -37,8 +37,7 @@ public void execute(@NotNull CommandSender sender, @NotNull String mainCommandAl { sender.sendMessage("##### Start Minepacks version info #####"); sender.sendMessage("Marriage Master: " + plugin.getDescription().getVersion()); - /*if[STANDALONE] - else[STANDALONE]*/ + /*if_not[STANDALONE]*/ sender.sendMessage("PCGF PluginLib: " + at.pcgamingfreaks.PluginLib.Bukkit.PluginLib.getInstance().getVersion()); /*end[STANDALONE]*/ sender.sendMessage("Server: " + plugin.getServer().getVersion()); diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java index 5558eaf..7818633 100644 --- a/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java +++ b/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java @@ -94,6 +94,7 @@ public void onEnable() { // Check if running as standalone edition /*if[STANDALONE] + getLogger().info("Starting Minepacks in standalone mode!"); if(getServer().getPluginManager().isPluginEnabled("PCGF_PluginLib")) { getLogger().info("You do have the PCGF_PluginLib installed. You may consider switching to the default version of the plugin to reduce memory load and unlock additional features."); @@ -309,7 +310,11 @@ public void getBackpack(@NotNull final OfflinePlayer owner, @NotNull final Callb @Override public MinepacksCommandManager getCommandManager() { + /*if[STANDALONE] + return null; + else[STANDALONE]*/ return commandManager; + /*end[STANDALONE]*/ } public int getBackpackPermSize(Player player)