From 9fb35eb6cc2496720ecf67bc2c859de8a25e90e2 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 30 Oct 2020 22:56:11 +0100 Subject: [PATCH] Some fixes and cleanup Don't require ButtonPlugin for unregistering components Cleanup Fixed not detecting missing player name --- .../main/java/buttondevteam/core/MainPlugin.java | 1 - .../java/buttondevteam/core/PlayerListener.java | 13 +++++-------- .../core/component/restart/RestartComponent.java | 6 ------ .../buttondevteam/lib/architecture/Component.java | 2 +- .../main/java/buttondevteam/lib/chat/Command2.java | 2 +- .../java/buttondevteam/lib/chat/Command2MC.java | 8 -------- 6 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Chroma-Core/src/main/java/buttondevteam/core/MainPlugin.java b/Chroma-Core/src/main/java/buttondevteam/core/MainPlugin.java index 071e62c..bc42ac8 100755 --- a/Chroma-Core/src/main/java/buttondevteam/core/MainPlugin.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/MainPlugin.java @@ -85,7 +85,6 @@ public class MainPlugin extends ButtonPlugin { @Override public void pluginEnable() { - // Logs "Plugin Enabled", registers commands Instance = this; PluginDescriptionFile pdf = getDescription(); logger = getLogger(); diff --git a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java index 45f3bc3..4c13204 100755 --- a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.java @@ -31,12 +31,13 @@ public class PlayerListener implements Listener { public void OnPlayerJoin(PlayerJoinEvent event) { var p = event.getPlayer(); TBMCPlayer player = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class); - if (player.PlayerName.get() == null) { + String pname = player.PlayerName.get(); + if (pname.length() == 0) { player.PlayerName.set(p.getName()); MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get()); - } else if (!p.getName().equals(player.PlayerName.get())) { - TownyComponent.renameInTowny(player.PlayerName.get(), p.getName()); - MainPlugin.Instance.getLogger().info(player.PlayerName.get() + " renamed to " + p.getName()); + } else if (!p.getName().equals(pname)) { + TownyComponent.renameInTowny(pname, p.getName()); + MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName()); player.PlayerName.set(p.getName()); } } @@ -69,10 +70,6 @@ public class PlayerListener implements Listener { private void handlePreprocess(CommandSender sender, String message, Cancellable event) { if (event.isCancelled()) return; - /*val cg = Optional.ofNullable(ChromaGamerBase.getFromSender(sender)); - val ch = cg.map(ChromaGamerBase::channel).map(ChannelPlayerData::get); - val rtr = ch.map(c -> c.getRTR(sender)).orElseGet(() -> new Channel.RecipientTestResult("Failed to get user")); - val ev = new TBMCCommandPreprocessEvent(sender, ch.orElse(Channel.GlobalChat), message, rtr.score, rtr.groupID);*/ val cg = ChromaGamerBase.getFromSender(sender); if (cg == null) throw new RuntimeException("Couldn't get user from sender for " + sender.getName() + "!"); val ev = new TBMCCommandPreprocessEvent(sender, cg.channel.get(), message, sender); diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/restart/RestartComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/restart/RestartComponent.java index 0717099..3966af3 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/restart/RestartComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/restart/RestartComponent.java @@ -57,19 +57,13 @@ public class RestartComponent extends Component implements Listener private int syncStart(int hour) { var now = ZonedDateTime.now(ZoneId.ofOffset("", ZoneOffset.UTC)); int secs = now.getHour() * 3600 + now.getMinute() * 60 + now.getSecond(); - //System.out.println("now: " + secs / 3600.); int diff = secs - hour * 3600; - //System.out.println("diff: " + diff / 3600.); if (diff < 0) { diff += 24 * 3600; } - //System.out.println("diff: " + diff / 3600.); int count = diff / (24 * 3600); - //System.out.println("count: " + count); int intervalPart = diff - count * 24 * 3600; - //System.out.println("intervalPart: " + intervalPart / 3600.); int remaining = 24 * 3600 - intervalPart; - //System.out.println("remaining: " + remaining / 3600.); return remaining * 20; } diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java index 25ca27d..29cb5cf 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java @@ -58,7 +58,7 @@ public abstract class Component { * @param component The component to unregister * @return Whether the component is unregistered successfully (it also got disabled) */ - public static boolean unregisterComponent(T plugin, Component component) { + public static boolean unregisterComponent(T plugin, Component component) { return registerUnregisterComponent(plugin, component, false); } diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2.java b/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2.java index 54e0e11..1ed14fd 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2.java @@ -119,7 +119,7 @@ public abstract class Command2, TP extends Command2Send protected final HashMap> subcommands = new HashMap<>(); protected final HashMap, ParamConverter> paramConverters = new HashMap<>(); - private ArrayList commandHelp = new ArrayList<>(); //Mainly needed by Discord + private final ArrayList commandHelp = new ArrayList<>(); //Mainly needed by Discord private char commandChar; diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2MC.java b/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2MC.java index bc32c2e..f53f6dd 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2MC.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/chat/Command2MC.java @@ -193,11 +193,6 @@ public class Command2MC extends Command2 implemen int i = commandline.indexOf(' '); String mainpath = commandline.substring(1, i == -1 ? commandline.length() : i); //Without the slash PluginCommand pcmd; - /*System.out.println("Command line: " + commandline); - System.out.println("Prioritize: " + MainPlugin.Instance.prioritizeCustomCommands().get()); - System.out.println("PCMD: " + (pcmd = Bukkit.getPluginCommand(mainpath))); - if (pcmd != null) - System.out.println("ButtonPlugin: " + (pcmd.getPlugin() instanceof ButtonPlugin));*/ if (!checkPlugin || MainPlugin.Instance.prioritizeCustomCommands.get() || (pcmd = Bukkit.getPluginCommand(mainpath)) == null //Our commands aren't PluginCommands @@ -249,7 +244,6 @@ public class Command2MC extends Command2 implemen sender.sendMessage("§cAn internal error occurred."); return true; } - //System.out.println("Executing " + label + " which is actually " + command.getName()); handleCommand(new Command2MCSender(sender, user.channel.get(), sender), ("/" + command.getName() + " " + String.join(" ", args)).trim(), false); ///trim(): remove space if there are no args return true; @@ -267,13 +261,11 @@ public class Command2MC extends Command2 implemen @Override public List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { - //System.out.println("Correct tabcomplete queried"); return Collections.emptyList(); } @Override public List tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException { - //System.out.println("Correct tabcomplete queried"); return Collections.emptyList(); } }