New Feature

Added an argument to the command that allows you to, basically, specify
the lowest faction rank added to the region. For example, if you type
officer, it adds only officers and leader to the region. if you type
member, it adds members and up. If you type all, it allows recruits.

Author: Pocketkid2

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.pocketkid2</groupId>
 	<artifactId>WGFactions</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.1</version>
 	<name>WGFactions</name>
 	<description>World Guard and Factions working together!</description>
 	<properties>

src/main/java/com/github/pocketkid2/wgf/AddType.java

@@ -0,0 +1,24 @@
+package com.github.pocketkid2.wgf;
+
+public enum AddType {
+	// Leader and officers in the faction
+	OFFICERS,
+	// All faction members except recruits
+	MEMBERS,
+	// All (including recruits)
+	ALL;
+
+	@Override
+	public String toString() {
+		switch (this) {
+		case ALL:
+			return "all players";
+		case MEMBERS:
+			return "all players except recruits";
+		case OFFICERS:
+			return "leader and officer";
+		default:
+			return null;
+		}
+	}
+}

src/main/java/com/github/pocketkid2/wgf/Messages.java

@@ -11,5 +11,6 @@ public interface Messages {
 	String INVALID_FACTION = ChatColor.RED + "Invalid faction!";
 	String ADDED = ChatColor.AQUA + "Added all players from faction " + ChatColor.GREEN + "%s " + ChatColor.AQUA + "to region " + ChatColor.BLUE + "%s";
 	String REMOVED = ChatColor.AQUA + "Removed all players from faction " + ChatColor.GREEN + "%s " + ChatColor.AQUA + "from region " + ChatColor.BLUE + "%s";
+	String INVALID_MODE = ChatColor.RED + "Invalid add mode! Valid modes are OFFICER, MEMBER, or ALL";
 
 }

src/main/java/com/github/pocketkid2/wgf/commands/WGFAddCommand.java

@@ -7,6 +7,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import com.github.pocketkid2.wgf.AddType;
 import com.github.pocketkid2.wgf.Messages;
 import com.github.pocketkid2.wgf.WGFPlugin;
 import com.massivecraft.factions.entity.Faction;
@@ -27,23 +28,23 @@ public WGFAddCommand(WGFPlugin pl) {
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 		// Check for not enough arguments
-		if (args.length < 2) {
+		if (args.length < 3) {
 			sender.sendMessage(Messages.NOT_ENOUGH_ARGUMENTS);
 		}
 
 		// Check for too many arguments
-		if (args.length > 3) {
+		if (args.length > 4) {
 			sender.sendMessage(Messages.TOO_MANY_ARGUMENTS);
 			return false;
 		}
 
 		// World being used
 		World world;
 
-		// Check for a third argument
-		if (args.length == 3) {
+		// Check for a fourth argument
+		if (args.length == 4) {
 			// Then get the world
-			world = Bukkit.getWorld(args[2]);
+			world = Bukkit.getWorld(args[3]);
 
 			// Check for null
 			if (world == null) {
@@ -61,6 +62,23 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			}
 		}
 
+		// Get the mode
+		AddType mode;
+		switch (args[2].toLowerCase()) {
+		case "officer":
+			mode = AddType.OFFICERS;
+			break;
+		case "member":
+			mode = AddType.MEMBERS;
+			break;
+		case "all":
+			mode = AddType.ALL;
+			break;
+		default:
+			sender.sendMessage(Messages.INVALID_MODE);
+			return false;
+		}
+
 		// Get the region
 		RegionContainer container = plugin.getWorldGuard().getRegionContainer();
 		RegionManager manager = container.get(world);
@@ -83,14 +101,41 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
 		// Showtime
 		for (MPlayer player : faction.getMPlayers()) {
-			region.getMembers().addPlayer(player.getUuid());
+
+			switch (player.getRole()) {
+			// If it's a leader or officer, we add them automatically
+			case LEADER:
+			case OFFICER:
+				add(region, player);
+				break;
+			// If it's a member, we only add if it's one of the other two modes
+			case MEMBER:
+				if (mode != AddType.OFFICERS) {
+					add(region, player);
+				}
+				break;
+			// Recruits are only added on the last mode
+			case RECRUIT:
+				if (mode == AddType.ALL) {
+					add(region, player);
+				}
+				break;
+			default:
+				break;
+
+			}
 		}
 
 		// Notify the sender
-		sender.sendMessage(String.format(Messages.ADDED, faction.getName(), region.getId()));
+		sender.sendMessage(String.format(Messages.ADDED, mode.toString(), faction.getName(), region.getId()));
 
 		// We're done
 		return true;
 	}
 
+	// This prevents code reuse
+	private void add(ProtectedRegion region, MPlayer player) {
+		region.getMembers().addPlayer(player.getUuid());
+	}
+
 }

src/main/resources/plugin.yml

@@ -1,13 +1,13 @@
 name: WGFactions
 main: com.github.pocketkid2.wgf.WGFPlugin
-version: 0.1.0
+version: 0.1.1
 depend: [WorldGuard, Factions]
 author: Pocketkid2
 description: World Guard and Factions working together!
 commands:
     wgfadd:
         description: Add all players from a faction to a region
-        usage: /<command> <region> <faction> [world]
+        usage: /<command> <region> <faction> <officer|member|all> [world]
         permission: wgf.add
         permisison-message: You don't have permission!
     wgfremove: