diff --git a/src/main/java/ninja/amp/fallout/character/Special.java b/src/main/java/ninja/amp/fallout/character/Special.java index f55114a..b39d25b 100644 --- a/src/main/java/ninja/amp/fallout/character/Special.java +++ b/src/main/java/ninja/amp/fallout/character/Special.java @@ -125,14 +125,13 @@ public int getTotal() { @Override public String toString() { - return new StringBuilder() - .append("S:").append(traits.get(Trait.STRENGTH)) - .append(" P:").append(traits.get(Trait.PERCEPTION)) - .append(" E:").append(traits.get(Trait.ENDURANCE)) - .append(" C:").append(traits.get(Trait.CHARISMA)) - .append(" I:").append(traits.get(Trait.INTELLIGENCE)) - .append(" A:").append(traits.get(Trait.AGILITY)) - .append(" L:").append(traits.get(Trait.LUCK)).toString(); + return "S:" + traits.get(Trait.STRENGTH) + + " P:" + traits.get(Trait.PERCEPTION) + + " E:" + traits.get(Trait.ENDURANCE) + + " C:" + traits.get(Trait.CHARISMA) + + " I:" + traits.get(Trait.INTELLIGENCE) + + " A:" + traits.get(Trait.AGILITY) + + " L:" + traits.get(Trait.LUCK); } } diff --git a/src/main/java/ninja/amp/fallout/command/CommandController.java b/src/main/java/ninja/amp/fallout/command/CommandController.java index d2e601b..5ed00b5 100644 --- a/src/main/java/ninja/amp/fallout/command/CommandController.java +++ b/src/main/java/ninja/amp/fallout/command/CommandController.java @@ -81,7 +81,7 @@ public List onTabComplete(CommandSender sender, org.bukkit.command.Comma } } if ((!(command instanceof Command) || args.length - commandAmount <= command.getMaxArgsLength()) && args.length > commandAmount) { - return command.getTabCompleteList(Arrays.asList(args).subList(commandAmount, args.length)); + return command.tabComplete(Arrays.asList(args).subList(commandAmount, args.length)); } } } diff --git a/src/main/java/ninja/amp/fallout/command/CommandGroup.java b/src/main/java/ninja/amp/fallout/command/CommandGroup.java index 749cc48..25b21c0 100644 --- a/src/main/java/ninja/amp/fallout/command/CommandGroup.java +++ b/src/main/java/ninja/amp/fallout/command/CommandGroup.java @@ -256,7 +256,7 @@ public void execute(String command, CommandSender sender, List args) { * @param args The args already entered * @return The tab completion list of the command group */ - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), tabCompleteList); diff --git a/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java b/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java index 4cfc382..8a24d29 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java +++ b/src/main/java/ninja/amp/fallout/command/commands/HelpCommand.java @@ -58,7 +58,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCommandController().getPageList().getPageNumbersList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/Whois.java b/src/main/java/ninja/amp/fallout/command/commands/Whois.java index 4481cdd..fda44ea 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/Whois.java +++ b/src/main/java/ninja/amp/fallout/command/commands/Whois.java @@ -62,7 +62,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java b/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java index f610664..b0122d8 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/Possess.java @@ -76,7 +76,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getExistingCharacters()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java b/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java index 7549777..52f5561 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/Upgrade.java @@ -73,7 +73,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java index 1092150..a0b442b 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Teach.java @@ -78,7 +78,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java index a6ca08a..a843ccc 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/knowledge/Unteach.java @@ -78,7 +78,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java b/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java index 51cea35..cbbcd89 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/perk/ResetPerks.java @@ -86,7 +86,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java b/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java index bf26377..3ee82fb 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/profile/Profile.java @@ -81,7 +81,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java b/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java index 5583140..956feb4 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java +++ b/src/main/java/ninja/amp/fallout/command/commands/character/skill/ResetSkills.java @@ -83,7 +83,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), fallout.getCharacterManager().getCharacterList()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java index f53704b..b9feab6 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java +++ b/src/main/java/ninja/amp/fallout/command/commands/roll/ArmorRoll.java @@ -46,7 +46,7 @@ public void execute(String command, CommandSender sender, List args) { } @Override - public List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), DamageType.getDamageTypeNames()); diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java index e9325e8..e36a882 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java +++ b/src/main/java/ninja/amp/fallout/command/commands/roll/GlobalRoll.java @@ -82,7 +82,7 @@ public void execute(String command, Player sender, Character character, List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), tabCompleteList); diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java index 6de4678..2d266b9 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java +++ b/src/main/java/ninja/amp/fallout/command/commands/roll/LocalRoll.java @@ -83,7 +83,7 @@ public void execute(String command, Player sender, Character character, List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), tabCompleteList); diff --git a/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java b/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java index 9687e6b..666318e 100644 --- a/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java +++ b/src/main/java/ninja/amp/fallout/command/commands/roll/PrivateRoll.java @@ -82,7 +82,7 @@ public void execute(String command, Player sender, Character character, List getTabCompleteList(List args) { + public List tabComplete(List args) { switch (args.size()) { case 1: return tabCompletions(args.get(0), tabCompleteList);