norbipeti/OneCommandHelper
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity

Added fallback command handling

Browse source
This commit is contained in:
Norbi Peti 2018-03-15 15:28:34 +01:00
parent ef4011d73d
commit e7109d40a8
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/io/github/norbipeti/onecommandhelper/Commands.java
View file

@ -18,6 +18,20 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
public class Commands implements CommandExecutor { public class Commands implements CommandExecutor {
private final String[] fallbackreplacecmds = {"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 @Override
public boolean onCommand(CommandSender sender, Command cmd, String alias, public boolean onCommand(CommandSender sender, Command cmd, String alias,
String[] args) { String[] args) {
@ -40,7 +54,6 @@ public class Commands implements CommandExecutor {
} }
CommandBlock cmdblock = (CommandBlock) block.getState(); CommandBlock cmdblock = (CommandBlock) block.getState();
acmdb.append(block.getX()).append(".5 ").append(block.getY()).append(".5 ").append(block.getZ()).append(".5 "); acmdb.append(block.getX()).append(".5 ").append(block.getY()).append(".5 ").append(block.getZ()).append(".5 ");
//acmdb.append("~ ~ ~ ");
acmdb.append(cmdblock.getCommand()); acmdb.append(cmdblock.getCommand());
} else { } else {
sender.sendMessage("§cYou need to be a player and look at the command block where you have the command you need to run."); sender.sendMessage("§cYou need to be a player and look at the command block where you have the command you need to run.");
@ -53,11 +66,10 @@ public class Commands implements CommandExecutor {
Field f = iht.getClass().getDeclaredField("allTopics"); Field f = iht.getClass().getDeclaredField("allTopics");
f.setAccessible(true); f.setAccessible(true);
replacecmds = ((Collection<HelpTopic>) f.get(iht)).stream().filter(ht -> ht.getName().startsWith("/minecraft:")).map(ht -> ht.getName().substring("/minecraft:".length())).toArray(String[]::new); replacecmds = ((Collection<HelpTopic>) f.get(iht)).stream().filter(ht -> ht.getName().startsWith("/minecraft:")).map(ht -> ht.getName().substring("/minecraft:".length())).toArray(String[]::new);
//System.out.println(Arrays.toString(replacecmds)); //TODO: Fallback method
} catch (Exception e) { } catch (Exception e) {
sender.sendMessage("§cAn error occured while getting commands!");
e.printStackTrace(); e.printStackTrace();
return true; PluginMain.getPlugin(PluginMain.class).getLogger().info("Using fallback command array");
replacecmds = fallbackreplacecmds;
} }
StringBuilder replace = new StringBuilder("(").append(replacecmds[0]); StringBuilder replace = new StringBuilder("(").append(replacecmds[0]);
for (int i = 1; i < replacecmds.length; i++) for (int i = 1; i < replacecmds.length; i++)