TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #454 from Simplicitee/master

Browse source 
Updates
This commit is contained in:
OmniCypher 2016-03-23 18:40:11 -07:00
commit 8e2b0b0fe1
3 changed files with 84 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/ProjectKorraRPG.jar
View file

Binary file not shown.

62
src/com/projectkorra/projectkorra/command/BendingTabComplete.java
View file

@ -6,6 +6,7 @@ import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.object.Preset;
import com.projectkorra.rpg.commands.RPGCommand;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@ -251,19 +252,54 @@ public class BendingTabComplete implements TabCompleter {
l.add(p.getName());
}
return getPossibleCompletionsForGivenArgs(args, l);
} else if (GeneralMethods.hasRPG() && (args[0].equalsIgnoreCase("avatar") || args[0].equalsIgnoreCase("av") || args[0].equalsIgnoreCase("avy"))) {
if (!sender.hasPermission("bending.command.avatar") || args.length > 2) return new ArrayList<String>();
List<String> l = new ArrayList<String>();
for (Player p : Bukkit.getOnlinePlayers()) {
l.add(p.getName());
}
return getPossibleCompletionsForGivenArgs(args, l);
} else if (GeneralMethods.hasRPG() && (args[0].equalsIgnoreCase("worldevent") || args[0].equalsIgnoreCase("event") || args[0].equalsIgnoreCase("we") || args[0].equalsIgnoreCase("worlde"))) {
if (!sender.hasPermission("bending.command.worldevent") || args.length > 3) return new ArrayList<String>();
if (args.length == 2) {
return getPossibleCompletionsForGivenArgs(args, Arrays.asList(new String[] {"current", "help", "start"}));
} else if (args[1].equalsIgnoreCase("start")) {
return getPossibleCompletionsForGivenArgs(args, Arrays.asList(new String[] {"FullMoon", "LunarEclipse", "SolarEclipse", "SozinsComet"}));
} else if (GeneralMethods.hasRPG()) {
if (args[0].equalsIgnoreCase("rpg")) {
if (sender.hasPermission("bending.command.rpg") && args.length <= 4) {
if (args.length == 2) {
List<String> l = new ArrayList<>();
l.addAll(RPGCommand.instances.keySet());
Collections.sort(l);
return getPossibleCompletionsForGivenArgs(args, l);
} else if (args.length == 3) {
List<String> l = new ArrayList<>();
if (Arrays.asList(RPGCommand.instances.get("avatar").getAliases()).contains(args[1].toLowerCase()) && sender.hasPermission("bending.command.rpg.avatar")) {
for (Player p : Bukkit.getOnlinePlayers()) {
l.add(p.getName());
}
} else if (Arrays.asList(RPGCommand.instances.get("worldevent").getAliases()).contains(args[1].toLowerCase()) && sender.hasPermission("bending.command.rpg.worldevent")) {
l.add("start");
l.add("end");
l.add("help");
l.add("skip");
l.add("current");
} else if (Arrays.asList(RPGCommand.instances.get("help").getAliases()).contains(args[1].toLowerCase()) && sender.hasPermission("bending.command.rpg.help")) {
l.add("lunareclipse");
l.add("solareclipse");
l.add("sozinscomet");
l.add("fullmoon");
for (String rpg : RPGCommand.instances.keySet()) {
if (!rpg.equalsIgnoreCase("help")) {
l.add(rpg);
}
}
}
Collections.sort(l);
return getPossibleCompletionsForGivenArgs(args, l);
} else if (args.length == 4) {
List<String> l = new ArrayList<>();
String[] start = {"start", "st", "strt", "begin"};
if (Arrays.asList(RPGCommand.instances.get("worldevent").getAliases()).contains(args[1].toLowerCase()) && sender.hasPermission("bending.command.rpg.worldevent")) {
if (Arrays.asList(start).contains(args[2].toLowerCase())) {
l.add("lunareclipse");
l.add("solareclipse");
l.add("sozinscomet");
l.add("fullmoon");
}
}
Collections.sort(l);
return getPossibleCompletionsForGivenArgs(args, l);
}
}
}
}

44
src/com/projectkorra/projectkorra/command/HelpCommand.java
View file

@ -1,19 +1,21 @@
package com.projectkorra.projectkorra.command;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.rpg.commands.RPGCommand;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.configuration.ConfigManager;
/**
* Executor for /bending help. Extends {@link PKCommand}.
*/
@ -58,6 +60,18 @@ public class HelpCommand extends PKCommand {
strings.add(command.getProperUse());
}
}
if (GeneralMethods.hasItems()) {
//items commands being added
}
if (GeneralMethods.hasRPG()) {
for (RPGCommand command : RPGCommand.instances.values()) {
if (sender.hasPermission("bending.command.rpg." + command.getName()))
strings.add(command.getProperUse());
}
}
if (GeneralMethods.hasSpirits()) {
//spirits commands being added (if needed)
}
Collections.sort(strings);
Collections.reverse(strings);
strings.add(instances.get("help").getProperUse());
@ -74,6 +88,18 @@ public class HelpCommand extends PKCommand {
for (PKCommand command : instances.values()) {
strings.add(command.getProperUse());
}
if (GeneralMethods.hasItems()) {
//items commands being added
}
if (GeneralMethods.hasRPG()) {
for (RPGCommand command : RPGCommand.instances.values()) {
if (sender.hasPermission("bending.command.rpg." + command.getName()))
strings.add(command.getProperUse());
}
}
if (GeneralMethods.hasSpirits()) {
//spirits commands being added (if needed)
}
for (String s : getPage(strings, ChatColor.GOLD + "Commands: <" + required + "> [" + optional + "]", Integer.valueOf(arg), true)) {
sender.sendMessage(ChatColor.YELLOW + s);
}