Updating to latest

This commit is contained in:
Khyperia 2011-11-30 20:30:21 -05:00
commit dde8595c51
50 changed files with 18 additions and 2099 deletions

View file

@ -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=

View file

@ -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=

View file

@ -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.

View file

@ -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=

View file

@ -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=

View file

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="EssentialsPermissionsCommands" default="default" basedir=".">
<description>Builds, tests, and runs the project EssentialsPermissionsCommands.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="EssentialsPermissionsCommands-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>

View file

@ -1,3 +0,0 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

File diff suppressed because it is too large Load diff

View file

@ -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

View file

@ -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

View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>EssentialsPermissionsCommands</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
<libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
<definitions>../lib/nblibraries.properties</definitions>
</libraries>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference>
<foreign-project>Essentials</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
</references>
</configuration>
</project>

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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);
}
}

View file

@ -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()
{
}
}

View file

@ -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: /<command> <player> <group>
permission: groupmanager.manuadd
manudel:
description: Remove any user specific configuration. Make him default group.
usage: /<command> <player>
permission: groupmanager.manudel
manuaddsub:
description: Add a group to a player's subgroup list.
usage: /<command> <player> <group>
permission: groupmanager.manuaddsub
manudelsub:
description: Remove a group to a player's subgroup list.
usage: /<command> <player> <group>
permission: groupmanager.manudelsub
mangadd:
description: Add group to the system.
usage: /<command> <group>
permission: groupmanager.mangadd
mangdel:
description: Removes group from the system(all it's users become default)
usage: /<command> <group>
permission: groupmanager.mangdel
manuaddp:
description: Add permission diretly to the player.
usage: /<command> <player> <permission>
permission: groupmanager.manuaddp
manudelp:
description: Removes permission diretly from the player.
usage: /<command> <player> <permission>
permission: groupmanager.manudelp
manulistp:
description: List all permissions from a player.
usage: /<command> <player>
permission: groupmanager.manulistp
manucheckp:
description: Verify if user has a permission, and where it comes from.
usage: /<command> <player> <permission>
permission: groupmanager.manucheckp
mangaddp:
description: Add permission to a group.
usage: /<command> <group> <permission>
permission: groupmanager.mangaddp
mangdelp:
description: Removes permission from a group.
usage: /<command> <group> <permission>
permission: groupmanager.mangdelp
manglistp:
description: Lists all permissions from a group.
usage: /<command> <group>
permission: groupmanager.manglistp
mangcheckp:
description: Check if group has a permission, and where it comes from.
usage: /<command> <group> <permission>
permission: groupmanager.mangcheckp
mangaddi:
description: Add a group to another group inheritance list.
usage: /<command> <group1> <group2>
permission: groupmanager.mangaddi
mangdeli:
description: Remove a group from another group inheritance list.
usage: /<command> <group1> <group2>
permission: groupmanager.mangdeli
manuaddv:
description: Add, or replaces, a variable to a user (like prefix or suffix).
usage: /<command> <user> <variable> <value>
permission: groupmanager.manuaddv
manudelv:
description: Remove a variable from a user.
usage: /<command> <user> <variable>
permission: groupmanager.manudelv
manulistv:
description: List variables a user has (like prefix or suffix).
usage: /<command> <user>
permission: groupmanager.manulistv
manucheckv:
description: Verify a value of a variable of user, and where it comes from.
usage: /<command> <user> <variable>
permission: groupmanager.manucheckv
mangaddv:
description: Add, or replaces, a variable to a group (like prefix or suffix).
usage: /<command> <group> <variable> <value>
permission: groupmanager.mangaddv
mangdelv:
description: Remove a variable from a group.
usage: /<command> <group> <variable>
permission: groupmanager.mangdelv
manglistv:
description: List variables a group has (like prefix or suffix).
usage: /<command> <group>
permission: groupmanager.manglistv
mangcheckv:
description: Verify a value of a variable of group, and where it comes from.
usage: /<command> <group> <variable>
permission: groupmanager.mangcheckv
manwhois:
description: Tell the group that user belongs.
usage: /<command> <player>
permission: groupmanager.manwhois
tempadd:
description: Creates a temporary permission copy for that user.
usage: /<command> <player>
permission: groupmanager.tempadd
tempdel:
description: Remove the temporary permission copy for player.
usage: /<command> <player>
permission: groupmanager.tempdel
templist:
description: List players in overload-permissions mode made by /tempadd.
usage: /<command>
permission: groupmanager.templist
tempdelall:
description: Remove all overrides made by command /tempadd.
usage: /<command>
permission: groupmanager.tempdelall
mansave:
description: Save all permissions on file.
usage: /<command>
permission: groupmanager.mansave
manload:
description: Reload current world and config.yml. Or load given world.
usage: /<command> [world]
permission: groupmanager.manload
listgroups:
description: List the groups available.
usage: /<command>
permission: groupmanager.listgroups
manpromote:
description: Promote a player in the same heritage line to a higher rank.
usage: /<command> <player> <group>
permission: groupmanager.manpromote
mandemote:
description: Demote a player in the same heritage line to a lower rank.
usage: /<command> <player> <group>
permission: groupmanager.mandemote
mantogglevalidate:
description: Toggle on/off the validating if player is online.
usage: /<command>
permission: groupmanager.mantogglevalidate
mantogglesave:
description: Toggle on/ff the autosave.
usage: /<command>
permission: groupmanager.mantogglesave
manworld:
description: Prints the selected world name
usage: /<command>
permission: groupmanager.manworld
manselect:
description: Select a world to work with next commands.
usage: /<command> <world>
permission: groupmanager.manselect
manclear:
description: Clear world selection. Next commands will work on your world.
usage: /<command>
permission: groupmanager.manclear

View file

@ -1,2 +1 @@
Manifest-Version: 1.0
Class-Path: ../lib/mysql.jar ../lib/sqlite.jar

View file

@ -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=

View file

@ -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=

View file

@ -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=

View file

@ -74,7 +74,7 @@
<target name="-post-jar">
<jar jarfile="${dist.dir}/EssentialsXMPP.jar">
<zipfileset src="${dist.jar}" excludes="META-INF/*" />
<zipfileset src="../lib/smack-3.2.0.jar" excludes="META-INF/*" />
<zipfileset src="../lib/smack-3.2.1.jar" excludes="META-INF/*" />
<manifest>
<attribute name="Classpath" value="Essentials.jar"/>
</manifest>

View file

@ -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=

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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

Binary file not shown.