From 448d8a8ce029b4afc33b6fb8d7b69a8970684e52 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 18 Feb 2018 01:47:50 +0100 Subject: [PATCH] Using maven and fixed encoding Also using IDEA. Also fixes based on code analysis. --- .classpath | 7 - .gitignore | 2 + pom.xml | 37 +++++ .../norbipeti/onecommandhelper/Commands.java | 134 +++++++++--------- .../onecommandhelper/PluginMain.java | 23 ++- 5 files changed, 117 insertions(+), 86 deletions(-) delete mode 100644 .classpath create mode 100644 pom.xml rename src/{ => main/java}/io/github/norbipeti/onecommandhelper/Commands.java (85%) rename src/{ => main/java}/io/github/norbipeti/onecommandhelper/PluginMain.java (71%) diff --git a/.classpath b/.classpath deleted file mode 100644 index ca0e212..0000000 --- a/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.gitignore b/.gitignore index ae3c172..f408f2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /bin/ +/.idea/ +*.iml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..08dc0cd --- /dev/null +++ b/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + com.github.NorbiPeti + OneCommandHelper + 1.0-SNAPSHOT + + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + +spigot + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + + org.spigotmc + spigot-api + 1.12.2-R0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/src/io/github/norbipeti/onecommandhelper/Commands.java b/src/main/java/io/github/norbipeti/onecommandhelper/Commands.java similarity index 85% rename from src/io/github/norbipeti/onecommandhelper/Commands.java rename to src/main/java/io/github/norbipeti/onecommandhelper/Commands.java index d2b4361..e2f0470 100644 --- a/src/io/github/norbipeti/onecommandhelper/Commands.java +++ b/src/main/java/io/github/norbipeti/onecommandhelper/Commands.java @@ -1,67 +1,67 @@ -package io.github.norbipeti.onecommandhelper; - -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.CommandBlock; -import org.bukkit.command.BlockCommandSender; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class Commands implements CommandExecutor -{ - private final String[] replacecmds = { "achievement", "ban", "ban-ip", - "banlist", "blockdata", "clear", "clone", "debug", - "defaultgamemode", "deop", "difficulty", "effect", "enchant", - "entitydata", "execute", "fill", "gamemode", "gamerule", "give", - "help", "kick", "kill", "list", "me", "op", "pardon", "particle", - "playsound", "publish", "replaceitem", "save", "save-all", - "save-off", "save-on", "say", "scoreboard", "seed", "setblock", - "setidletimeout", "setworldspawn", "spawnpoint", "spreadplayers", - "stats", "stop", "stopsound", "summon", "teleport", "tell", - "tellraw", "testfor", "testforblock", "testforblocks", "time", - "title", "toggledownfall", "tp", "trigger", "weather", "whitelist", - "worldborder", "xp", "commands", "banip", "broadcast", "home", - "setspawn", "unban" }; - - @Override - public boolean onCommand(CommandSender sender, Command cmd, String alias, - String[] args) - { - StringBuilder acmdb = new StringBuilder("minecraft:execute " - + sender.getName() + " ~ ~ ~ "); - if (sender != Bukkit.getConsoleSender() - && !(sender instanceof BlockCommandSender)) - { - Block block = ((Player) sender).getLocation().subtract(0, 1, 0) - .getBlock(); - if (block.getType() != Material.COMMAND) - { - sender.sendMessage("§cError! Block underneath must be command block! Found " - + block.getType()); - return true; - } - CommandBlock cmdblock = (CommandBlock) block.getState(); - acmdb.append(cmdblock.getCommand()); - } else - { - if (args.length == 0) - { - sender.sendMessage("§cUsage: /" + alias + " "); - return true; //Why use the builtin usage shoing thing - } - } - String acmd = acmdb.toString(); - StringBuilder replace = new StringBuilder("(" + replacecmds[0]); - for (int i = 1; i < replacecmds.length; i++) - replace.append("|" + replacecmds[i]); - replace.append(")"); - acmd = acmd.replaceAll("([^t]|^)( |:| \\/|:\\/)" + replace + " ", - "$1$2minecraft:$3 ").replaceAll("\" (\\/*)minecraft:", - "\"$1minecraft:"); //Tellraw - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), acmd); - return true; - } -} +package io.github.norbipeti.onecommandhelper; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.CommandBlock; +import org.bukkit.command.BlockCommandSender; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class Commands implements CommandExecutor +{ + private final String[] replacecmds = { "achievement", "ban", "ban-ip", + "banlist", "blockdata", "clear", "clone", "debug", + "defaultgamemode", "deop", "difficulty", "effect", "enchant", + "entitydata", "execute", "fill", "gamemode", "gamerule", "give", + "help", "kick", "kill", "list", "me", "op", "pardon", "particle", + "playsound", "publish", "replaceitem", "save", "save-all", + "save-off", "save-on", "say", "scoreboard", "seed", "setblock", + "setidletimeout", "setworldspawn", "spawnpoint", "spreadplayers", + "stats", "stop", "stopsound", "summon", "teleport", "tell", + "tellraw", "testfor", "testforblock", "testforblocks", "time", + "title", "toggledownfall", "tp", "trigger", "weather", "whitelist", + "worldborder", "xp", "commands", "banip", "broadcast", "home", + "setspawn", "unban" }; + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String alias, + String[] args) + { + StringBuilder acmdb = new StringBuilder("minecraft:execute " + + sender.getName() + " ~ ~ ~ "); + if (sender != Bukkit.getConsoleSender() + && !(sender instanceof BlockCommandSender)) + { + Block block = ((Player) sender).getLocation().subtract(0, 1, 0) + .getBlock(); + if (block.getType() != Material.COMMAND) + { + sender.sendMessage("§cError! Block underneath must be command block! Found " + + block.getType()); + return true; + } + CommandBlock cmdblock = (CommandBlock) block.getState(); + acmdb.append(cmdblock.getCommand()); + } else + { + if (args.length == 0) + { + sender.sendMessage("§cUsage: /" + alias + " "); + return true; //Why use the builtin usage shoing thing + } + } + String acmd = acmdb.toString(); + StringBuilder replace = new StringBuilder("(" + replacecmds[0]); + for (int i = 1; i < replacecmds.length; i++) + replace.append("|").append(replacecmds[i]); + replace.append(")"); + acmd = acmd.replaceAll("([^t]|^)( |:| /|:/)" + replace + " ", + "$1$2minecraft:$3 ").replaceAll("\" (/*)minecraft:", + "\"$1minecraft:"); //Tellraw + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), acmd); + return true; + } +} diff --git a/src/io/github/norbipeti/onecommandhelper/PluginMain.java b/src/main/java/io/github/norbipeti/onecommandhelper/PluginMain.java similarity index 71% rename from src/io/github/norbipeti/onecommandhelper/PluginMain.java rename to src/main/java/io/github/norbipeti/onecommandhelper/PluginMain.java index 5828709..260c2de 100644 --- a/src/io/github/norbipeti/onecommandhelper/PluginMain.java +++ b/src/main/java/io/github/norbipeti/onecommandhelper/PluginMain.java @@ -1,12 +1,11 @@ -package io.github.norbipeti.onecommandhelper; - -import org.bukkit.plugin.java.JavaPlugin; - -public class PluginMain extends JavaPlugin -{ - @Override - public void onEnable() { - //getServer().getPluginManager().registerEvents(new CommandListener(), this); - getCommand("occ").setExecutor(new Commands()); - } -} +package io.github.norbipeti.onecommandhelper; + +import org.bukkit.plugin.java.JavaPlugin; + +public class PluginMain extends JavaPlugin +{ + @Override + public void onEnable() { + getCommand("occ").setExecutor(new Commands()); + } +}