SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

Browse Source
This commit is contained in:
Driftay 2020-01-02 05:02:56 -05:00
commit ae17f3d788
136 changed files with 342 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<artifactId>spigot</artifactId>
<version>1.15.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>

8
src/main/java/com/massivecraft/factions/FactionsPlugin.java
View File

@ -4,10 +4,7 @@ import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAddon;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.cmd.CmdAutoHelp;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.FCmdRoot;
import com.massivecraft.factions.cmd.FCommand;
import com.massivecraft.factions.cmd.*;
import com.massivecraft.factions.cmd.audit.FChestListener;
import com.massivecraft.factions.cmd.audit.FLogManager;
import com.massivecraft.factions.cmd.audit.FLogType;
@ -234,7 +231,8 @@ public class FactionsPlugin extends MPlugin {
Board.getInstance().load();
Board.getInstance().clean();
//Load command aliases
Aliases.load();
// Add Base Commands
this.cmdBase = new FCmdRoot();
this.cmdAutoHelp = new CmdAutoHelp();

149
src/main/java/com/massivecraft/factions/cmd/Aliases.java Normal file
View File

@ -0,0 +1,149 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FactionsPlugin;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
public class Aliases {
/**
* @author DroppingAnvil
*/
public static ArrayList<String> alts_alts = new ArrayList<>(Arrays.asList("alts", "alt"));
public static ArrayList<String> alts_list = new ArrayList<>(Arrays.asList("list", "l"));
public static ArrayList<String> alts_invite = new ArrayList<>(Collections.singletonList("invite"));
public static ArrayList<String> alts_kick = new ArrayList<>(Collections.singletonList("kick"));
public static ArrayList<String> audit = new ArrayList<>(Arrays.asList("audit", "log", "logs"));
public static ArrayList<String> check = new ArrayList<>(Arrays.asList("check"));
public static ArrayList<String> weewoo = new ArrayList<>(Collections.singletonList("weewoo"));
public static ArrayList<String> chest = new ArrayList<>(Arrays.asList("chest", "pv"));
public static ArrayList<String> claim_auto = new ArrayList<>(Collections.singletonList("autoclaim"));
public static ArrayList<String> claim_claim = new ArrayList<>(Collections.singletonList("claim"));
public static ArrayList<String> claim_at = new ArrayList<>(Collections.singletonList("claimat"));
public static ArrayList<String> claim_line = new ArrayList<>(Arrays.asList("claimline", "cl"));
public static ArrayList<String> claim_corner = new ArrayList<>(Arrays.asList("corner"));
public static ArrayList<String> unclaim_all_safe = new ArrayList<>(Arrays.asList("safeunclaimall", "safedeclaimall"));
public static ArrayList<String> unclaim_unclaim = new ArrayList<>(Arrays.asList("unclaim", "declaim"));
public static ArrayList<String> unclaim_all_unsafe = new ArrayList<>(Arrays.asList("unclaimall", "declaimall"));
public static ArrayList<String> unclaim_all_war = new ArrayList<>(Arrays.asList("warunclaimall", "wardeclaimall"));
public static ArrayList<String> money_money = new ArrayList<>(Arrays.asList("money", "bank"));
public static ArrayList<String> money_balance = new ArrayList<>(Arrays.asList("b", "balance"));
public static ArrayList<String> money_deposit = new ArrayList<>(Arrays.asList("d", "deposit"));
public static ArrayList<String> money_transfer_Ff = new ArrayList<>(Collections.singletonList("ff"));
public static ArrayList<String> money_transfer_Fp = new ArrayList<>(Collections.singletonList("fp"));
public static ArrayList<String> money_transfer_Pf = new ArrayList<>(Collections.singletonList("pf"));
public static ArrayList<String> money_withdraw = new ArrayList<>(Arrays.asList("w", "withdraw"));
public static ArrayList<String> grace = new ArrayList<>(Collections.singletonList("grace"));
public static ArrayList<String> logout = new ArrayList<>(Collections.singletonList("logout"));
public static ArrayList<String> points_points = new ArrayList<>(Collections.singletonList("points"));
public static ArrayList<String> points_add = new ArrayList<>(Collections.singletonList("add"));
public static ArrayList<String> points_remove = new ArrayList<>(Collections.singletonList("remove"));
public static ArrayList<String> points_set = new ArrayList<>(Collections.singletonList("set"));
public static ArrayList<String> relation_ally = new ArrayList<>(Collections.singletonList("ally"));
public static ArrayList<String> relation_enemy = new ArrayList<>(Collections.singletonList("enemy"));
public static ArrayList<String> relation_neutral = new ArrayList<>(Collections.singletonList("neutral"));
public static ArrayList<String> relation_truce = new ArrayList<>(Collections.singletonList("truce"));
public static ArrayList<String> reserve = new ArrayList<>(Collections.singletonList("reserve"));
public static ArrayList<String> roles_demote = new ArrayList<>(Collections.singletonList("demote"));
public static ArrayList<String> roles_promote = new ArrayList<>(Collections.singletonList("ally"));
public static ArrayList<String> tnt_tnt = new ArrayList<>(Collections.singletonList("tnt"));
public static ArrayList<String> tnt_tntfill = new ArrayList<>(Collections.singletonList("tntfill"));
public static ArrayList<String> wild = new ArrayList<>(Collections.singletonList("wild"));
public static ArrayList<String> admin = new ArrayList<>(Arrays.asList("admin", "setadmin", "leader", "setleader"));
public static ArrayList<String> ahome = new ArrayList<>(Collections.singletonList("ahome"));
public static ArrayList<String> announce = new ArrayList<>(Arrays.asList("ann", "announce"));
public static ArrayList<String> help = new ArrayList<>(Arrays.asList("help", "h", "?"));
public static ArrayList<String> ban_ban = new ArrayList<>(Collections.singletonList("ban"));
public static ArrayList<String> ban_banlist = new ArrayList<>(Arrays.asList("banlist", "bans", "banl"));
public static ArrayList<String> banner = new ArrayList<>(Collections.singletonList("banner"));
public static ArrayList<String> boom = new ArrayList<>(Arrays.asList("noboom", "explosions", "toggleexplosions"));
public static ArrayList<String> bypass = new ArrayList<>(Collections.singletonList("bypass"));
public static ArrayList<String> chat = new ArrayList<>(Arrays.asList("chat", "c"));
public static ArrayList<String> chatspy = new ArrayList<>(Collections.singletonList("chatspy"));
public static ArrayList<String> checkpoint = new ArrayList<>(Arrays.asList("checkp", "checkpoint", "cpoint"));
public static ArrayList<String> coleader = new ArrayList<>(Arrays.asList("coleader", "setcoleader", "co", "setco"));
public static ArrayList<String> config = new ArrayList<>(Collections.singletonList("config"));
public static ArrayList<String> convert = new ArrayList<>(Collections.singletonList("convert"));
public static ArrayList<String> coords = new ArrayList<>(Arrays.asList("coords", "coord"));
public static ArrayList<String> create = new ArrayList<>(Collections.singletonList("create"));
public static ArrayList<String> debug = new ArrayList<>(Collections.singletonList("debug"));
public static ArrayList<String> deinvite = new ArrayList<>(Arrays.asList("deinvite", "deinv"));
public static ArrayList<String> deletefwarp = new ArrayList<>(Arrays.asList("delwarp", "dw", "deletewarp"));
public static ArrayList<String> description = new ArrayList<>(Arrays.asList("desc", "description"));
public static ArrayList<String> disband = new ArrayList<>(Collections.singletonList("disband"));
public static ArrayList<String> discord_discord = new ArrayList<>(Collections.singletonList("discord"));
public static ArrayList<String> drain = new ArrayList<>(Collections.singletonList("drain"));
public static ArrayList<String> global = new ArrayList<>(Arrays.asList("gchat", "global", "globalchat"));
public static ArrayList<String> fly = new ArrayList<>(Collections.singletonList("fly"));
public static ArrayList<String> focus = new ArrayList<>(Collections.singletonList("focus"));
public static ArrayList<String> warp = new ArrayList<>(Arrays.asList("warp", "warps"));
public static ArrayList<String> getvault = new ArrayList<>(Collections.singletonList("getvault"));
public static ArrayList<String> home = new ArrayList<>(Collections.singletonList("home"));
public static ArrayList<String> inspect = new ArrayList<>(Arrays.asList("inspect", "ins"));
public static ArrayList<String> invsee = new ArrayList<>(Arrays.asList("invsee", "inventorysee"));
public static ArrayList<String> invite = new ArrayList<>(Arrays.asList("invite", "inv"));
public static ArrayList<String> join = new ArrayList<>(Collections.singletonList("join"));
public static ArrayList<String> kick = new ArrayList<>(Collections.singletonList("kick"));
public static ArrayList<String> killholograms = new ArrayList<>(Collections.singletonList("killholos"));
public static ArrayList<String> leave = new ArrayList<>(Collections.singletonList("leave"));
public static ArrayList<String> list = new ArrayList<>(Arrays.asList("list", "ls"));
public static ArrayList<String> lock = new ArrayList<>(Collections.singletonList("lock"));
public static ArrayList<String> logins = new ArrayList<>(Arrays.asList("logins", "login", "logouts"));
public static ArrayList<String> lookup = new ArrayList<>(Collections.singletonList("lookup"));
public static ArrayList<String> lowPower = new ArrayList<>(Collections.singletonList("lowpower"));
public static ArrayList<String> map_map = new ArrayList<>(Collections.singletonList("map"));
public static ArrayList<String> map_height = new ArrayList<>(Arrays.asList("mapheight", "mh"));
public static ArrayList<String> mod = new ArrayList<>(Arrays.asList("mod", "setmod", "officer", "setofficer"));
public static ArrayList<String> modifyPower = new ArrayList<>(Arrays.asList("mp", "pm", "modpower", "modifypower"));
public static ArrayList<String> near = new ArrayList<>(Arrays.asList("near", "nearby"));
public static ArrayList<String> open = new ArrayList<>(Collections.singletonList("open"));
public static ArrayList<String> owner_owner = new ArrayList<>(Collections.singletonList("owner"));
public static ArrayList<String> owner_list = new ArrayList<>(Collections.singletonList("ownerlist"));
public static ArrayList<String> paypal_see = new ArrayList<>(Arrays.asList("paypal", "seepaypal"));
public static ArrayList<String> paypal_set = new ArrayList<>(Collections.singletonList("setpaypal"));
public static ArrayList<String> peaceful = new ArrayList<>(Collections.singletonList("peaceful"));
public static ArrayList<String> perm = new ArrayList<>(Arrays.asList("perm", "perms", "permission", "permissions"));
public static ArrayList<String> permanent_faction = new ArrayList<>(Collections.singletonList("permanent"));
public static ArrayList<String> permanent_power = new ArrayList<>(Collections.singletonList("permanentpower"));
public static ArrayList<String> titles = new ArrayList<>(Collections.singletonList("titles"));
public static ArrayList<String> power_power = new ArrayList<>(Arrays.asList("pow", "power"));
public static ArrayList<String> power_boost = new ArrayList<>(Collections.singletonList("powerboost"));
public static ArrayList<String> reload = new ArrayList<>(Collections.singletonList("reload"));
public static ArrayList<String> rules = new ArrayList<>(Arrays.asList("r", "rule", "rules"));
public static ArrayList<String> saveAll = new ArrayList<>(Arrays.asList("save", "saveall"));
public static ArrayList<String> scoreboard = new ArrayList<>(Arrays.asList("sb", "scoreboard"));
public static ArrayList<String> seeChunk = new ArrayList<>(Arrays.asList("sc", "seechunk"));
public static ArrayList<String> discord_see = new ArrayList<>(Collections.singletonList("seediscord"));
public static ArrayList<String> discord_set = new ArrayList<>(Collections.singletonList("setdiscord"));
public static ArrayList<String> setBanner = new ArrayList<>(Collections.singletonList("setbanner"));
public static ArrayList<String> setDefaultRole = new ArrayList<>(Arrays.asList("defaultrole", "def", "default", "defaultrank"));
public static ArrayList<String> setWarp = new ArrayList<>(Arrays.asList("sw", "setwarp"));
public static ArrayList<String> setHome = new ArrayList<>(Collections.singletonList("sethome"));
public static ArrayList<String> setMaxVaults = new ArrayList<>(Arrays.asList("smv", "setmaxvaults"));
public static ArrayList<String> show_show = new ArrayList<>(Arrays.asList("show", "who"));
public static ArrayList<String> show_claims = new ArrayList<>(Arrays.asList("showclaim", "showclaims"));
public static ArrayList<String> show_invites = new ArrayList<>(Collections.singletonList("showinvites"));
public static ArrayList<String> spawnerlock = new ArrayList<>(Arrays.asList("lockspawners", "spawnerlock"));
public static ArrayList<String> status = new ArrayList<>(Arrays.asList("s", "status"));
public static ArrayList<String> stealth = new ArrayList<>(Arrays.asList("stealth", "ninja"));
public static ArrayList<String> strikes_strikes = new ArrayList<>(Collections.singletonList("strikes"));
public static ArrayList<String> strikes_give = new ArrayList<>(Collections.singletonList("give"));
public static ArrayList<String> strikes_info = new ArrayList<>(Collections.singletonList("info"));
public static ArrayList<String> strikes_set = new ArrayList<>(Collections.singletonList("set"));
public static ArrayList<String> strikes_take = new ArrayList<>(Collections.singletonList("take"));
public static ArrayList<String> stuck = new ArrayList<>(Arrays.asList("stuck", "halp!"));
public static ArrayList<String> tag = new ArrayList<>(Arrays.asList("tag", "rename"));
public static ArrayList<String> title = new ArrayList<>(Collections.singletonList("title"));
public static ArrayList<String> toggleAllianceChat = new ArrayList<>(Arrays.asList("tac", "ac", "togglealliancechat"));
public static ArrayList<String> top = new ArrayList<>(Arrays.asList("t", "top"));
public static ArrayList<String> tpBanner = new ArrayList<>(Collections.singletonList("tpbanner"));
public static ArrayList<String> unban = new ArrayList<>(Collections.singletonList("unban"));
public static ArrayList<String> upgrades = new ArrayList<>(Arrays.asList("upgrades", "upgrade"));
public static ArrayList<String> vault = new ArrayList<>(Collections.singletonList("vault"));
public static ArrayList<String> viewChest = new ArrayList<>(Arrays.asList("viewchest", "viewpv"));
private static transient Aliases i = new Aliases();
public static void load() {
FactionsPlugin.getInstance().persist.loadOrSaveDefault(i, Aliases.class, "aliases");
}
}

2
src/main/java/com/massivecraft/factions/cmd/CmdAHome.java
View File

@ -14,7 +14,7 @@ public class CmdAHome extends FCommand {
public CmdAHome() {
super();
this.aliases.add("ahome");
this.aliases.addAll(Aliases.ahome);
this.requiredArgs.add("player");

5
src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@ -20,10 +20,7 @@ public class CmdAdmin extends FCommand {
public CmdAdmin() {
super();
this.aliases.add("admin");
this.aliases.add("setadmin");
this.aliases.add("leader");
this.aliases.add("setleader");
this.aliases.addAll(Aliases.admin);
this.requiredArgs.add("player");

3
src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java
View File

@ -18,8 +18,7 @@ public class CmdAnnounce extends FCommand {
public CmdAnnounce() {
super();
this.aliases.add("ann");
this.aliases.add("announce");
this.aliases.addAll(Aliases.announce);
this.requiredArgs.add("message");

4
src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java
View File

@ -13,9 +13,7 @@ public class CmdAutoHelp extends FCommand {
*/
public CmdAutoHelp() {
this.aliases.add("?");
this.aliases.add("h");
this.aliases.add("help");
this.aliases.addAll(Aliases.help);
this.setHelpShort("");

2
src/main/java/com/massivecraft/factions/cmd/CmdBan.java
View File

@ -21,7 +21,7 @@ public class CmdBan extends FCommand {
public CmdBan() {
super();
this.aliases.add("ban");
this.aliases.addAll(Aliases.ban_ban);
this.requiredArgs.add("target");

4
src/main/java/com/massivecraft/factions/cmd/CmdBanlist.java
View File

@ -19,9 +19,7 @@ public class CmdBanlist extends FCommand {
public CmdBanlist() {
super();
this.aliases.add("banlist");
this.aliases.add("bans");
this.aliases.add("banl");
this.aliases.addAll(Aliases.ban_banlist);
this.optionalArgs.put("faction", "faction");

3
src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
View File

@ -19,8 +19,7 @@ public class CmdBanner extends FCommand {
*/
public CmdBanner() {
this.aliases.add("banner");
this.aliases.add("warbanner");
this.aliases.addAll(Aliases.banner);
this.requirements = new CommandRequirements.Builder(Permission.BANNER).playerOnly().memberOnly().build();
}

4
src/main/java/com/massivecraft/factions/cmd/CmdBoom.java
View File

@ -12,9 +12,7 @@ public class CmdBoom extends FCommand {
public CmdBoom() {
super();
this.aliases.add("noboom");
this.aliases.add("explosions");
this.aliases.add("toggleexplosions");
this.aliases.addAll(Aliases.boom);
//this.requiredArgs.add("");
this.optionalArgs.put("on/off", "flip");

2
src/main/java/com/massivecraft/factions/cmd/CmdBypass.java
View File

@ -12,7 +12,7 @@ public class CmdBypass extends FCommand {
public CmdBypass() {
super();
this.aliases.add("bypass");
this.aliases.addAll(Aliases.bypass);
//this.requiredArgs.add("");
this.optionalArgs.put("on/off", "flip");

3
src/main/java/com/massivecraft/factions/cmd/CmdChat.java
View File

@ -16,8 +16,7 @@ public class CmdChat extends FCommand {
public CmdChat() {
super();
this.aliases.add("c");
this.aliases.add("chat");
this.aliases.addAll(Aliases.chat);
//this.requiredArgs.add("");
this.optionalArgs.put("mode", "next");

2
src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java
View File

@ -12,7 +12,7 @@ public class CmdChatSpy extends FCommand {
public CmdChatSpy() {
super();
this.aliases.add("chatspy");
this.aliases.addAll(Aliases.chatspy);
this.optionalArgs.put("on/off", "flip");

4
src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java
View File

@ -13,9 +13,7 @@ public class CmdCheckpoint extends FCommand {
public CmdCheckpoint() {
super();
this.aliases.add("checkp");
this.aliases.add("checkpoint");
this.aliases.add("cpoint");
this.aliases.addAll(Aliases.checkpoint);
this.optionalArgs.put("set", "");

5
src/main/java/com/massivecraft/factions/cmd/CmdColeader.java
View File

@ -19,10 +19,7 @@ public class CmdColeader extends FCommand {
public CmdColeader() {
super();
this.aliases.add("co");
this.aliases.add("setcoleader");
this.aliases.add("coleader");
this.aliases.add("setco");
this.aliases.addAll(Aliases.coleader);
this.optionalArgs.put("player name", "name");

2
src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -20,7 +20,7 @@ public class CmdConfig extends FCommand {
public CmdConfig() {
super();
this.aliases.add("config");
this.aliases.addAll(Aliases.config);
this.requiredArgs.add("setting");
this.requiredArgs.add("value");

2
src/main/java/com/massivecraft/factions/cmd/CmdConvert.java
View File

@ -14,7 +14,7 @@ public class CmdConvert extends FCommand {
*/
public CmdConvert() {
this.aliases.add("convert");
this.aliases.addAll(Aliases.convert);
this.requiredArgs.add("[MYSQL|JSON]");
this.requirements = new CommandRequirements.Builder(Permission.CONVERT)

3
src/main/java/com/massivecraft/factions/cmd/CmdCoords.java
View File

@ -13,8 +13,7 @@ public class CmdCoords extends FCommand {
public CmdCoords() {
super();
this.aliases.add("coords");
this.aliases.add("coord");
this.aliases.addAll(Aliases.coords);
this.requirements = new CommandRequirements.Builder(Permission.COORD)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
View File

@ -25,7 +25,7 @@ public class CmdCreate extends FCommand {
public CmdCreate() {
super();
this.aliases.add("create");
this.aliases.addAll(Aliases.create);
this.requiredArgs.add("faction tag");

3
src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
View File

@ -20,8 +20,7 @@ public class CmdDeinvite extends FCommand {
public CmdDeinvite() {
super();
this.aliases.add("deinvite");
this.aliases.add("deinv");
this.aliases.addAll(Aliases.deinvite);
this.optionalArgs.put("player name", "name");

4
src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java
View File

@ -13,9 +13,7 @@ public class CmdDelFWarp extends FCommand {
public CmdDelFWarp() {
super();
this.aliases.add("delwarp");
this.aliases.add("dw");
this.aliases.add("deletewarp");
this.aliases.addAll(Aliases.deletefwarp);
this.requiredArgs.add("warp name");
this.requirements = new CommandRequirements.Builder(Permission.SETWARP)

3
src/main/java/com/massivecraft/factions/cmd/CmdDescription.java
View File

@ -18,8 +18,7 @@ public class CmdDescription extends FCommand {
public CmdDescription() {
super();
this.aliases.add("desc");
this.aliases.add("description");
this.aliases.addAll(Aliases.description);
this.requiredArgs.add("desc");

2
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -26,7 +26,7 @@ public class CmdDisband extends FCommand {
public CmdDisband() {
super();
this.aliases.add("disband");
this.aliases.addAll(Aliases.disband);
this.optionalArgs.put("faction tag", "yours");

2
src/main/java/com/massivecraft/factions/cmd/CmdDiscord.java
View File

@ -9,7 +9,7 @@ import java.util.Random;
public class CmdDiscord extends FCommand {
public CmdDiscord() {
super();
this.aliases.add("discord");
this.aliases.addAll(Aliases.discord_discord);
this.requirements = new CommandRequirements.Builder(Permission.DISCORD)
.playerOnly()
.build();

2
src/main/java/com/massivecraft/factions/cmd/CmdDrain.java
View File

@ -16,7 +16,7 @@ import java.text.DecimalFormat;
*/
public class CmdDrain extends FCommand{
public CmdDrain(){
this.aliases.add("drain");
this.aliases.addAll(Aliases.drain);
this.requirements = new CommandRequirements.Builder(Permission.DRAIN)
.playerOnly()
.memberOnly()

4
src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java
View File

@ -17,9 +17,7 @@ public class CmdFGlobal extends FCommand {
public CmdFGlobal() {
super();
this.aliases.add("gchat");
this.aliases.add("global");
this.aliases.add("globalchat");
this.aliases.addAll(Aliases.global);
this.requirements = new CommandRequirements.Builder(Permission.GLOBALCHAT)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
View File

@ -20,8 +20,7 @@ public class CmdFWarp extends FCommand {
public CmdFWarp() {
super();
this.aliases.add("warp");
this.aliases.add("warps");
this.aliases.addAll(Aliases.warp);
this.optionalArgs.put("warpname", "warpname");
this.optionalArgs.put("password", "password");

2
src/main/java/com/massivecraft/factions/cmd/CmdFly.java
View File

@ -31,7 +31,7 @@ public class CmdFly extends FCommand {
public CmdFly() {
super();
this.aliases.add("fly");
this.aliases.addAll(Aliases.fly);
this.optionalArgs.put("on/off", "flip");
this.requirements = new CommandRequirements.Builder(Permission.FLY)

2
src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
View File

@ -13,7 +13,7 @@ public class CmdFocus extends FCommand {
*/
public CmdFocus() {
aliases.add("focus");
aliases.addAll(Aliases.focus);
requiredArgs.add("player");

2
src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
View File

@ -16,7 +16,7 @@ public class CmdGetVault extends FCommand {
public CmdGetVault() {
super();
this.aliases.add("getvault");
this.aliases.addAll(Aliases.getvault);
this.requirements = new CommandRequirements.Builder(Permission.GETVAULT)
.playerOnly()

4
src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
View File

@ -21,9 +21,7 @@ public class CmdHelp extends FCommand {
public CmdHelp() {
super();
this.aliases.add("help");
this.aliases.add("h");
this.aliases.add("?");
this.aliases.addAll(Aliases.help);
//this.requiredArgs.add("");
this.optionalArgs.put("page", "1");

2
src/main/java/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -26,7 +26,7 @@ public class CmdHome extends FCommand {
public CmdHome() {
super();
this.aliases.add("home");
this.aliases.addAll(Aliases.home);
this.optionalArgs.put("faction", "yours");
this.requirements = new CommandRequirements.Builder(Permission.HOME)

4
src/main/java/com/massivecraft/factions/cmd/CmdInspect.java
View File

@ -11,9 +11,7 @@ public class CmdInspect extends FCommand {
public CmdInspect() {
super();
this.aliases.add("inspect");
this.aliases.add("ins");
this.aliases.addAll(Aliases.inspect);
this.requirements = new CommandRequirements.Builder(Permission.INSPECT)
.playerOnly()
.memberOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java
View File

@ -23,8 +23,7 @@ public class CmdInventorySee extends FCommand {
public CmdInventorySee() {
super();
this.aliases.add("invsee");
this.aliases.add("inventorysee");
this.aliases.addAll(Aliases.invsee);
this.requiredArgs.add("member name");

3
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -19,8 +19,7 @@ public class CmdInvite extends FCommand {
public CmdInvite() {
super();
this.aliases.add("invite");
this.aliases.add("inv");
this.aliases.addAll(Aliases.invite);
this.requiredArgs.add("player name");

2
src/main/java/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -22,7 +22,7 @@ public class CmdJoin extends FCommand {
public CmdJoin() {
super();
this.aliases.add("join");
this.aliases.addAll(Aliases.join);
this.requiredArgs.add("faction name");
this.optionalArgs.put("player", "you");

2
src/main/java/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -24,7 +24,7 @@ public class CmdKick extends FCommand {
public CmdKick() {
super();
this.aliases.add("kick");
this.aliases.addAll(Aliases.kick);
this.optionalArgs.put("player name", "player name");
this.requirements = new CommandRequirements.Builder(Permission.KICK)

2
src/main/java/com/massivecraft/factions/cmd/CmdKillHolograms.java
View File

@ -11,7 +11,7 @@ public class CmdKillHolograms extends FCommand {
public CmdKillHolograms() {
super();
this.aliases.add("killholos");
this.aliases.addAll(Aliases.killholograms);
this.requiredArgs.add("radius");
this.requirements = new CommandRequirements.Builder(Permission.KILLHOLOS)

2
src/main/java/com/massivecraft/factions/cmd/CmdLeave.java
View File

@ -13,7 +13,7 @@ public class CmdLeave extends FCommand {
public CmdLeave() {
super();
this.aliases.add("leave");
this.aliases.addAll(Aliases.leave);
this.requirements = new CommandRequirements.Builder(Permission.LEAVE)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdList.java
View File

@ -22,8 +22,7 @@ public class CmdList extends FCommand {
public CmdList() {
super();
this.aliases.add("list");
this.aliases.add("ls");
this.aliases.addAll(Aliases.list);
// default values in case user has old config
defaults[0] = "&e&m----------&r&e[ &2Faction List &9{pagenumber}&e/&9{pagecount} &e]&m----------";

2
src/main/java/com/massivecraft/factions/cmd/CmdLock.java
View File

@ -19,7 +19,7 @@ public class CmdLock extends FCommand {
public CmdLock() {
super();
this.aliases.add("lock");
this.aliases.addAll(Aliases.lock);
this.optionalArgs.put("on/off", "flip");
this.requirements = new CommandRequirements.Builder(Permission.LOCK)

5
src/main/java/com/massivecraft/factions/cmd/CmdLogins.java
View File

@ -11,10 +11,7 @@ public class CmdLogins extends FCommand {
public CmdLogins() {
super();
this.aliases.add("login");
this.aliases.add("logins");
this.aliases.add("logout");
this.aliases.add("logouts");
this.aliases.addAll(Aliases.logins);
this.requirements = new CommandRequirements.Builder(Permission.MONITOR_LOGINS)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdLookup.java
View File

@ -18,7 +18,7 @@ public class CmdLookup extends FCommand {
public CmdLookup() {
super();
this.aliases.add("lookup");
this.aliases.addAll(Aliases.lookup);
this.requiredArgs.add("faction name");
this.requirements = new CommandRequirements.Builder(Permission.LOOKUP)

2
src/main/java/com/massivecraft/factions/cmd/CmdLowPower.java
View File

@ -13,7 +13,7 @@ public class CmdLowPower extends FCommand {
public CmdLowPower() {
super();
this.aliases.add("lowpower");
this.aliases.addAll(Aliases.lowPower);
this.requirements = new CommandRequirements.Builder(Permission.POWER_ANY)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdMap.java
View File

@ -15,7 +15,7 @@ public class CmdMap extends FCommand {
public CmdMap() {
super();
this.aliases.add("map");
this.aliases.addAll(Aliases.map_map);
this.optionalArgs.put("on/off", "once");
this.requirements = new CommandRequirements.Builder(Permission.MAP)

3
src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
View File

@ -12,8 +12,7 @@ public class CmdMapHeight extends FCommand {
public CmdMapHeight() {
super();
this.aliases.add("mapheight");
this.aliases.add("mh");
this.aliases.addAll(Aliases.map_height);
this.optionalArgs.put("height", "height");
this.requirements = new CommandRequirements.Builder(Permission.MAPHEIGHT)

5
src/main/java/com/massivecraft/factions/cmd/CmdMod.java
View File

@ -19,10 +19,7 @@ public class CmdMod extends FCommand {
public CmdMod() {
super();
this.aliases.add("mod");
this.aliases.add("setmod");
this.aliases.add("officer");
this.aliases.add("setofficer");
this.aliases.addAll(Aliases.mod);
this.optionalArgs.put("player name", "name");

5
src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java
View File

@ -13,10 +13,7 @@ public class CmdModifyPower extends FCommand {
public CmdModifyPower() {
super();
this.aliases.add("pm");
this.aliases.add("mp");
this.aliases.add("modifypower");
this.aliases.add("modpower");
this.aliases.addAll(Aliases.modifyPower);
this.requiredArgs.add("name");
this.requiredArgs.add("power");

3
src/main/java/com/massivecraft/factions/cmd/CmdNear.java
View File

@ -16,8 +16,7 @@ public class CmdNear extends FCommand {
public CmdNear() {
super();
this.aliases.add("near");
this.aliases.add("nearby");
this.aliases.addAll(Aliases.near);
this.requirements = new CommandRequirements.Builder(Permission.NEAR)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdOpen.java
View File

@ -16,7 +16,7 @@ public class CmdOpen extends FCommand {
public CmdOpen() {
super();
this.aliases.add("open");
this.aliases.addAll(Aliases.open);
this.optionalArgs.put("yes/no", "flip");
this.requirements = new CommandRequirements.Builder(Permission.OPEN)

2
src/main/java/com/massivecraft/factions/cmd/CmdOwner.java
View File

@ -14,7 +14,7 @@ public class CmdOwner extends FCommand {
public CmdOwner() {
super();
this.aliases.add("owner");
this.aliases.addAll(Aliases.owner_owner);
this.optionalArgs.put("player name", "you");
this.requirements = new CommandRequirements.Builder(Permission.OWNER)

2
src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java
View File

@ -15,7 +15,7 @@ public class CmdOwnerList extends FCommand {
public CmdOwnerList() {
super();
this.aliases.add("ownerlist");
this.aliases.addAll(Aliases.owner_list);
this.requirements = new CommandRequirements.Builder(Permission.OWNERLIST)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
View File

@ -12,8 +12,7 @@ public class CmdPaypalSee extends FCommand {
*/
public CmdPaypalSee() {
this.aliases.add("seepaypal");
this.aliases.add("paypal");
this.aliases.addAll(Aliases.paypal_see);
this.optionalArgs.put("faction", "yours");

2
src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java
View File

@ -13,7 +13,7 @@ public class CmdPaypalSet extends FCommand {
*/
public CmdPaypalSet() {
this.aliases.add("setpaypal");
this.aliases.addAll(Aliases.paypal_set);
this.optionalArgs.put("faction", "yours");

2
src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java
View File

@ -14,7 +14,7 @@ public class CmdPeaceful extends FCommand {
public CmdPeaceful() {
super();
this.aliases.add("peaceful");
this.aliases.addAll(Aliases.peaceful);
this.requiredArgs.add("faction tag");
this.requirements = new CommandRequirements.Builder(Permission.SET_PEACEFUL)

5
src/main/java/com/massivecraft/factions/cmd/CmdPerm.java
View File

@ -23,10 +23,7 @@ public class CmdPerm extends FCommand {
public CmdPerm() {
super();
this.aliases.add("perm");
this.aliases.add("perms");
this.aliases.add("permission");
this.aliases.add("permissions");
this.aliases.addAll(Aliases.perm);
this.optionalArgs.put("relation", "relation");
this.optionalArgs.put("action", "action");

2
src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java
View File

@ -16,7 +16,7 @@ public class CmdPermanent extends FCommand {
public CmdPermanent() {
super();
this.aliases.add("permanent");
this.aliases.addAll(Aliases.permanent_faction);
this.requiredArgs.add("faction tag");
this.requirements = new CommandRequirements.Builder(Permission.SET_PERMANENT)

2
src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java
View File

@ -13,7 +13,7 @@ public class CmdPermanentPower extends FCommand {
public CmdPermanentPower() {
super();
this.aliases.add("permanentpower");
this.aliases.addAll(Aliases.permanent_power);
this.requiredArgs.add("faction");
this.requiredArgs.add("power");

2
src/main/java/com/massivecraft/factions/cmd/CmdPlayerTitleToggle.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdPlayerTitleToggle extends FCommand {
public CmdPlayerTitleToggle() {
super();
this.aliases.add("titles");
this.aliases.addAll(Aliases.titles);
this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_TITLES)
.build();
}

3
src/main/java/com/massivecraft/factions/cmd/CmdPower.java
View File

@ -13,8 +13,7 @@ public class CmdPower extends FCommand {
public CmdPower() {
super();
this.aliases.add("power");
this.aliases.add("pow");
this.aliases.addAll(Aliases.power_power);
this.optionalArgs.put("player name", "you");
this.requirements = new CommandRequirements.Builder(Permission.POWER)

2
src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java
View File

@ -15,7 +15,7 @@ public class CmdPowerBoost extends FCommand {
public CmdPowerBoost() {
super();
this.aliases.add("powerboost");
this.aliases.addAll(Aliases.power_boost);
this.requiredArgs.add("plugin|f|player|faction");
this.requiredArgs.add("name");
this.requiredArgs.add("# or reset");

2
src/main/java/com/massivecraft/factions/cmd/CmdReload.java
View File

@ -16,7 +16,7 @@ public class CmdReload extends FCommand {
public CmdReload() {
super();
this.aliases.add("reload");
this.aliases.addAll(Aliases.reload);
this.requirements = new CommandRequirements.Builder(Permission.RELOAD).build();
}

4
src/main/java/com/massivecraft/factions/cmd/CmdRules.java
View File

@ -15,9 +15,7 @@ public class CmdRules extends FCommand {
public CmdRules() {
super();
aliases.add("r");
aliases.add("rule");
aliases.add("rules");
aliases.addAll(Aliases.rules);
this.optionalArgs.put("add/remove/set/clear", "");

3
src/main/java/com/massivecraft/factions/cmd/CmdSB.java
View File

@ -11,8 +11,7 @@ public class CmdSB extends FCommand {
*/
public CmdSB() {
this.aliases.add("sb");
this.aliases.add("scoreboard");
this.aliases.addAll(Aliases.scoreboard);
this.requirements = new CommandRequirements.Builder(Permission.SCOREBOARD)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java
View File

@ -13,8 +13,7 @@ public class CmdSaveAll extends FCommand {
public CmdSaveAll() {
super();
this.aliases.add("saveall");
this.aliases.add("save");
this.aliases.addAll(Aliases.saveAll);
this.requirements = new CommandRequirements.Builder(Permission.SAVE)
.build();

3
src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java
View File

@ -32,8 +32,7 @@ public class CmdSeeChunk extends FCommand {
public CmdSeeChunk() {
super();
aliases.add("seechunk");
aliases.add("sc");
aliases.addAll(Aliases.seeChunk);
this.useParticles = FactionsPlugin.getInstance().getConfig().getBoolean("see-chunk.particles", true);
interval = FactionsPlugin.getInstance().getConfig().getLong("see-chunk.interval", 10L);

3
src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java
View File

@ -12,8 +12,7 @@ public class CmdSeeDiscord extends FCommand{
*/
public CmdSeeDiscord() {
this.aliases.add("seediscord");
this.aliases.add("discord");
this.aliases.addAll(Aliases.discord_see);
this.optionalArgs.put("faction", "yours");

2
src/main/java/com/massivecraft/factions/cmd/CmdSetBanner.java
View File

@ -11,7 +11,7 @@ public class CmdSetBanner extends FCommand {
public CmdSetBanner() {
super();
aliases.add("setbanner");
aliases.addAll(Aliases.setBanner);
this.requirements = new CommandRequirements.Builder(Permission.BANNER)
.playerOnly()

5
src/main/java/com/massivecraft/factions/cmd/CmdSetDefaultRole.java
View File

@ -13,10 +13,7 @@ public class CmdSetDefaultRole extends FCommand {
public CmdSetDefaultRole() {
super();
this.aliases.add("defaultrole");
this.aliases.add("defaultrank");
this.aliases.add("default");
this.aliases.add("def");
this.aliases.addAll(Aliases.setDefaultRole);
this.requiredArgs.add("role");
this.requirements = new CommandRequirements.Builder(Permission.DEFAULTRANK)

2
src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java
View File

@ -14,7 +14,7 @@ public class CmdSetDiscord extends FCommand {
public CmdSetDiscord(){
super();
this.aliases.add("setdiscord");
this.aliases.addAll(Aliases.discord_set);
this.optionalArgs.put("faction", "yours");

3
src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
View File

@ -15,8 +15,7 @@ public class CmdSetFWarp extends FCommand {
*/
public CmdSetFWarp() {
this.aliases.add("setwarp");
this.aliases.add("sw");
this.aliases.addAll(Aliases.setWarp);
this.requiredArgs.add("warp name");
this.optionalArgs.put("password", "password");
this.requirements = new CommandRequirements.Builder(Permission.SETWARP).playerOnly().memberOnly().withAction(PermissableAction.SETWARP).build();

3
src/main/java/com/massivecraft/factions/cmd/CmdSetMaxVaults.java
View File

@ -12,8 +12,7 @@ public class CmdSetMaxVaults extends FCommand {
*/
public CmdSetMaxVaults() {
this.aliases.add("setmaxvaults");
this.aliases.add("smv");
this.aliases.addAll(Aliases.setMaxVaults);
this.requiredArgs.add("faction");
this.requiredArgs.add("number");

2
src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
View File

@ -12,7 +12,7 @@ public class CmdSethome extends FCommand {
*/
public CmdSethome() {
this.aliases.add("sethome");
this.aliases.addAll(Aliases.setHome);
this.optionalArgs.put("faction tag", "mine");
this.requirements = new CommandRequirements.Builder(Permission.SETHOME)

3
src/main/java/com/massivecraft/factions/cmd/CmdShow.java
View File

@ -21,8 +21,7 @@ public class CmdShow extends FCommand {
List<String> defaults = new ArrayList<>();
public CmdShow() {
this.aliases.add("show");
this.aliases.add("who");
this.aliases.addAll(Aliases.show_show);
// add defaults to /f show in case config doesnt have it
defaults.add("{header}");

3
src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java
View File

@ -13,8 +13,7 @@ public class CmdShowClaims extends FCommand {
*/
public CmdShowClaims() {
this.aliases.add("showclaims");
this.aliases.add("showclaim");
this.aliases.addAll(Aliases.show_claims);
this.requirements = new CommandRequirements.Builder(Permission.SHOWCLAIMS)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java
View File

@ -17,7 +17,7 @@ public class CmdShowInvites extends FCommand {
public CmdShowInvites() {
super();
aliases.add("showinvites");
aliases.addAll(Aliases.show_invites);
this.requirements = new CommandRequirements.Builder(Permission.SHOW_INVITES)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java
View File

@ -13,8 +13,7 @@ public class CmdSpawnerLock extends FCommand {
public CmdSpawnerLock(){
super();
this.aliases.add("lockspawners");
this.aliases.add("spawnerlock");
this.aliases.addAll(Aliases.spawnerlock);
this.requirements = new CommandRequirements.Builder(Permission.LOCKSPAWNERS)
.build();

3
src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
View File

@ -16,8 +16,7 @@ public class CmdStatus extends FCommand {
public CmdStatus() {
super();
this.aliases.add("status");
this.aliases.add("s");
this.aliases.addAll(Aliases.status);
this.requirements = new CommandRequirements.Builder(Permission.STATUS)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
View File

@ -10,8 +10,7 @@ public class CmdStealth extends FCommand {
*/
public CmdStealth() {
this.aliases.add("ninja");
this.aliases.add("stealth");
this.aliases.addAll(Aliases.stealth);
this.requirements = new CommandRequirements.Builder(Permission.STEALTH)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java
View File

@ -18,7 +18,7 @@ public class CmdStrikes extends FCommand {
public CmdStrikes() {
super();
this.aliases.add("strikes");
this.aliases.addAll(Aliases.strikes_strikes);
this.addSubCommand(cmdStrikesGive);
this.addSubCommand(cmdStrikesInfo);

2
src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java
View File

@ -12,7 +12,7 @@ public class CmdStrikesGive extends FCommand {
public CmdStrikesGive() {
super();
this.aliases.add("give");
this.aliases.addAll(Aliases.strikes_give);
this.requiredArgs.add(0, "faction");
this.requirements = new CommandRequirements.Builder(Permission.SETSTRIKES)

2
src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java
View File

@ -12,7 +12,7 @@ public class CmdStrikesInfo extends FCommand {
public CmdStrikesInfo() {
super();
this.aliases.add("info");
this.aliases.addAll(Aliases.strikes_info);
this.optionalArgs.put("target", "faction");
this.requirements = new CommandRequirements.Builder(Permission.SETSTRIKES)

2
src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java
View File

@ -12,7 +12,7 @@ public class CmdStrikesSet extends FCommand {
public CmdStrikesSet() {
super();
this.aliases.add("set");
this.aliases.addAll(Aliases.strikes_set);
this.requiredArgs.add(0, "faction");
this.requiredArgs.add(1, "amount");

2
src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java
View File

@ -12,7 +12,7 @@ public class CmdStrikesTake extends FCommand {
public CmdStrikesTake() {
super();
this.aliases.add("take");
this.aliases.addAll(Aliases.strikes_take);
this.requiredArgs.add(0, "faction");
this.requiredArgs.add(1, "number of strikes");

3
src/main/java/com/massivecraft/factions/cmd/CmdStuck.java
View File

@ -19,8 +19,7 @@ public class CmdStuck extends FCommand {
public CmdStuck() {
super();
this.aliases.add("stuck");
this.aliases.add("halp!"); // halp!c:
this.aliases.addAll(Aliases.stuck);
this.requirements = new CommandRequirements.Builder(Permission.STUCK)

3
src/main/java/com/massivecraft/factions/cmd/CmdTag.java
View File

@ -20,8 +20,7 @@ public class CmdTag extends FCommand {
*/
public CmdTag() {
this.aliases.add("tag");
this.aliases.add("rename");
this.aliases.addAll(Aliases.tag);
this.requiredArgs.add("faction tag");

2
src/main/java/com/massivecraft/factions/cmd/CmdTitle.java
View File

@ -14,7 +14,7 @@ public class CmdTitle extends FCommand {
*/
public CmdTitle() {
this.aliases.add("title");
this.aliases.addAll(Aliases.title);
this.requiredArgs.add("player name");
this.optionalArgs.put("title", "");

4
src/main/java/com/massivecraft/factions/cmd/CmdToggleAllianceChat.java
View File

@ -12,9 +12,7 @@ public class CmdToggleAllianceChat extends FCommand {
public CmdToggleAllianceChat() {
super();
this.aliases.add("tac");
this.aliases.add("togglealliancechat");
this.aliases.add("ac");
this.aliases.addAll(Aliases.toggleAllianceChat);
this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_ALLIANCE_CHAT)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdTop.java
View File

@ -18,8 +18,7 @@ public class CmdTop extends FCommand {
public CmdTop() {
super();
this.aliases.add("top");
this.aliases.add("t");
this.aliases.addAll(Aliases.top);
this.requiredArgs.add("criteria");
this.optionalArgs.put("page", "1");

2
src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java
View File

@ -15,7 +15,7 @@ public class CmdTpBanner extends FCommand {
public CmdTpBanner() {
super();
this.aliases.add("tpbanner");
this.aliases.addAll(Aliases.tpBanner);
this.requirements = new CommandRequirements.Builder(Permission.TPBANNER)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdUnban.java
View File

@ -14,7 +14,7 @@ public class CmdUnban extends FCommand {
public CmdUnban() {
super();
this.aliases.add("unban");
this.aliases.addAll(Aliases.unban);
this.requiredArgs.add("target");
this.requirements = new CommandRequirements.Builder(Permission.BAN)

3
src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java
View File

@ -13,8 +13,7 @@ public class CmdUpgrades extends FCommand {
public CmdUpgrades() {
super();
this.aliases.add("upgrades");
this.aliases.add("upgrade");
this.aliases.addAll(Aliases.upgrades);
this.requirements = new CommandRequirements.Builder(Permission.UPGRADES)
.playerOnly()

2
src/main/java/com/massivecraft/factions/cmd/CmdVault.java
View File

@ -18,7 +18,7 @@ public class CmdVault extends FCommand {
*/
public CmdVault() {
this.aliases.add("vault");
this.aliases.addAll(Aliases.vault);
this.requirements = new CommandRequirements.Builder(Permission.VAULT)
.playerOnly()

3
src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java
View File

@ -13,8 +13,7 @@ public class CmdViewChest extends FCommand {
public CmdViewChest() {
super();
this.aliases.add("viewchest");
this.aliases.add("viewpv");
this.aliases.addAll(Aliases.viewChest);
this.requiredArgs.add("faction name");

6
src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions.cmd.alts;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.Aliases;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
@ -20,10 +21,7 @@ public class CmdAlts extends FCommand {
public CmdAlts() {
super();
this.aliases.add("alts");
this.aliases.add("alt");
this.aliases.addAll(Aliases.alts_alts);
this.addSubCommand(this.cmdInviteAlt);
this.addSubCommand(this.cmdAltsList);
this.addSubCommand(this.cmdKickAlt);

4
src/main/java/com/massivecraft/factions/cmd/alts/CmdAltsList.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.alts;
import com.google.common.base.Joiner;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.cmd.Aliases;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
@ -19,8 +20,7 @@ public class CmdAltsList extends FCommand {
public CmdAltsList() {
super();
this.aliases.add("list");
this.aliases.add("l");
this.aliases.addAll(Aliases.alts_list);
this.optionalArgs.put("faction", "yours");

3
src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.alts;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.Aliases;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
@ -24,7 +25,7 @@ public class CmdInviteAlt extends FCommand {
public CmdInviteAlt() {
super();
this.aliases.add("invite");
this.aliases.addAll(Aliases.alts_invite);
this.requiredArgs.add("player name");
this.requirements = new CommandRequirements.Builder(Permission.INVITE)

3
src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java
View File

@ -4,6 +4,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.cmd.Aliases;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
@ -26,7 +27,7 @@ public class CmdKickAlt extends FCommand {
public CmdKickAlt(){
super();
this.aliases.add("kick");
this.aliases.addAll(Aliases.alts_kick);
this.requiredArgs.add("player name");
this.requirements = new CommandRequirements.Builder(Permission.KICK)

5
src/main/java/com/massivecraft/factions/cmd/audit/CmdAudit.java
View File

@ -5,6 +5,7 @@ package com.massivecraft.factions.cmd.audit;
*/
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.cmd.Aliases;
import com.massivecraft.factions.cmd.CommandContext;
import com.massivecraft.factions.cmd.CommandRequirements;
import com.massivecraft.factions.cmd.FCommand;
@ -16,9 +17,7 @@ public class CmdAudit extends FCommand {
public CmdAudit() {
super();
this.aliases.add("audit");
this.aliases.add("logs");
this.aliases.add("log");
this.aliases.addAll(Aliases.audit);
this.requirements = new CommandRequirements.Builder(Permission.AUDIT)

Some files were not shown because too many files have changed in this diff Show More