From c0fab2a72e68e526b01fe8e3fec3170cbd7042fc Mon Sep 17 00:00:00 2001 From: Pepich Date: Tue, 30 May 2017 11:52:34 +0200 Subject: [PATCH] Moved "util" package contents into correct "utils" package --- .../blockplacemods/BlockPlaceMods.java | 87 +++++++++++-------- .../modules/blockplacemods/mods/Mod.java | 3 +- .../blockplacemods/mods/ModInventory.java | 5 +- .../mods/ModToggledAbstract.java | 2 +- .../util => utils}/CommandException.java | 2 +- .../util => utils}/CommandMap.java | 2 +- .../util => utils}/ItemProperties.java | 2 +- .../util => utils}/ThrowingSupplier.java | 2 +- 8 files changed, 61 insertions(+), 44 deletions(-) rename src/com/redstoner/{modules/blockplacemods/util => utils}/CommandException.java (91%) rename src/com/redstoner/{modules/blockplacemods/util => utils}/CommandMap.java (92%) rename src/com/redstoner/{modules/blockplacemods/util => utils}/ItemProperties.java (99%) rename src/com/redstoner/{modules/blockplacemods/util => utils}/ThrowingSupplier.java (85%) diff --git a/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java b/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java index 229fcf6..41c6c1e 100644 --- a/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java +++ b/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java @@ -1,5 +1,16 @@ package com.redstoner.modules.blockplacemods; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.Listener; + import com.nemez.cmdmgr.Command; import com.redstoner.annotations.AutoRegisterListener; import com.redstoner.annotations.Version; @@ -9,17 +20,11 @@ import com.redstoner.modules.Module; import com.redstoner.modules.blockplacemods.mods.Mod; import com.redstoner.modules.blockplacemods.mods.ModAbstract; import com.redstoner.modules.blockplacemods.mods.ModToggledAbstract; -import com.redstoner.modules.blockplacemods.util.CommandException; -import com.redstoner.modules.blockplacemods.util.CommandMap; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.Listener; - -import java.util.*; +import com.redstoner.utils.CommandException; +import com.redstoner.utils.CommandMap; @AutoRegisterListener -@Version(major = 3, minor = 2, revision = 3, compatible = 3) +@Version(major = 3, minor = 2, revision = 4, compatible = 3) public final class BlockPlaceMods implements Module, Listener { public static String PREFIX = ChatColor.GRAY + "[" + ChatColor.DARK_GREEN + "BPM" + ChatColor.GRAY + "]" @@ -90,7 +95,6 @@ public final class BlockPlaceMods implements Module, Listener * "}\n" + * "}\n"; * } */ - @Command(hook = "mod_empty") public void onModEmptyCommand(CommandSender sender) { @@ -104,34 +108,46 @@ public final class BlockPlaceMods implements Module, Listener .filter(x -> x != null && !x.trim().isEmpty()).toArray(String[]::new); String prefix = PREFIX; String message; - - try { - - if (args.length > 0) { + try + { + if (args.length > 0) + { Mod target = ModAbstract.getMod(args[0].toLowerCase()); - if (target != null) { + if (target != null) + { prefix += "&7[&2" + capitalize(target.getName()) + "&7]&a"; - if (!(sender instanceof Player)) { + if (!(sender instanceof Player)) + { message = "&cYou must be a player to use any block place mod"; - } else { + } + else + { message = target.runCommand((Player) sender, Arrays.copyOfRange(args, 1, args.length)); } - } else if (args[0].equalsIgnoreCase("help")) { + } + else if (args[0].equalsIgnoreCase("help")) + { message = commandHelp(sender, args); - } else { + } + else + { message = "&cThat argument could not be recognized"; } - } else { + } + else + { message = commandHelp(sender, args); } - - } catch (CommandException ex) { + } + catch (CommandException ex) + { message = " &c" + ex.getMessage(); - } catch (Throwable t) { + } + catch (Throwable t) + { message = " &cAn unexpected error occurred while executing this command."; t.printStackTrace(); } - Utils.sendMessage(sender, prefix, message, '&'); } @@ -139,36 +155,35 @@ public final class BlockPlaceMods implements Module, Listener { StringBuilder result = new StringBuilder("ยง7BlockPlaceMods adds some redstone-centric utilities"); result.append("\n").append(ChatColor.GRAY.toString()).append("Available mods:"); - List mods = new ArrayList<>(ModAbstract.getMods().values()); - mods.sort(Comparator.comparingInt(m -> ModToggledAbstract.class.isInstance(m) ? 1 : -1).thenComparing(Mod::getName)); - + mods.sort(Comparator. comparingInt(m -> ModToggledAbstract.class.isInstance(m) ? 1 : -1) + .thenComparing(Mod::getName)); for (Mod mod : mods) { result.append("\n").append(ChatColor.AQUA.toString()).append("/mod ").append(ChatColor.ITALIC.toString()) .append(mod.getName()); - - for (String alias : mod.getAliases()) { + for (String alias : mod.getAliases()) + { result.append('|').append(alias); } - - result.append(ChatColor.GRAY.toString()).append(" - ") - .append(mod.getDescription()); + result.append(ChatColor.GRAY.toString()).append(" - ").append(mod.getDescription()); } return result.toString(); } - private static String capitalize(String modName) { - if (modName.isEmpty()) { + private static String capitalize(String modName) + { + if (modName.isEmpty()) + { return modName; } char first = modName.charAt(0); - if (first != (first = Character.toUpperCase(first))) { + if (first != (first = Character.toUpperCase(first))) + { char[] result = modName.toCharArray(); result[0] = first; return String.valueOf(result); } return modName; } - } diff --git a/src/com/redstoner/modules/blockplacemods/mods/Mod.java b/src/com/redstoner/modules/blockplacemods/mods/Mod.java index 7429010..9a2fcad 100644 --- a/src/com/redstoner/modules/blockplacemods/mods/Mod.java +++ b/src/com/redstoner/modules/blockplacemods/mods/Mod.java @@ -1,8 +1,9 @@ package com.redstoner.modules.blockplacemods.mods; -import com.redstoner.modules.blockplacemods.util.CommandException; import org.bukkit.entity.Player; +import com.redstoner.utils.CommandException; + import java.util.Set; public interface Mod diff --git a/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java b/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java index 2a804f2..0d3f2af 100644 --- a/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java +++ b/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java @@ -1,8 +1,9 @@ package com.redstoner.modules.blockplacemods.mods; -import com.redstoner.modules.blockplacemods.util.CommandException; -import com.redstoner.modules.blockplacemods.util.ItemProperties; import com.redstoner.modules.datamanager.DataManager; +import com.redstoner.utils.CommandException; +import com.redstoner.utils.ItemProperties; + import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; diff --git a/src/com/redstoner/modules/blockplacemods/mods/ModToggledAbstract.java b/src/com/redstoner/modules/blockplacemods/mods/ModToggledAbstract.java index c3bf2ca..ba3d37e 100644 --- a/src/com/redstoner/modules/blockplacemods/mods/ModToggledAbstract.java +++ b/src/com/redstoner/modules/blockplacemods/mods/ModToggledAbstract.java @@ -2,8 +2,8 @@ package com.redstoner.modules.blockplacemods.mods; import org.bukkit.entity.Player; -import com.redstoner.modules.blockplacemods.util.CommandException; import com.redstoner.modules.datamanager.DataManager; +import com.redstoner.utils.CommandException; public abstract class ModToggledAbstract extends ModAbstract { diff --git a/src/com/redstoner/modules/blockplacemods/util/CommandException.java b/src/com/redstoner/utils/CommandException.java similarity index 91% rename from src/com/redstoner/modules/blockplacemods/util/CommandException.java rename to src/com/redstoner/utils/CommandException.java index e113026..2445134 100644 --- a/src/com/redstoner/modules/blockplacemods/util/CommandException.java +++ b/src/com/redstoner/utils/CommandException.java @@ -1,4 +1,4 @@ -package com.redstoner.modules.blockplacemods.util; +package com.redstoner.utils; public class CommandException extends Exception { diff --git a/src/com/redstoner/modules/blockplacemods/util/CommandMap.java b/src/com/redstoner/utils/CommandMap.java similarity index 92% rename from src/com/redstoner/modules/blockplacemods/util/CommandMap.java rename to src/com/redstoner/utils/CommandMap.java index d350a62..7ae67d0 100644 --- a/src/com/redstoner/modules/blockplacemods/util/CommandMap.java +++ b/src/com/redstoner/utils/CommandMap.java @@ -1,4 +1,4 @@ -package com.redstoner.modules.blockplacemods.util; +package com.redstoner.utils; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/src/com/redstoner/modules/blockplacemods/util/ItemProperties.java b/src/com/redstoner/utils/ItemProperties.java similarity index 99% rename from src/com/redstoner/modules/blockplacemods/util/ItemProperties.java rename to src/com/redstoner/utils/ItemProperties.java index 223987c..8c8b27e 100644 --- a/src/com/redstoner/modules/blockplacemods/util/ItemProperties.java +++ b/src/com/redstoner/utils/ItemProperties.java @@ -1,4 +1,4 @@ -package com.redstoner.modules.blockplacemods.util; +package com.redstoner.utils; import java.util.HashMap; import java.util.List; diff --git a/src/com/redstoner/modules/blockplacemods/util/ThrowingSupplier.java b/src/com/redstoner/utils/ThrowingSupplier.java similarity index 85% rename from src/com/redstoner/modules/blockplacemods/util/ThrowingSupplier.java rename to src/com/redstoner/utils/ThrowingSupplier.java index 9dc3cf3..986746b 100644 --- a/src/com/redstoner/modules/blockplacemods/util/ThrowingSupplier.java +++ b/src/com/redstoner/utils/ThrowingSupplier.java @@ -1,4 +1,4 @@ -package com.redstoner.modules.blockplacemods.util; +package com.redstoner.utils; /** * A supplier with a throws declaration.