mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-21 09:12:22 +00:00
Proper Reformating
This commit is contained in:
1 parent
ce75880aba
commit
180d257024
1179 files changed
+59847
-61583
No files matched your search
@@ -99,16 +99,17 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
String[] np = currentHelper.usage.split(" ");
|
||||
if(np.length < args.length)
|
||||
return null;
|
||||
if (np.length < args.length)
|
||||
return null;
|
||||
String parameter = np[args.length - 1];
|
||||
if(parameter.equals("<player>"))
|
||||
if (parameter.equals("<player>"))
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames());
|
||||
|
||||
return null;
|
||||
return null;
|
||||
}
|
||||
|
||||
public Method method;
|
||||
@@ -144,7 +145,7 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
args = Arrays.copyOfRange(args, 1, args.length);
|
||||
|
||||
if ((cmd.equals("HELP") || args.length == 0) && doHelp(param, args, cmd)) {
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
CommandHelper ch = commands.get(cmd);
|
||||
@@ -157,8 +158,7 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
f.parentCmdHelper = this;
|
||||
f.rootCmdHelper = this.rootCmdHelper;
|
||||
return f.processCommand(param, args);
|
||||
}
|
||||
else if (ch instanceof MethodSubCmd) {
|
||||
} else if (ch instanceof MethodSubCmd) {
|
||||
MethodSubCmd m = (MethodSubCmd) ch;
|
||||
m.method.setAccessible(true);
|
||||
currentHelper = ch.commandHelper;
|
||||
@@ -174,72 +174,68 @@ public abstract class AbstractCommandHelper extends CommandHelper {
|
||||
Logger.getLogger(AbstractCommandHelper.class.getName()).log(Level.SEVERE, m.commandHelper.name, ex);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
} else
|
||||
cmdError(cmd);
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean doHelp(ICommandSender param, String[] args, String cmd){
|
||||
boolean isHelp = cmd.equals("HELP");
|
||||
if(args.length > 0){
|
||||
cmd = args[0];
|
||||
}
|
||||
CommandHelper ch = commands.get(cmd.toUpperCase());
|
||||
if(ch != null){
|
||||
if(ch.commandHelper.hasEmptyCall && !isHelp)
|
||||
return false;
|
||||
if(ch instanceof AbstractCommandHelper){
|
||||
((AbstractCommandHelper)ch).pcParam = param;
|
||||
((AbstractCommandHelper)ch).allHelp();
|
||||
}
|
||||
else if(ch instanceof MethodSubCmd && ((MethodSubCmd)ch).commandHelper.usage.isEmpty())
|
||||
return false;
|
||||
else
|
||||
help(ch.commandHelper.name, ch.commandHelper.desc, ch.commandHelper.usage);
|
||||
}
|
||||
else
|
||||
allHelp();
|
||||
private boolean doHelp(ICommandSender param, String[] args, String cmd) {
|
||||
boolean isHelp = cmd.equals("HELP");
|
||||
if (args.length > 0) {
|
||||
cmd = args[0];
|
||||
}
|
||||
CommandHelper ch = commands.get(cmd.toUpperCase());
|
||||
if (ch != null) {
|
||||
if (ch.commandHelper.hasEmptyCall && !isHelp)
|
||||
return false;
|
||||
if (ch instanceof AbstractCommandHelper) {
|
||||
((AbstractCommandHelper) ch).pcParam = param;
|
||||
((AbstractCommandHelper) ch).allHelp();
|
||||
} else if (ch instanceof MethodSubCmd && ((MethodSubCmd) ch).commandHelper.usage.isEmpty())
|
||||
return false;
|
||||
else
|
||||
help(ch.commandHelper.name, ch.commandHelper.desc, ch.commandHelper.usage);
|
||||
} else
|
||||
allHelp();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
if(args.length <= 1){
|
||||
List<String> list = new ArrayList<String>();
|
||||
for(String command : commands.keySet())
|
||||
list.add(command.toLowerCase());
|
||||
list.add("help");
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, list.toArray(new String[list.size()]));
|
||||
}
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
if (args.length <= 1) {
|
||||
List<String> list = new ArrayList<String>();
|
||||
for (String command : commands.keySet())
|
||||
list.add(command.toLowerCase());
|
||||
list.add("help");
|
||||
return CommandBase.getListOfStringsMatchingLastWord(args, list.toArray(new String[list.size()]));
|
||||
}
|
||||
CommandHelper ch = commands.get(args[0].toUpperCase());
|
||||
if(ch == null)
|
||||
return null;
|
||||
if (ch == null)
|
||||
return null;
|
||||
args = Arrays.copyOfRange(args, 1, args.length);
|
||||
currentHelper = ch.commandHelper;
|
||||
return ch.addTabCompletion(par1, args);
|
||||
}
|
||||
return ch.addTabCompletion(par1, args);
|
||||
}
|
||||
|
||||
public List<PlayerData> getPlayersData(String username){
|
||||
ArrayList<PlayerData> list = new ArrayList<PlayerData>();
|
||||
EntityPlayerMP[] players = PlayerSelector.matchPlayers(pcParam, username);
|
||||
if(players == null || players.length == 0){
|
||||
PlayerData data = PlayerDataController.Instance.getDataFromUsername(username);
|
||||
if(data != null)
|
||||
list.add(data);
|
||||
}
|
||||
else{
|
||||
for(EntityPlayer player : players){
|
||||
list.add(PlayerDataController.Instance.getPlayerData(player));
|
||||
public List<PlayerData> getPlayersData(String username) {
|
||||
ArrayList<PlayerData> list = new ArrayList<PlayerData>();
|
||||
EntityPlayerMP[] players = PlayerSelector.matchPlayers(pcParam, username);
|
||||
if (players == null || players.length == 0) {
|
||||
PlayerData data = PlayerDataController.Instance.getDataFromUsername(username);
|
||||
if (data != null)
|
||||
list.add(data);
|
||||
} else {
|
||||
for (EntityPlayer player : players) {
|
||||
list.add(PlayerDataController.Instance.getPlayerData(player));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
return list;
|
||||
}
|
||||
|
||||
public <T> List<T> getNearbeEntityFromPlayer(Class<? extends T> cls, World world, int x, int y, int z, int range) {
|
||||
AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(range, range, range);
|
||||
List<T> list = world.getEntitiesWithinAABB(cls, bb);
|
||||
return list;
|
||||
}
|
||||
AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(range, range, range);
|
||||
List<T> list = world.getEntitiesWithinAABB(cls, bb);
|
||||
return list;
|
||||
}
|
||||
}
|
||||
@@ -16,10 +16,10 @@ public class ChMcLogger extends AbstractCommandHelper {
|
||||
|
||||
@Override
|
||||
public void help(String cmd, String desc, String usa) {
|
||||
if(usa.isEmpty())
|
||||
sendmessage(String.format("%s = %s", cmd, desc));
|
||||
else
|
||||
sendmessage(String.format("%s %s = %s", cmd, usa, desc));
|
||||
if (usa.isEmpty())
|
||||
sendmessage(String.format("%s = %s", cmd, desc));
|
||||
else
|
||||
sendmessage(String.format("%s %s = %s", cmd, usa, desc));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,8 +13,10 @@ public abstract class CommandHelper {
|
||||
public String desc;
|
||||
public boolean hasEmptyCall;
|
||||
}
|
||||
|
||||
public Helper commandHelper = new Helper();
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public List addTabCompletion(ICommandSender par1, String[] args) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -13,9 +13,9 @@ public class OpOnly extends AbstractPermission {
|
||||
|
||||
@Override
|
||||
public boolean delegate(AbstractCommandHelper parent, String[] args) {
|
||||
if(!(parent.pcParam instanceof EntityPlayer))
|
||||
return true;
|
||||
return MinecraftServer.getServer().getConfigurationManager().func_152596_g(((EntityPlayer)parent.pcParam).getGameProfile());
|
||||
if (!(parent.pcParam instanceof EntityPlayer))
|
||||
return true;
|
||||
return MinecraftServer.getServer().getConfigurationManager().func_152596_g(((EntityPlayer) parent.pcParam).getGameProfile());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,9 +15,9 @@ public class ParamCheck extends AbstractPermission {
|
||||
public boolean delegate(AbstractCommandHelper parent, String[] args) {
|
||||
String[] np = parent.currentHelper.usage.split(" ");
|
||||
int countRequired = 0;
|
||||
for(String command : np){
|
||||
if(command.startsWith("<"))
|
||||
countRequired++;
|
||||
for (String command : np) {
|
||||
if (command.startsWith("<"))
|
||||
countRequired++;
|
||||
}
|
||||
if (args.length < countRequired) {
|
||||
err = np[args.length] + " missing";
|
||||
|
||||
@@ -9,7 +9,6 @@ import foxz.commandhelper.AbstractCommandHelper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author foxz
|
||||
*/
|
||||
public class PlayerOnly extends AbstractPermission {
|
||||
|
||||
Reference in new issue
Block a user