diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index dd9ceab91..246ea1240 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -81,9 +81,7 @@ javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${build.classes.dir}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties
index 0d7673bbd..59540b809 100644
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@@ -70,7 +70,6 @@ file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=../lib/craftbukkit-1.0.0-SNAPSHOT.
file.reference.iCo4.jar=../lib/iCo4.jar
file.reference.iCo5.jar=../lib/iCo5.jar
file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.junit-4.5.jar=../lib/junit_4/junit-4.5.jar
file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
file.reference.Permissions3.jar=../lib/Permissions3.jar
@@ -103,7 +102,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${file.reference.junit-4.5.jar}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index f9584f89a..e1a7e9d5a 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -332,10 +332,8 @@ chat:
protect:
# Database settings for sign/rail protection
- # get mysql.jar and sqlite and place it in your serverroot/lib directory from here:
- # https://github.com/essentials/Essentials/blob/master/lib/mysql.jar
- # mysql, sqlite or none
+ # mysql or sqlite
datatype: 'sqlite'
# If you specified MySQL above, you MUST enter the appropriate details here.
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties
index 0ce40b48b..e59815e40 100644
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index 1b6ef450d..d20b3418f 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsPermissionsCommands/build.xml b/EssentialsPermissionsCommands/build.xml
deleted file mode 100644
index 507230993..000000000
--- a/EssentialsPermissionsCommands/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Builds, tests, and runs the project EssentialsPermissionsCommands.
-
-
-
diff --git a/EssentialsPermissionsCommands/manifest.mf b/EssentialsPermissionsCommands/manifest.mf
deleted file mode 100644
index 328e8e5bc..000000000
--- a/EssentialsPermissionsCommands/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/EssentialsPermissionsCommands/nbproject/build-impl.xml b/EssentialsPermissionsCommands/nbproject/build-impl.xml
deleted file mode 100644
index be53b45fd..000000000
--- a/EssentialsPermissionsCommands/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1081 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/EssentialsPermissionsCommands/nbproject/genfiles.properties b/EssentialsPermissionsCommands/nbproject/genfiles.properties
deleted file mode 100644
index f8c79511e..000000000
--- a/EssentialsPermissionsCommands/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=9c3a069f
-build.xml.script.CRC32=0a912bb3
-build.xml.stylesheet.CRC32=28e38971@1.43.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=9c3a069f
-nbproject/build-impl.xml.script.CRC32=2a10b0d4
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/EssentialsPermissionsCommands/nbproject/project.properties b/EssentialsPermissionsCommands/nbproject/project.properties
deleted file mode 100644
index 9ce9cd6ae..000000000
--- a/EssentialsPermissionsCommands/nbproject/project.properties
+++ /dev/null
@@ -1,125 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=EssentialsPermissionsCommands
-application.vendor=
-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.alignMultilineAnnotationArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-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.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-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
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/EssentialsPermissionsCommands.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-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.Essentials.jar}:\
- ${file.reference.Permissions3.jar}:\
- ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.Essentials=../Essentials
-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/EssentialsPermissionsCommands/nbproject/project.xml b/EssentialsPermissionsCommands/nbproject/project.xml
deleted file mode 100644
index 89e773c31..000000000
--- a/EssentialsPermissionsCommands/nbproject/project.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- org.netbeans.modules.java.j2seproject
-
-
- EssentialsPermissionsCommands
-
-
-
-
-
-
-
-
- ../lib/nblibraries.properties
-
-
-
- Essentials
- jar
-
- jar
- clean
- jar
-
-
-
-
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
deleted file mode 100644
index 8c22dabdc..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangadd extends EssentialsCommand
-{
- public Commandmangadd()
- {
- super("mangadd");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final String group = args[0];
- String command = "permissions g:" + group + " create";
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
deleted file mode 100644
index 760b5c81f..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangaddi extends EssentialsCommand
-{
- public Commandmangaddi()
- {
- super("mangaddi");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- final String group = args[1];
- String command = "permissions g:"+target+" parents add "+group;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
deleted file mode 100644
index e83de4e50..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangaddp extends EssentialsCommand
-{
- public Commandmangaddp()
- {
- super("mangaddp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- final String perm = args[1];
- String command = "permissions g:"+target+" perms add "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
deleted file mode 100644
index 1152d1a0b..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangcheckp extends EssentialsCommand
-{
- public Commandmangcheckp()
- {
- super("mangcheckp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- final String perm = args[1];
- String command = "permissions g:"+target+" has "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
deleted file mode 100644
index 24ffe2307..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdel extends EssentialsCommand
-{
- public Commandmangdel()
- {
- super("mangdel");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final String group = args[0];
- String command = "permissions g:"+group+" delete";
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
deleted file mode 100644
index aea296735..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdeli extends EssentialsCommand
-{
- public Commandmangdeli()
- {
- super("mangdeli");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- final String group = args[1];
- String command = "permissions g:"+target+" parents remove "+group;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
deleted file mode 100644
index ef1dd4207..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdelp extends EssentialsCommand
-{
- public Commandmangdelp()
- {
- super("mangdelp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- final String perm = args[1];
- String command = "permissions g:"+target+" perms remove "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
deleted file mode 100644
index 715f42774..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanglistp extends EssentialsCommand
-{
- public Commandmanglistp()
- {
- super("manglistp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final String target = args[0];
- String command = "permissions g:"+target+" perms list";
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
deleted file mode 100644
index 390cb78eb..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanload extends EssentialsCommand
-{
- public Commandmanload()
- {
- super("manload");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- String world = "all";
- if (args.length > 1)
- {
- world = args[0];
- }
- String command = "permissions -reload "+world;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
deleted file mode 100644
index a63a1a36b..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuadd extends EssentialsCommand
-{
- public Commandmanuadd()
- {
- super("manuadd");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String group = args[1];
- //TODO: Make this command add a player if it doesnt exist /permissions +player+ create
- String command = "permissions "+player+" parents add "+group;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
deleted file mode 100644
index 3d3d67c72..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuaddp extends EssentialsCommand
-{
- public Commandmanuaddp()
- {
- super("manuaddp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String perm = args[1];
- String command = "permissions "+player+" perms add "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
deleted file mode 100644
index 60d1980af..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuaddsub extends EssentialsCommand
-{
- public Commandmanuaddsub()
- {
- super("manuaddsub");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String group = args[1];
- String command = "permissions "+player+" parents add "+group;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
deleted file mode 100644
index 634b447c7..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanucheckp extends EssentialsCommand
-{
- public Commandmanucheckp()
- {
- super("manucheckp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String perm = args[1];
- String command = "permissions "+player+" has "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
deleted file mode 100644
index 72c8fc2af..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudel extends EssentialsCommand
-{
- public Commandmanudel()
- {
- super("manudel");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- String command = "permissions "+player+" delete";
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
deleted file mode 100644
index 01adf97b2..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudelp extends EssentialsCommand
-{
- public Commandmanudelp()
- {
- super("manudelp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String perm = args[1];
- String command = "permissions "+player+" perms remove "+perm;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
deleted file mode 100644
index 1a1ae2a6d..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudelsub extends EssentialsCommand
-{
- public Commandmanudelsub()
- {
- super("manudelsub");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 2)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- final String group = args[1];
- String command = "permissions "+player+" parents remove "+group;
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
deleted file mode 100644
index f809f3c61..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanulistp extends EssentialsCommand
-{
- public Commandmanulistp()
- {
- super("manulistp");
- }
-
- @Override
- protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final String player = args[0];
- String command = "permissions "+player+" perms list";
- sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
- ess.getServer().dispatchCommand(sender, command);
- }
-
-
-}
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
deleted file mode 100644
index 14e9a117c..000000000
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.Util;
-import com.nijiko.permissions.PermissionHandler;
-import com.nijikokun.bukkit.Permissions.Permissions;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-
-
-public class EssentialsPermissionsCommands extends JavaPlugin
-{
- private static PermissionHandler permissionHandler = null;
- private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private IEssentials ess;
-
- public static PermissionHandler getPermissionHandler()
- {
- return permissionHandler;
- }
-
- @Override
- public void onEnable()
- {
- final PluginManager pluginManager = getServer().getPluginManager();
- final Plugin permissionsPlugin = pluginManager.getPlugin("Permissions");
-
- if (permissionsPlugin != null
- && permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
- {
- permissionHandler = ((Permissions)permissionsPlugin).getHandler();
- }
- ess = (IEssentials)pluginManager.getPlugin("Essentials");
-
- if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) {
- LOGGER.log(Level.WARNING, Util.i18n("versionMismatchAll"));
- }
- LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
-
- }
-
- @Override
- public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args)
- {
- return ess.onCommandEssentials(sender, command, label, args, EssentialsPermissionsCommands.class.getClassLoader(), "com.earth2me.essentials.permissions.Command", "groupmanager.");
- }
-
- @Override
- public void onDisable()
- {
- }
-}
diff --git a/EssentialsPermissionsCommands/src/plugin.yml b/EssentialsPermissionsCommands/src/plugin.yml
deleted file mode 100644
index a13023a5c..000000000
--- a/EssentialsPermissionsCommands/src/plugin.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: EssentialsPermissionsCommands
-main: com.earth2me.essentials.permissions.EssentialsPermissionsCommands
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
-website: http://www.earth2me.net:8001/
-description: Adds commands aliases to Permissions 3
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
-depend: [Permissions, Essentials]
-commands:
- manuadd:
- description: Move a player to desired group.(Adds to the file if not exists)
- usage: /
- permission: groupmanager.manuadd
- manudel:
- description: Remove any user specific configuration. Make him default group.
- usage: /
- permission: groupmanager.manudel
- manuaddsub:
- description: Add a group to a player's subgroup list.
- usage: /
- permission: groupmanager.manuaddsub
- manudelsub:
- description: Remove a group to a player's subgroup list.
- usage: /
- permission: groupmanager.manudelsub
- mangadd:
- description: Add group to the system.
- usage: /
- permission: groupmanager.mangadd
- mangdel:
- description: Removes group from the system(all it's users become default)
- usage: /
- permission: groupmanager.mangdel
- manuaddp:
- description: Add permission diretly to the player.
- usage: /
- permission: groupmanager.manuaddp
- manudelp:
- description: Removes permission diretly from the player.
- usage: /
- permission: groupmanager.manudelp
- manulistp:
- description: List all permissions from a player.
- usage: /
- permission: groupmanager.manulistp
- manucheckp:
- description: Verify if user has a permission, and where it comes from.
- usage: /
- permission: groupmanager.manucheckp
- mangaddp:
- description: Add permission to a group.
- usage: /
- permission: groupmanager.mangaddp
- mangdelp:
- description: Removes permission from a group.
- usage: /
- permission: groupmanager.mangdelp
- manglistp:
- description: Lists all permissions from a group.
- usage: /
- permission: groupmanager.manglistp
- mangcheckp:
- description: Check if group has a permission, and where it comes from.
- usage: /
- permission: groupmanager.mangcheckp
- mangaddi:
- description: Add a group to another group inheritance list.
- usage: /
- permission: groupmanager.mangaddi
- mangdeli:
- description: Remove a group from another group inheritance list.
- usage: /
- permission: groupmanager.mangdeli
- manuaddv:
- description: Add, or replaces, a variable to a user (like prefix or suffix).
- usage: /
- permission: groupmanager.manuaddv
- manudelv:
- description: Remove a variable from a user.
- usage: /
- permission: groupmanager.manudelv
- manulistv:
- description: List variables a user has (like prefix or suffix).
- usage: /
- permission: groupmanager.manulistv
- manucheckv:
- description: Verify a value of a variable of user, and where it comes from.
- usage: /
- permission: groupmanager.manucheckv
- mangaddv:
- description: Add, or replaces, a variable to a group (like prefix or suffix).
- usage: /
- permission: groupmanager.mangaddv
- mangdelv:
- description: Remove a variable from a group.
- usage: /
- permission: groupmanager.mangdelv
- manglistv:
- description: List variables a group has (like prefix or suffix).
- usage: /
- permission: groupmanager.manglistv
- mangcheckv:
- description: Verify a value of a variable of group, and where it comes from.
- usage: /
- permission: groupmanager.mangcheckv
- manwhois:
- description: Tell the group that user belongs.
- usage: /
- permission: groupmanager.manwhois
- tempadd:
- description: Creates a temporary permission copy for that user.
- usage: /
- permission: groupmanager.tempadd
- tempdel:
- description: Remove the temporary permission copy for player.
- usage: /
- permission: groupmanager.tempdel
- templist:
- description: List players in overload-permissions mode made by /tempadd.
- usage: /
- permission: groupmanager.templist
- tempdelall:
- description: Remove all overrides made by command /tempadd.
- usage: /
- permission: groupmanager.tempdelall
- mansave:
- description: Save all permissions on file.
- usage: /
- permission: groupmanager.mansave
- manload:
- description: Reload current world and config.yml. Or load given world.
- usage: / [world]
- permission: groupmanager.manload
- listgroups:
- description: List the groups available.
- usage: /
- permission: groupmanager.listgroups
- manpromote:
- description: Promote a player in the same heritage line to a higher rank.
- usage: /
- permission: groupmanager.manpromote
- mandemote:
- description: Demote a player in the same heritage line to a lower rank.
- usage: /
- permission: groupmanager.mandemote
- mantogglevalidate:
- description: Toggle on/off the validating if player is online.
- usage: /
- permission: groupmanager.mantogglevalidate
- mantogglesave:
- description: Toggle on/ff the autosave.
- usage: /
- permission: groupmanager.mantogglesave
- manworld:
- description: Prints the selected world name
- usage: /
- permission: groupmanager.manworld
- manselect:
- description: Select a world to work with next commands.
- usage: /
- permission: groupmanager.manselect
- manclear:
- description: Clear world selection. Next commands will work on your world.
- usage: /
- permission: groupmanager.manclear
diff --git a/EssentialsProtect/MANIFEST.MF b/EssentialsProtect/MANIFEST.MF
index db70a3fda..9d885be53 100644
--- a/EssentialsProtect/MANIFEST.MF
+++ b/EssentialsProtect/MANIFEST.MF
@@ -1,2 +1 @@
Manifest-Version: 1.0
-Class-Path: ../lib/mysql.jar ../lib/sqlite.jar
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties
index 5e8639402..5224b3af6 100644
--- a/EssentialsProtect/nbproject/project.properties
+++ b/EssentialsProtect/nbproject/project.properties
@@ -83,8 +83,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties
index 16c272f09..96f4448ec 100644
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsUpdate/nbproject/project.properties b/EssentialsUpdate/nbproject/project.properties
index 14a032421..b73c58ae9 100644
--- a/EssentialsUpdate/nbproject/project.properties
+++ b/EssentialsUpdate/nbproject/project.properties
@@ -67,8 +67,7 @@ file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
includes=**
jar.compress=true
javac.classpath=\
- ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
- ${libs.junit_4.classpath}
+ ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -78,7 +77,8 @@ javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
- ${build.classes.dir}
+ ${build.classes.dir}:\
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/EssentialsXMPP/build.xml b/EssentialsXMPP/build.xml
index 1edb37153..2e92ef710 100644
--- a/EssentialsXMPP/build.xml
+++ b/EssentialsXMPP/build.xml
@@ -74,7 +74,7 @@
-
+
diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties
index 802c76227..90aba36fa 100644
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@@ -64,7 +64,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
-file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar
+file.reference.smack-3.2.1.jar=../lib/smack-3.2.1.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=true
@@ -72,7 +72,7 @@ jar.index=${jnlp.enabled}
javac.classpath=\
${reference.Essentials.jar}:\
${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
- ${file.reference.smack-3.2.0.jar}
+ ${file.reference.smack-3.2.1.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked
javac.deprecation=false
@@ -83,8 +83,7 @@ javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
- ${libs.junit.classpath}:\
- ${libs.junit_4.classpath}
+ ${libs.junit_4.10.classpath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
diff --git a/lib/EssentialsiConomyBridge.jar b/lib/EssentialsiConomyBridge.jar
deleted file mode 100644
index e847bdf81..000000000
Binary files a/lib/EssentialsiConomyBridge.jar and /dev/null differ
diff --git a/lib/VanishNoPickup.jar b/lib/VanishNoPickup.jar
deleted file mode 100644
index 4acf777ec..000000000
Binary files a/lib/VanishNoPickup.jar and /dev/null differ
diff --git a/lib/gson.jar b/lib/gson.jar
deleted file mode 100644
index 4f7970541..000000000
Binary files a/lib/gson.jar and /dev/null differ
diff --git a/lib/junit/junit-3.8.2-api.zip b/lib/junit/junit-3.8.2-api.zip
deleted file mode 100644
index 6d792fdaa..000000000
Binary files a/lib/junit/junit-3.8.2-api.zip and /dev/null differ
diff --git a/lib/junit/junit-3.8.2.jar b/lib/junit/junit-3.8.2.jar
deleted file mode 100644
index d83587261..000000000
Binary files a/lib/junit/junit-3.8.2.jar and /dev/null differ
diff --git a/lib/junit_4.10/junit-4.10-src.jar b/lib/junit_4.10/junit-4.10-src.jar
new file mode 100644
index 000000000..458b63c7e
Binary files /dev/null and b/lib/junit_4.10/junit-4.10-src.jar differ
diff --git a/lib/junit_4.10/junit-4.10.jar b/lib/junit_4.10/junit-4.10.jar
new file mode 100644
index 000000000..bf5c0b9c6
Binary files /dev/null and b/lib/junit_4.10/junit-4.10.jar differ
diff --git a/lib/junit_4/junit-4.5-api.zip b/lib/junit_4/junit-4.5-api.zip
deleted file mode 100644
index 5748c444d..000000000
Binary files a/lib/junit_4/junit-4.5-api.zip and /dev/null differ
diff --git a/lib/junit_4/junit-4.5-src.jar b/lib/junit_4/junit-4.5-src.jar
deleted file mode 100644
index 18774a573..000000000
Binary files a/lib/junit_4/junit-4.5-src.jar and /dev/null differ
diff --git a/lib/junit_4/junit-4.5.jar b/lib/junit_4/junit-4.5.jar
deleted file mode 100644
index 83f8bc793..000000000
Binary files a/lib/junit_4/junit-4.5.jar and /dev/null differ
diff --git a/lib/mysql.jar b/lib/mysql.jar
deleted file mode 100644
index 0539039f7..000000000
Binary files a/lib/mysql.jar and /dev/null differ
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 6c4ff50b3..0380a6c75 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,13 +1,7 @@
libs.CopyLibs.classpath=\
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.junit.classpath=\
- ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
- ${base}/junit/junit-3.8.2-api.zip
-libs.junit_4.classpath=\
- ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
- ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
- ${base}/junit_4/junit-4.5-src.jar
+libs.junit_4.10.classpath=\
+ ${base}/junit_4.10/junit-4.10.jar
+libs.junit_4.10.src=\
+ ${base}/junit_4.10/junit-4.10-src.jar
project.EssentialsGroupManager=../EssentialsGroupManager
diff --git a/lib/smack-3.2.0.jar b/lib/smack-3.2.1.jar
similarity index 88%
rename from lib/smack-3.2.0.jar
rename to lib/smack-3.2.1.jar
index 22b9780dd..3c09c9f6c 100644
Binary files a/lib/smack-3.2.0.jar and b/lib/smack-3.2.1.jar differ
diff --git a/lib/sqlite.jar b/lib/sqlite.jar
deleted file mode 100644
index 0b47e2cf9..000000000
Binary files a/lib/sqlite.jar and /dev/null differ