Expand GlobalGroups.yml and groups.yml to cover the VanishNoPacket

plugin. Demonstrating how to negate and add nodes when using the '*'
permission with inheritance.

4 files changed, 146 insertions, 76 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 7c10cc3ac..b957f4515 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -173,4 +173,5 @@ v 2.0:
 	- Stop the error on shutdown if GM failed to load at startup.

 	- GroupManager will now generate it's own log (in the GM folder) to keep things tidy, but also to account of those players unable to find/access their server.log.

 	- Startup errors will now lock out ALL commands other than '/manload'

-	- Fix 'manuadd' to use the default or selected world (via 'manselect'), if the world is not specified in the command.
\ No newline at end of file
+	- Fix 'manuadd' to use the default or selected world (via 'manselect'), if the world is not specified in the command.

+	- Expand GlobalGroups.yml and groups.yml to cover the VanishNoPacket plugin. Demonstrating how to negate and add nodes when using the '*' permission with inheritance.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/globalgroups.yml b/EssentialsGroupManager/src/globalgroups.yml
index 885c6675d..fa8808e00 100644
--- a/EssentialsGroupManager/src/globalgroups.yml
+++ b/EssentialsGroupManager/src/globalgroups.yml
@@ -1,5 +1,101 @@
+# These groups only contain permission nodes.

+#

+# **** You can NOT add anything other than permission nodes ****

+#

+# These collections are to be inherited in your different worlds groups.yml's

+# They can also be added as one of a users subgroups, but NOT as a primary group.

+# These collections are available to ALL group and user yml's.

+#

+# Add to and customize these groups to fit yoru needs.

+

 groups:

 

+# Permission nodes for GroupManager

+# by ElgarL, snowleo, continued from gabrielcouto's original

+# http://dev.bukkit.org/server-mods/essentials/

+

+  g:groupmanager_default:

+    permissions:

+    - groupmanager.notify.self

+    

+  g:groupmanager_moderator:

+    permissions:

+    - groupmanager.listgroups

+    - groupmanager.mandemote

+    - groupmanager.manpromote

+    - groupmanager.manselect

+    - groupmanager.manuadd

+    - groupmanager.manudel

+    - groupmanager.manwhois

+    - groupmanager.notify.other

+    

+  g:groupmanager_admin:

+    permissions:

+    - groupmanager.mantogglevalidate

+    - groupmanager.mansave

+    - groupmanager.mangcheckp

+    - groupmanager.manglistp

+    - groupmanager.manucheckp

+    - groupmanager.manulistp

+

+# Permission nodes for CraftBukkit

+# by many devs and contributors

+# http://dl.bukkit.org/

+

+  g:bukkit_default:

+    permissions:

+    - bukkit.broadcast.user

+    - -bukkit.command.plugins

+    

+  g:bukkit_moderator:

+    permissions:

+    - bukkit.command.ban

+    - bukkit.command.ban.ip

+    - bukkit.command.ban.player

+    - bukkit.command.gamemode

+    - bukkit.command.kick

+    - bukkit.command.unban

+    - bukkit.command.unban.ip

+    - bukkit.command.unban.player

+

+  g:bukkit_admin:

+    permissions:

+    - bukkit.broadcast

+    - bukkit.broadcast.admin

+    - bukkit.command.give

+    - bukkit.command.help

+    - bukkit.command.kill

+    - bukkit.command.list

+    - bukkit.command.me

+    - -bukkit.command.op

+    - -bukkit.command.op.give

+    - -bukkit.command.op.take

+    - bukkit.command.plugins

+    - bukkit.command.reload

+    - bukkit.command.save

+    - bukkit.command.save.disable

+    - bukkit.command.save.enable

+    - bukkit.command.save.perform

+    - bukkit.command.say

+    - bukkit.command.stop

+    - bukkit.command.teleport

+    - bukkit.command.tell

+    - bukkit.command.time

+    - bukkit.command.time.add

+    - bukkit.command.time.set

+    - bukkit.command.version

+    - bukkit.command.whitelist

+    - bukkit.command.whitelist.add

+    - bukkit.command.whitelist.disable

+    - bukkit.command.whitelist.enable

+    - bukkit.command.whitelist.list

+    - bukkit.command.whitelist.reload

+    - bukkit.command.whitelist.remove

+

+# Permission nodes for Essentials

+# by ementalo, snowleo, and KHobbits

+# http://dev.bukkit.org/server-mods/essentials/

+

   g:essentials_default:

     permissions:

     - essentials.help

@@ -8,7 +104,6 @@ groups:
     - essentials.motd

     - essentials.rules

     - essentials.spawn

-    - groupmanager.notify.self

     

   g:essentials_builder:

     permissions:

@@ -101,14 +196,6 @@ groups:
     - essentials.weather

     - essentials.whois

     - essentials.world

-    - groupmanager.listgroups

-    - groupmanager.mandemote

-    - groupmanager.manpromote

-    - groupmanager.manselect

-    - groupmanager.manuadd

-    - groupmanager.manudel

-    - groupmanager.manwhois

-    - groupmanager.notify.other

     

   g:essentials_admin:

     permissions:

@@ -118,62 +205,13 @@ groups:
     - -essentials.reloadall

     - -essentials.plugin

     - essentials.*

-    - groupmanager.mantogglevalidate

-    - groupmanager.mansave

-    - groupmanager.mangcheckp

-    - groupmanager.manglistp

-    - groupmanager.manucheckp

-    - groupmanager.manulistp

-    

-  g:bukkit_default:

-    permissions:

-    - bukkit.broadcast.user

-    - -bukkit.command.plugins

-    

