diff --git a/src/main/java/org/ultramine/permission/commands/BasicPermissionCommands.java b/src/main/java/org/ultramine/permission/commands/BasicPermissionCommands.java index fd41e5f..6ef8afc 100644 --- a/src/main/java/org/ultramine/permission/commands/BasicPermissionCommands.java +++ b/src/main/java/org/ultramine/permission/commands/BasicPermissionCommands.java @@ -33,7 +33,7 @@ group = "permissions", permissions = {"permissions.admin.user"}, syntax = { - " [setgroup] ", + " [group setgroup] ", " [add remove] ...", " [meta] <%value>", " [add remove] ...", @@ -49,16 +49,17 @@ ctx.checkSenderPermissionInWorld(world, "permissions.admin.world"); - if (ctx.actionIs("setgroup")) + if (ctx.actionIs("group") || ctx.actionIs("setgroup")) { PermissionHandler.getInstance().setUserGroup(player, ctx.get("group").asString()); + ctx.sendMessage("command.puser.success.group", player, ctx.get("group").asString()); } else if (ctx.actionIs("add")) { for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().add(world, player, arg.asString()); - ctx.notifyAdmins("command.puser.success.add", arg.asString(), player, world); + ctx.sendMessage("command.puser.success.add", arg.asString(), player, world); } } else if (ctx.actionIs("remove")) @@ -66,7 +67,7 @@ for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().remove(world, player, arg.asString()); - ctx.notifyAdmins("command.puser.success.remove", arg.asString(), player, world); + ctx.sendMessage("command.puser.success.remove", arg.asString(), player, world); } } else @@ -75,7 +76,7 @@ String value = ctx.get("value").asString(); PermissionHandler.getInstance().setMeta(world, player, key, value); - ctx.notifyAdmins("command.puser.success.meta", key, value, player, world); + ctx.sendMessage("command.puser.success.meta", key, value, player, world); } PermissionHandler.getInstance().save(); @@ -100,7 +101,7 @@ for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().addToMixin(mixin, arg.asString()); - ctx.notifyAdmins("command.pgroup.success.add", arg.asString(), mixin); + ctx.sendMessage("command.pmixin.success.add", arg.asString(), mixin); } } else if (ctx.actionIs("remove")) @@ -108,7 +109,7 @@ for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().removeFromMixin(mixin, arg.asString()); - ctx.notifyAdmins("command.pgroup.success.remove", arg.asString(), mixin); + ctx.sendMessage("command.pmixin.success.remove", arg.asString(), mixin); } } else @@ -116,7 +117,7 @@ String key = ctx.get("key").asString(); String value = ctx.get("value").asString(); PermissionHandler.getInstance().setMixinMeta(mixin, key, value); - ctx.notifyAdmins("command.pgroup.success.meta", key, value, mixin); + ctx.sendMessage("command.pmixin.success.meta", key, value, mixin); } PermissionHandler.getInstance().save(); @@ -127,7 +128,7 @@ group = "permissions", permissions = {"permissions.admin.group"}, syntax = { - " [setparent] ", + " [parent setparent] ", " [add remove] ...", " [meta] <%value>", " [add remove] ...", @@ -141,16 +142,17 @@ ? ctx.getServer().getMultiWorld().getNameByID(ctx.get("world").asWorld().provider.dimensionId) : IPermissionManager.GLOBAL_WORLD; - if (ctx.actionIs("setparent")) + if (ctx.actionIs("parent") || ctx.actionIs("setparent")) { PermissionHandler.getInstance().setUserGroup(group, ctx.get("parent").asString()); + ctx.sendMessage("command.pgroup.success.parent", ctx.get("parent").asString(), group); } if (ctx.actionIs("add")) { for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().addToGroup(group, world, arg.asString()); - ctx.notifyAdmins("command.pgroup.success.add", arg.asString(), group); + ctx.sendMessage("command.pgroup.success.add", arg.asString(), group); } } else if (ctx.actionIs("remove")) @@ -158,7 +160,7 @@ for (CommandContext.Argument arg : ctx.get("permission").asArray()) { PermissionHandler.getInstance().removeFromGroup(group, world, arg.asString()); - ctx.notifyAdmins("command.pgroup.success.remove", arg.asString(), group); + ctx.sendMessage("command.pgroup.success.remove", arg.asString(), group); } } else @@ -166,7 +168,7 @@ String key = ctx.get("key").asString(); String value = ctx.get("value").asString(); PermissionHandler.getInstance().setGroupMeta(group, world, key, value); - ctx.notifyAdmins("command.pgroup.success.meta", key, value, group); + ctx.sendMessage("command.pgroup.success.meta", key, value, group); } PermissionHandler.getInstance().save(); diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang index 46eb010..0b6b129 100644 --- a/src/main/resources/assets/ultramine/lang/en_US.lang +++ b/src/main/resources/assets/ultramine/lang/en_US.lang @@ -56,20 +56,22 @@ command.pconfig.success.save=Permissions are saved command.pconfig.success.reload=Permissions are reloaded -command.pworld.usage=/pworld [world] -command.pworld.description=Add or remove permissions to all user in world (current is default) -command.pworld.success.add=Add permission <%s> to world <%s> -command.pworld.success.remove=Remove permission <%s> from world <%s> -command.pworld.success.meta=Set meta <%s> to <%s> in world <%s> +command.pmixin.usage=/pmixin OR /pmixin meta +command.pmixin.description=Add or remove permissions to specified mixin +command.pmixin.success.add=Add permission <%s> to mixin <%s> +command.pmixin.success.remove=Remove permission <%s> from mixin <%s> +command.pmixin.success.meta=Set meta <%s> to <%s> for mixin <%s> command.puser.usage=/puser [world] OR /puser [world] meta command.puser.description=Add/remove permissions OR set meta for user in world (current is default) +command.puser.success.group=Player <%s> added to group <%s> command.puser.success.add=Add permission <%s> to user <%s> in world <%s> command.puser.success.remove=Remove permission <%s> from user <%s> in world <%s> command.puser.success.meta=Set meta <%s> to <%s> for user <%s> in world <%s> command.pgroup.usage=/pgroup OR /pgroup meta command.pgroup.description=Add/remove permissions OR set meta for group +command.pgroup.success.parent=Set parent <%s> for group <%s> command.pgroup.success.add=Add permission <%s> to group <%s> command.pgroup.success.remove=Remove permission <%s> from group <%s> command.pgroup.success.meta=Set meta <%s> to <%s> for group <%s> diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang index ed1b4b8..60891b7 100644 --- a/src/main/resources/assets/ultramine/lang/ru_RU.lang +++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang @@ -56,20 +56,22 @@ command.pconfig.success.save=Permissions are saved command.pconfig.success.reload=Permissions are reloaded -command.pworld.usage=/pworld [world] -command.pworld.description=Add or remove permissions to all user in world (current is default) -command.pworld.success.add=Add permission <%s> to world <%s> -command.pworld.success.remove=Remove permission <%s> from world <%s> -command.pworld.success.meta=Set meta <%s> to <%s> in world <%s> +command.pmixin.usage=/pmixin OR /pmixin meta +command.pmixin.description=Add or remove permissions to specified mixin +command.pmixin.success.add=Add permission <%s> to mixin <%s> +command.pmixin.success.remove=Remove permission <%s> from mixin <%s> +command.pmixin.success.meta=Set meta <%s> to <%s> for mixin <%s> command.puser.usage=/puser [world] OR /puser [world] meta command.puser.description=Add/remove permissions OR set meta for user in world (current is default) +command.puser.success.group=Player <%s> added to group <%s> command.puser.success.add=Add permission <%s> to user <%s> in world <%s> command.puser.success.remove=Remove permission <%s> from user <%s> in world <%s> command.puser.success.meta=Set meta <%s> to <%s> for user <%s> in world <%s> command.pgroup.usage=/pgroup OR /pgroup meta command.pgroup.description=Add/remove permissions OR set meta for group +command.pgroup.success.parent=Set parent <%s> for group <%s> command.pgroup.success.add=Add permission <%s> to group <%s> command.pgroup.success.remove=Remove permission <%s> from group <%s> command.pgroup.success.meta=Set meta <%s> to <%s> for group <%s>