summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupBridge
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-08-14 21:56:40 +0200
committersnowleo <schneeleo@gmail.com>2011-08-14 21:56:40 +0200
commita2fa666fd5b1cd3f6fac82da1063268589fd967a (patch)
tree13ad9b3787832f0ced78de98e01ff035a58885af /EssentialsGroupBridge
parent76eb00575bcd855f74c1cf284a09a9c58f928f7d (diff)
downloadEssentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar
Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.gz
Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.lz
Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.xz
Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.zip
GroupManager update to Permissions 3.1.6 API done by ElgarL
Diffstat (limited to 'EssentialsGroupBridge')
-rw-r--r--EssentialsGroupBridge/nbproject/project.properties21
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/Messaging.classbin2604 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/Misc$string.classbin982 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/Misc.classbin3980 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/configuration/ConfigurationHandler.classbin788 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/configuration/DefaultConfiguration.classbin435 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/database/Wrapper$Type.classbin1107 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/database/Wrapper.classbin5428 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/permissions/Control.classbin27337 -> 0 bytes
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.classbin3198 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java120
-rwxr-xr-x[-rw-r--r--]EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java457
-rw-r--r--EssentialsGroupBridge/src/plugin.yml2
13 files changed, 360 insertions, 240 deletions
diff --git a/EssentialsGroupBridge/nbproject/project.properties b/EssentialsGroupBridge/nbproject/project.properties
index 30137e428..28cec30c9 100644
--- a/EssentialsGroupBridge/nbproject/project.properties
+++ b/EssentialsGroupBridge/nbproject/project.properties
@@ -4,6 +4,19 @@ annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsGroupBridge
application.vendor=gabrielcouto
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap=none
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@@ -26,16 +39,16 @@ dist.jar=${dist.dir}/EssentialsGroupBridge.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
-file.reference.Permissions.jar=..\\lib\\Permissions.jar
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.Permissions3.jar=../lib/Permissions3.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=true
jar.index=${jnlp.enabled}
javac.classpath=\
${reference.EssentialsGroupManager.jar}:\
- ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
- ${file.reference.Permissions.jar}
+ ${file.reference.Permissions3.jar}:\
+ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
diff --git a/EssentialsGroupBridge/src/com/nijiko/Messaging.class b/EssentialsGroupBridge/src/com/nijiko/Messaging.class
deleted file mode 100644
index f563d0085..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/Messaging.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/Misc$string.class b/EssentialsGroupBridge/src/com/nijiko/Misc$string.class
deleted file mode 100644
index 124b535c3..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/Misc$string.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/Misc.class b/EssentialsGroupBridge/src/com/nijiko/Misc.class
deleted file mode 100644
index 4330a303f..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/Misc.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/configuration/ConfigurationHandler.class b/EssentialsGroupBridge/src/com/nijiko/configuration/ConfigurationHandler.class
deleted file mode 100644
index 97c1fb35b..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/configuration/ConfigurationHandler.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/configuration/DefaultConfiguration.class b/EssentialsGroupBridge/src/com/nijiko/configuration/DefaultConfiguration.class
deleted file mode 100644
index 06d9ee23b..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/configuration/DefaultConfiguration.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/database/Wrapper$Type.class b/EssentialsGroupBridge/src/com/nijiko/database/Wrapper$Type.class
deleted file mode 100644
index 173279ddf..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/database/Wrapper$Type.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/database/Wrapper.class b/EssentialsGroupBridge/src/com/nijiko/database/Wrapper.class
deleted file mode 100644
index e1b59f9e1..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/database/Wrapper.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/Control.class b/EssentialsGroupBridge/src/com/nijiko/permissions/Control.class
deleted file mode 100644
index d0d8845ac..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/Control.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class b/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class
deleted file mode 100644
index a23287a5b..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
index cf0d09a35..c7a85fc71 100644..100755
--- a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
+++ b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
@@ -1,16 +1,11 @@
package com.nijikokun.bukkit.Permissions;
-import com.nijiko.Misc;
-import com.nijiko.configuration.DefaultConfiguration;
import com.nijiko.permissions.PermissionHandler;
import java.util.logging.Logger;
import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.permissions.NijikoPermissionsProxy;
-import org.bukkit.Server;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
@@ -19,110 +14,69 @@ import org.bukkit.plugin.java.JavaPlugin;
public class Permissions extends JavaPlugin {
- private class Listener extends PlayerListener {
-
- private Permissions plugin;
-
- public Listener(Permissions plugin) {
- //compiled code
- throw new RuntimeException("Compiled Code");
- }
-
- public void onPlayerCommand(PlayerChatEvent event) {
- //compiled code
- throw new RuntimeException("Compiled Code");
- }
- }
public static final Logger log = Logger.getLogger("Fake Permissions");
public static String name = "Permissions";
public static String codename = "Hacked Permissions by AnjoCaido";
public static String version = "2.0";
public static PermissionHandler Security = null;
- public static Misc Misc = new Misc();
- public static Server Server;
- private Listener Listener = null;
- private DefaultConfiguration config = null;
- private GroupManager groupManager;
@Override
public void onDisable() {
- //compiled code
- //throw new RuntimeException("Compiled Code");
- // EXAMPLE: Custom code, here we just output some info so we can check all is well
PluginDescriptionFile pdfFile = this.getDescription();
System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
}
@Override
public void onEnable() {
- Server = this.getServer();
PluginDescriptionFile pdfFile = this.getDescription();
- if (Security == null) {//make sure we have only one instance
- Security = new NijikoPermissionsProxy(null);
- }
-
- Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
- if (p != null) {
- if (p.isEnabled()) {
- setGM(p);
- } else {
- if (this.getServer() != null) {
- this.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new ServerListener() {
+ if (Security == null) {
+ //make sure we have only one instance
+ Security = new NijikoPermissionsProxy(null);
+ }
+
+ Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
+ if (p != null) {
+ if (p.isEnabled()) {
+ setGM(p);
+ } else {
+ if (this.getServer() != null) {
+ this.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new ServerListener() {
+
+ @Override
+ public void onPluginEnable(PluginEnableEvent event) {
+ if (event.getPlugin().getDescription().getName().equals("GroupManager")) {
+ Permissions.this.setGM(event.getPlugin());
+ }
+ }
+ }, Priority.Normal, this);
+ }
+ }
+ } else {
+ System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
+ this.getPluginLoader().disablePlugin(this);
+ }
- @Override
- public void onPluginEnable(PluginEnableEvent event)
- {
- if (event.getPlugin().getDescription().getName().equals("GroupManager")) {
- Permissions.this.setGM(event.getPlugin());
- }
- }
-
- }, Priority.Normal, this);
- }
- }
- } else {
- System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
- this.getPluginLoader().disablePlugin(this);
- }
- // EXAMPLE: Custom code, here we just output some info so we can check all is well
- if (pdfFile != null)
- System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
+ if (pdfFile != null) {
+ System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
+ }
}
- private void registerEvents() {
- //compiled code
- //throw new RuntimeException("Compiled Code");
+ private void setGM(final Plugin p) {
+ GroupManager groupManager = (GroupManager) p;
+ ((NijikoPermissionsProxy) Security).setGM(p);
}
-
- private void setGM(Plugin p) {
- groupManager = (GroupManager)p;
- ((NijikoPermissionsProxy)Security).setGM(p);
- }
public PermissionHandler getHandler() {
- //compiled code
- //throw new RuntimeException("Compiled Code");
- //System.out.println("Alguem chamou o handler");
- if (Security == null)
- {
- Security = new NijikoPermissionsProxy(null);
- }
- //checkEnable();
+ if (Security == null) {
+ Security = new NijikoPermissionsProxy(null);
+ }
return Security;
}
public void setupPermissions() {
- if (Security == null)
- {
- Security = new NijikoPermissionsProxy(null);
- }
- //checkEnable();
- }
-
- private void checkEnable() {
- if (!this.isEnabled() && Security == null && this.getServer() != null) {
- this.getServer().getPluginManager().enablePlugin(this);
+ if (Security == null) {
+ Security = new NijikoPermissionsProxy(null);
}
}
}
diff --git a/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java b/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
index e26c10711..bc9cde437 100644..100755
--- a/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
+++ b/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
@@ -4,26 +4,34 @@
*/
package org.anjocaido.groupmanager.permissions;
-import com.nijiko.permissions.Control;
+import com.nijiko.permissions.Group;
+import com.nijiko.permissions.PermissionHandler;
+import com.nijiko.permissions.User;
+
import java.io.File;
+import java.util.Collection;
+import java.util.Comparator;
import java.util.Map;
+import java.util.Set;
+
import org.anjocaido.groupmanager.GroupManager;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
/**
- * Everything here maintains the model created by Nijikokun
- *
+ * Everything here maintains the model created by Nijikokun
+ *
* But implemented to use GroupManager system. Which provides instant changes,
* without file access.
*
* @author gabrielcouto
*/
-public class NijikoPermissionsProxy extends Control {
+public class NijikoPermissionsProxy extends PermissionHandler {
+
GroupManager plugin;
- public NijikoPermissionsProxy(GroupManager plugin){
- super(null);
+
+ public NijikoPermissionsProxy(GroupManager plugin) {
+ super();
this.plugin = plugin;
}
@@ -39,12 +47,12 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void addGroupInfo(String world, String group, String node, Object data) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addGroupInfo(group, node, data);
}
@Override
public void removeGroupInfo(String world, String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeGroupInfo(group, node);
}
@Override
@@ -59,62 +67,62 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void addUserInfo(String world, String user, String node, Object data) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addUserInfo(user, node, data);
}
@Override
public void removeUserInfo(String world, String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeUserInfo(user, node);
}
- @Override
+ @Deprecated
public void removeUserInfo(String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeUserInfo(user, node);
}
- @Override
+ @Deprecated
public void addGroupPermission(String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
+ @Deprecated
public void removeGroupPermission(String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
+ @Deprecated
public void addGroupInfo(String group, String node, Object data) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addGroupInfo(group, node, data);
}
- @Override
+ @Deprecated
public void removeGroupInfo(String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeGroupInfo(group, node);
}
- @Override
+ @Deprecated
public void addUserPermission(String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
+ @Deprecated
public void removeUserPermission(String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
+ @Deprecated
public void addUserInfo(String user, String node, Object data) {
- throw new UnsupportedOperationException("Not supported yet.");
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addUserInfo(user, node, data);
}
@Override
public void setDefaultWorld(String world) {
- //throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
+ @Deprecated
public void setDirectory(File directory) {
- //throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@@ -124,7 +132,7 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void forceLoadWorld(String world) {
- //throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@@ -134,12 +142,7 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void load() {
- //throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void load(String world, Configuration config) {
- //throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@@ -155,100 +158,64 @@ public class NijikoPermissionsProxy extends Control {
}
@Override
- public void setCache(Map<String, Boolean> Cache) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void setCache(String world, Map<String, Boolean> Cache) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void setCacheItem(String player, String permission, boolean data) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void setCacheItem(String world, String player, String permission, boolean data) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Map<String, Boolean> getCache() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Map<String, Boolean> getCache(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean getCacheItem(String player, String permission) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean getCacheItem(String world, String player, String permission) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public boolean has(Player player, String permission) {
+ //throw new UnsupportedOperationException("Not supported yet.");
+ return permission(player, permission);
}
@Override
- public void removeCachedItem(String player, String permission) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public boolean permission(Player player, String permission) {
+ //throw new UnsupportedOperationException("Not supported yet.");
+ if (permission == null || permission.equals("")) {
+ return false;
+ }
+ if (player == null) {
+ GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
+ return false;
+ }
+ if (player.getWorld() == null) {
+ GroupManager.logger.warning("The player " + player.getName() + " has a null world? Treating as default world!");
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().has(player, permission);
+ }
+ return plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getPermissionsHandler().has(player, permission);
}
@Override
- public void removeCachedItem(String world, String player, String permission) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public String getGroupRawPrefix(String world, String group) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
}
@Override
- public void clearCache() {
- throw new UnsupportedOperationException("Not supported yet.");
+ public String getGroupRawSuffix(String world, String group) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
}
@Override
- public void clearCache(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public String getUserPrefix(String world, String user) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPrefix(user);
}
@Override
- public void clearAllCache() {
- throw new UnsupportedOperationException("Not supported yet.");
+ public String getUserSuffix(String world, String user) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserSuffix(user);
}
@Override
- public boolean has(Player player, String permission) {
- //throw new UnsupportedOperationException("Not supported yet.");
- return permission(player, permission);
+ public String getGroup(String world, String user) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
}
@Override
- public boolean permission(Player player, String permission) {
- //throw new UnsupportedOperationException("Not supported yet.");
- if(permission==null || permission.equals("")){
- return false;
- }
- if(player==null){
- GroupManager.logger.severe("A plugin is asking permission '"+permission+"' for a null player... Which plugin does that? Bastards!");
- return false;
- }
- if(player.getWorld()==null){
- GroupManager.logger.warning("The player "+player.getName()+" has a null world? Treating as default world!");
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().has(player, permission);
- }
- return plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getPermissionsHandler().has(player, permission);
+ public String getPrimaryGroup(String world, String user) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
}
@Override
- public String getGroup(String world, String name) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(name);
+ public boolean canUserBuild(String world, String user) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canUserBuild(user);
}
@Deprecated
- @Override
public String getGroup(String name) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroup(name);
}
@@ -258,21 +225,14 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroups(name);
}
- @Deprecated
- @Override
- public String[] getGroups(String name) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroups(name);
- }
-
@Override
public boolean inGroup(String world, String name, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name,group);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name, group);
}
@Deprecated
- @Override
public boolean inGroup(String name, String group) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name,group);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name, group);
}
@Override
@@ -280,7 +240,7 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
}
- @Override
+ @Deprecated
public String getGroupPrefix(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPrefix(group);
}
@@ -290,7 +250,7 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
}
- @Override
+ @Deprecated
public String getGroupSuffix(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupSuffix(group);
}
@@ -301,134 +261,327 @@ public class NijikoPermissionsProxy extends Control {
}
@Deprecated
- @Override
public boolean canGroupBuild(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().canGroupBuild(group);
}
@Override
public String getGroupPermissionString(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group, permission);
}
- @Override
+ @Deprecated
public String getGroupPermissionString(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group, permission);
}
@Override
public int getGroupPermissionInteger(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group, permission);
}
- @Override
+ @Deprecated
public int getGroupPermissionInteger(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group, permission);
}
@Override
public boolean getGroupPermissionBoolean(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group, permission);
}
- @Override
+ @Deprecated
public boolean getGroupPermissionBoolean(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group, permission);
}
@Override
public double getGroupPermissionDouble(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group, permission);
}
- @Override
+ @Deprecated
public double getGroupPermissionDouble(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group, permission);
}
@Override
public String getUserPermissionString(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name, permission);
}
- @Override
+ @Deprecated
public String getUserPermissionString(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name, permission);
}
@Override
public int getUserPermissionInteger(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name, permission);
}
- @Override
+ @Deprecated
public int getUserPermissionInteger(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name, permission);
}
@Override
public boolean getUserPermissionBoolean(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name, permission);
}
- @Override
+ @Deprecated
public boolean getUserPermissionBoolean(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name, permission);
}
@Override
public double getUserPermissionDouble(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name, permission);
}
- @Override
+ @Deprecated
public double getUserPermissionDouble(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name, permission);
}
@Override
public String getPermissionString(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name, permission);
}
- @Override
+ @Deprecated
public String getPermissionString(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name, permission);
}
@Override
public int getPermissionInteger(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name, permission);
}
- @Override
+ @Deprecated
public int getPermissionInteger(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name, permission);
}
@Override
public boolean getPermissionBoolean(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name, permission);
}
- @Override
+ @Deprecated
public boolean getPermissionBoolean(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name, permission);
}
@Override
public double getPermissionDouble(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name,permission);
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name, permission);
}
- @Override
+ @Deprecated
public double getPermissionDouble(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name,permission);
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name, permission);
}
- public void setGM(Plugin p)
- {
- this.plugin = (GroupManager)p;
- }
+ public void setGM(Plugin p) {
+ this.plugin = (GroupManager) p;
+ }
+
+ @Override
+ public boolean canGroupRawBuild(String world, String group) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
+ }
+
+ @Override
+ public void closeAll() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int compareWeights(String firstWorld, String first, String secondWorld, String second) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int compareWeights(String world, String first, String second) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Map<String, Set<String>> getAllGroups(String world, String name) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Group getDefaultGroup(String world) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Group getGroupObject(String world, String group) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getGroupProperName(String world, String group) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Boolean getInfoBoolean(String world, String entryName, String path,
+ boolean isGroup) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoBoolean(entryName, path, isGroup);
+ }
+
+ @Override
+ public Boolean getInfoBoolean(String world, String entryName, String path,
+ boolean isGroup, Comparator<Boolean> comparator) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Double getInfoDouble(String world, String entryName, String path, boolean isGroup) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoDouble(entryName, path, isGroup);
+ }
+
+ @Override
+ public Double getInfoDouble(String world, String entryName, String path,
+ boolean isGroup, Comparator<Double> comparator) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Integer getInfoInteger(String world, String entryName, String path,
+ boolean isGroup) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoInteger(entryName, path, isGroup);
+ }
+
+ @Override
+ public Integer getInfoInteger(String world, String entryName, String path,
+ boolean isGroup, Comparator<Integer> comparator) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getInfoString(String world, String entryName, String path, boolean isGroup) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoString(entryName, path, isGroup);
+ }
+
+ @Override
+ public String getInfoString(String world, String entryName, String path,
+ boolean isGroup, Comparator<String> comparator) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Boolean getRawInfoBoolean(String world, String entryName, String path,
+ boolean isGroup) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Double getRawInfoDouble(String world, String entryName, String path,
+ boolean isGroup) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ @Override
+ public Integer getRawInfoInteger(String world, String entryName, String path,
+ boolean isGroup) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getRawInfoString(String world, String entryName, String path,
+ boolean isGroup) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Set<String> getTracks(String world) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public User getUserObject(String world, String name) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Collection<User> getUsers(String world) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Set<String> getWorlds() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean has(String world, String playerName, String permission) {
+ if (permission == null || permission.equals("")) {
+ return false;
+ }
+ if (playerName == null || playerName == "") {
+ GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
+ return false;
+ }
+ if (world == null) {
+ GroupManager.logger.warning("The player " + playerName + " has a null world? Treating as default world!");
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().permission(playerName, permission);
+ }
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().permission(playerName, permission);
+ }
+
+ @Override
+ public boolean inGroup(String world, String user, String groupWorld, String group) {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(user, group);
+ }
+
+ @Override
+ public boolean inSingleGroup(String world, String user, String group) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean inSingleGroup(String world, String user, String groupWorld, String group) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean permission(String world, String name, String node) {
+ return has(world, name, node);
+ }
+
+ @Override
+ public Group safeGetGroup(String world, String name) throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public User safeGetUser(String world, String name) throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void save(String world) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void saveAll() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Collection<Group> getGroups(String world) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Group getPrimaryGroupObject(String string, String string1) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/EssentialsGroupBridge/src/plugin.yml b/EssentialsGroupBridge/src/plugin.yml
index 513beb372..ca6e2b1dc 100644
--- a/EssentialsGroupBridge/src/plugin.yml
+++ b/EssentialsGroupBridge/src/plugin.yml
@@ -1,4 +1,4 @@
name: Permissions
-version: 2.7.2
+version: 3.1.6
main: com.nijikokun.bukkit.Permissions.Permissions
depend: [GroupManager] \ No newline at end of file