-  g:bukkit_moderator:

-    permissions:

-    - bukkit.command.ban

-    - bukkit.command.ban.ip

-    - bukkit.command.ban.player

-    - bukkit.command.gamemode

-    - bukkit.command.kick

-    - bukkit.command.unban

-    - bukkit.command.unban.ip

-    - bukkit.command.unban.player

 

-  g:bukkit_admin:

+# Permission nodes for Towny by ElgarL

+# http://dev.bukkit.org/server-mods/towny-advanced/

+

+  g:towny_default:

     permissions:

-    - bukkit.broadcast

-    - bukkit.broadcast.admin

-    - bukkit.command.give

-    - bukkit.command.help

-    - bukkit.command.kill

-    - bukkit.command.list

-    - bukkit.command.me

-    - -bukkit.command.op

-    - -bukkit.command.op.give

-    - -bukkit.command.op.take

-    - bukkit.command.plugins

-    - bukkit.command.reload

-    - bukkit.command.save

-    - bukkit.command.save.disable

-    - bukkit.command.save.enable

-    - bukkit.command.save.perform

-    - bukkit.command.say

-    - bukkit.command.stop

-    - bukkit.command.teleport

-    - bukkit.command.tell

-    - bukkit.command.time

-    - bukkit.command.time.add

-    - bukkit.command.time.set

-    - bukkit.command.version

-    - bukkit.command.whitelist

-    - bukkit.command.whitelist.add

-    - bukkit.command.whitelist.disable

-    - bukkit.command.whitelist.enable

-    - bukkit.command.whitelist.list

-    - bukkit.command.whitelist.reload

-    - bukkit.command.whitelist.remove

+    - towny.chat.general

 

   g:towny_builder:

     permissions:

@@ -224,4 +262,24 @@ groups:
     - towny.admin

     - -towny.wild.destroy.119

     - -towny.wild.destroy.120

-    - towny.chat.admin
\ No newline at end of file
+    - towny.chat.admin

+    

+# Permission nodes for VanishNoPacket by mbaxter

+# http://dev.bukkit.org/server-mods/vanish/

+

+  g:vanish_moderator:

+    permissions:

+    - -vanish.*

+    - vanish.vanish

+    - vanish.smokin

+    - vanish.nofollow

+    - vanish.nopickup

+    - vanish.preventincomingdamage

+    - vanish.hooks.dynmap.alwayshidden

+    - vanish.hooks.essentials.hide

+

+  g:vanish_admin:

+    permissions:

+    - vanish.silentjoin

+    - vanish.silentquit

+    - vanish.silentchests
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml
index ec8b0422f..9c63ffd94 100644
--- a/EssentialsGroupManager/src/groups.yml
+++ b/EssentialsGroupManager/src/groups.yml
@@ -1,10 +1,12 @@
 # Group inheritance
-# any inherited groups prefixed with a g: are global groups
-# These groups are defined in the globalgroups.yml
-# and can be inherited in any worlds groups/users.yml.
+#
+# Any inherited groups prefixed with a g: are global groups
+# and are inherited from the GlobalGroups.yml.
 #
 # Groups without the g: prefix are groups local to this world
-# and defined in the this groups.yml file.
+# and are defined in the this groups.yml file.
+#
+# Local group inheritances define your promotion tree when using 'manpromote/mandemote'
 
 groups:
   Default:
@@ -12,8 +14,10 @@ groups:
     permissions:
     - -bukkit.command.kill
     inheritance:
-    - g:essentials_default
+    - g:groupmanager_default
     - g:bukkit_default
+    - g:essentials_default
+    - g:towny_default
     info:
       prefix: '&e'
       build: false
@@ -34,9 +38,11 @@ groups:
     permissions: []
     inheritance:
     - builder
-    - g:essentials_moderator
+    - g:groupmanager_moderator
     - g:bukkit_moderator
+    - g:essentials_moderator
     - g:towny_moderator
+    - g:vanish_moderator
     info:
       prefix: '&5'
       build: true
@@ -46,9 +52,11 @@ groups:
     permissions: []
     inheritance:
     - moderator
-    - g:essentials_admin
+    - g:groupmanager_admin
     - g:bukkit_admin
+    - g:essentials_admin
     - g:towny_admin
+    - g:vanish_admin
     info:
       prefix: '&c'
       build: true
@@ -57,6 +65,7 @@ groups:
     default: false
     permissions:
     - '*'
+    - -vanish.*
     inheritance:
     - admin
     info:
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 135417068..8c974f34a 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -809,12 +809,14 @@ public class WorldDataHolder {
 	        	String newLine = System.getProperty("line.separator");
 	        	
 	        	out.write("# Group inheritance" + newLine);
-	        	out.write("# any inherited groups prefixed with a g: are global groups" + newLine);
-	        	out.write("# These groups are defined in the globalgroups.yml" + newLine);
-	        	out.write("# and can be inherited in any worlds groups/users.yml." + newLine);
+	        	out.write("#" + newLine);
+	        	out.write("# Any inherited groups prefixed with a g: are global groups" + newLine);
+	        	out.write("# and are inherited from the GlobalGroups.yml." + newLine);
 	        	out.write("#" + newLine);
 	        	out.write("# Groups without the g: prefix are groups local to this world" + newLine);
-	        	out.write("# and defined in the this groups.yml file." + newLine);
+	        	out.write("# and are defined in the this groups.yml file." + newLine);
+	        	out.write("#" + newLine);
+	        	out.write("# Local group inheritances define your promotion tree when using 'manpromote/mandemote'" + newLine);
 	        	out.write(newLine);
 	        	
 	            yaml.dump(root, out);