Browse Source

Prepare to implement editing commands.

master
Stanislav Usenkov 9 years ago
parent
commit
836cb76dff
  1. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/ArgumentUtilities.java
  2. 3
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java
  3. 61
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java

4
src/main/java/ru/simsonic/rscPermissions/Engine/CommandUtilities.java → src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/ArgumentUtilities.java

@ -1,10 +1,10 @@
package ru.simsonic.rscPermissions.Engine; package ru.simsonic.rscPermissions.Bukkit.Commands;
import ru.simsonic.rscCommonsLibrary.TimeIntervalParser; import ru.simsonic.rscCommonsLibrary.TimeIntervalParser;
import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException;
import ru.simsonic.rscPermissions.API.Destination; import ru.simsonic.rscPermissions.API.Destination;
public class CommandUtilities public class ArgumentUtilities
{ {
public static class CommandParams public static class CommandParams
{ {

3
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java

@ -3,7 +3,6 @@ package ru.simsonic.rscPermissions.Bukkit.Commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException;
import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.CommandUtilities;
import ru.simsonic.rscPermissions.Engine.Phrases; import ru.simsonic.rscPermissions.Engine.Phrases;
public class CommandDebug public class CommandDebug
@ -22,7 +21,7 @@ public class CommandDebug
{ {
try try
{ {
isDebugging = CommandUtilities.argumentToBoolean(args[1], isDebugging); isDebugging = ArgumentUtilities.argumentToBoolean(args[1], isDebugging);
} catch(IllegalArgumentException ex) { } catch(IllegalArgumentException ex) {
throw new CommandAnswerException("{_LR}" + ex.getMessage()); throw new CommandAnswerException("{_LR}" + ex.getMessage());
} }

61
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java

@ -104,22 +104,17 @@ public class CommandEntity
: "info"; : "info";
switch(subcommand) switch(subcommand)
{ {
case "info":
if(entity != null)
throw new CommandAnswerException(showEntityDetails(entity));
case "help":
throw new CommandAnswerException(getHelpForType(type));
case "prefix": case "prefix":
case "p": case "p":
if(result != null) if(result != null)
viewCalculatedPrefix(result, targetName); viewPlayerPrefix(result, targetName);
else else
viewEntityPrefix(entity); viewEntityPrefix(entity);
break; break;
case "suffix": case "suffix":
case "s": case "s":
if(result != null) if(result != null)
viewCalculatedSuffix(result, targetName); viewPlayerSuffix(result, targetName);
else else
viewEntitySuffix(entity); viewEntitySuffix(entity);
break; break;
@ -127,7 +122,7 @@ public class CommandEntity
case "permissions": case "permissions":
case "lp": case "lp":
if(result != null) if(result != null)
listFinalPlayerPermissions(result, targetName); showPlayerPermissions(result, targetName);
else else
showEntityPermissions(entity); showEntityPermissions(entity);
break; break;
@ -135,28 +130,36 @@ public class CommandEntity
case "groups": case "groups":
case "lg": case "lg":
if(result != null) if(result != null)
listUserGroupsTree(result, targetName); showPlayerParents(result, targetName);
else else
showEntityParents(entity); showEntityParents(entity);
break; break;
case "addpermission":
case "ap":
break;
case "removepermission":
case "rp":
break;
case "addgroup": case "addgroup":
case "ag": case "ag":
// TO DO HERE // TO DO HERE
addGroup(result, targetName, null, null, null); addGroup(entity, "group", null, null);
break;
case "addpermission":
case "ap":
// TO DO HERE
addPermission(entity, "permission", null, null);
break; break;
case "removegroup": case "removegroup":
case "rg": case "rg":
// TO DO HERE // TO DO HERE
removeGroup(result, targetName, null); removeGroup(entity, "group");
break; break;
default: case "removepermission":
case "rp":
// TO DO HERE
this.removePermission(entity, "permission");
break; break;
case "info":
if(entity != null)
throw new CommandAnswerException(showEntityDetails(entity));
case "help":
default:
throw new CommandAnswerException(getHelpForType(type));
} }
} }
public void listGroups(CommandSender sender) throws CommandAnswerException public void listGroups(CommandSender sender) throws CommandAnswerException
@ -286,7 +289,7 @@ public class CommandEntity
} }
return sb.toString(); return sb.toString();
} }
private void listFinalPlayerPermissions(ResolutionResult result, String user) throws CommandAnswerException private void showPlayerPermissions(ResolutionResult result, String user) throws CommandAnswerException
{ {
if(Matchers.isCorrectDashlessUUID(user)) if(Matchers.isCorrectDashlessUUID(user))
user = Matchers.uuidAddDashes(user); user = Matchers.uuidAddDashes(user);
@ -296,7 +299,7 @@ public class CommandEntity
answer.add((entry.getValue() ? "{_LG}" : "{_LR}") + entry.getKey()); answer.add((entry.getValue() ? "{_LG}" : "{_LR}") + entry.getKey());
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);
} }
private void listUserGroupsTree(ResolutionResult result, String player) throws CommandAnswerException private void showPlayerParents(ResolutionResult result, String player) throws CommandAnswerException
{ {
if(Matchers.isCorrectDashlessUUID(player)) if(Matchers.isCorrectDashlessUUID(player))
player = Matchers.uuidAddDashes(player); player = Matchers.uuidAddDashes(player);
@ -322,7 +325,7 @@ public class CommandEntity
answer.add("{_R}\"" + (entity.suffix != null ? entity.suffix : "") + "{_R}\""); answer.add("{_R}\"" + (entity.suffix != null ? entity.suffix : "") + "{_R}\"");
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);
} }
private void viewCalculatedPrefix(ResolutionResult result, String user) throws CommandAnswerException private void viewPlayerPrefix(ResolutionResult result, String user) throws CommandAnswerException
{ {
if(Matchers.isCorrectDashlessUUID(user)) if(Matchers.isCorrectDashlessUUID(user))
user = Matchers.uuidAddDashes(user); user = Matchers.uuidAddDashes(user);
@ -331,7 +334,7 @@ public class CommandEntity
answer.add("{_R}\"" + result.getPrefix() + "{_R}\""); answer.add("{_R}\"" + result.getPrefix() + "{_R}\"");
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);
} }
private void viewCalculatedSuffix(ResolutionResult result, String user) throws CommandAnswerException private void viewPlayerSuffix(ResolutionResult result, String user) throws CommandAnswerException
{ {
if(Matchers.isCorrectDashlessUUID(user)) if(Matchers.isCorrectDashlessUUID(user))
user = Matchers.uuidAddDashes(user); user = Matchers.uuidAddDashes(user);
@ -340,12 +343,22 @@ public class CommandEntity
answer.add("{_R}\"" + result.getSuffix() + "{_R}\""); answer.add("{_R}\"" + result.getSuffix() + "{_R}\"");
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);
} }
private void addGroup(ResolutionResult result, String user, String parent, String destination, Integer seconds) throws CommandAnswerException private void addGroup(RowEntity entity, String parent, String destination, Integer seconds) throws CommandAnswerException
{
final ArrayList<String> answer = new ArrayList<>();
throw new CommandAnswerException(answer);
}
private void addPermission(RowEntity entity, String parent, String destination, Integer seconds) throws CommandAnswerException
{
final ArrayList<String> answer = new ArrayList<>();
throw new CommandAnswerException(answer);
}
private void removeGroup(RowEntity entity, String whatToRemove) throws CommandAnswerException
{ {
final ArrayList<String> answer = new ArrayList<>(); final ArrayList<String> answer = new ArrayList<>();
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);
} }
private void removeGroup(ResolutionResult result, String user, String parent) throws CommandAnswerException private void removePermission(RowEntity entity, String whatToRemove) throws CommandAnswerException
{ {
final ArrayList<String> answer = new ArrayList<>(); final ArrayList<String> answer = new ArrayList<>();
throw new CommandAnswerException(answer); throw new CommandAnswerException(answer);

Loading…
Cancel
Save