TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 03:38:28 +00:00
Code Issues Projects Releases Wiki Activity

Finally get rid of all dependency problems.

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1423 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-11 22:30:34 +00:00
parent 299be08d13
commit f315bbe43c
19 changed files with 377 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
BuildAll/build.xml
View file

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

14
BuildAll/nbproject/build-impl.xml
View file

@ -657,6 +657,13 @@ is divided into following sections:
<param name="call.target" value="jar"/> <param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/> <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
</antcall> </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
<param location="${project.EssentialsiConomyBridge5}" name="call.subproject"/>
<param location="${project.EssentialsiConomyBridge5}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
</antcall>
</target> </target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build"> <target depends="init" name="-check-automatic-build">
@ -1149,6 +1156,13 @@ is divided into following sections:
<param name="call.target" value="clean"/> <param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/> <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
</antcall> </antcall>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
<param location="${project.EssentialsiConomyBridge5}" name="call.subproject"/>
<param location="${project.EssentialsiConomyBridge5}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
</antcall>
</target> </target>
<target depends="init" name="-do-clean"> <target depends="init" name="-do-clean">
<delete dir="${build.dir}"/> <delete dir="${build.dir}"/>

6
BuildAll/nbproject/genfiles.properties
View file

@ -1,8 +1,8 @@
build.xml.data.CRC32=ce72f3c5 build.xml.data.CRC32=80b9b3a4
build.xml.script.CRC32=7a797370 build.xml.script.CRC32=7a797370
build.xml.stylesheet.CRC32=28e38971@1.43.1.45 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. # 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. # 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=ce72f3c5 nbproject/build-impl.xml.data.CRC32=80b9b3a4
nbproject/build-impl.xml.script.CRC32=79b2da51 nbproject/build-impl.xml.script.CRC32=3170ac34
nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45

195
BuildAll/nbproject/project.properties
View file

@ -1,96 +1,99 @@
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=BuildAll application.title=BuildAll
application.vendor=Paul application.vendor=Paul
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
build.dir=build build.dir=build
build.generated.dir=${build.dir}/generated build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here: # Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport: # Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket #debug.transport=dt_socket
debug.classpath=\ debug.classpath=\
${run.classpath} ${run.classpath}
debug.test.classpath=\ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/BuildAll.jar dist.jar=${dist.dir}/BuildAll.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
includes=** includes=**
jar.compress=false jar.compress=false
javac.classpath=\ javac.classpath=\
${reference.Essentials.jar}:\ ${reference.Essentials.jar}:\
${reference.EssentialsChat.jar}:\ ${reference.EssentialsChat.jar}:\
${reference.EssentialsGroupBridge.jar}:\ ${reference.EssentialsGroupBridge.jar}:\
${reference.EssentialsGroupManager.jar}:\ ${reference.EssentialsGroupManager.jar}:\
${reference.EssentialsProtect.jar}:\ ${reference.EssentialsProtect.jar}:\
${reference.EssentialsSpawn.jar}:\ ${reference.EssentialsSpawn.jar}:\
${reference.EssentialsGeoIP.jar}:\ ${reference.EssentialsGeoIP.jar}:\
${reference.EssentialsiConomyBridge.jar} ${reference.EssentialsiConomyBridge.jar}:\
# Space-separated list of extra javac options ${reference.EssentialsiConomyBridge5.jar}
javac.compilerargs= # Space-separated list of extra javac options
javac.deprecation=false javac.compilerargs=
javac.processorpath=\ javac.deprecation=false
${javac.classpath} javac.processorpath=\
javac.source=1.5 ${javac.classpath}
javac.target=1.5 javac.source=1.5
javac.test.classpath=\ javac.target=1.5
${javac.classpath}:\ javac.test.classpath=\
${build.classes.dir}:\ ${javac.classpath}:\
${libs.junit.classpath}:\ ${build.classes.dir}:\
${libs.junit_4.classpath} ${libs.junit.classpath}:\
javac.test.processorpath=\ ${libs.junit_4.classpath}
${javac.test.classpath} javac.test.processorpath=\
javadoc.additionalparam= ${javac.test.classpath}
javadoc.author=false javadoc.additionalparam=
javadoc.encoding=${source.encoding} javadoc.author=false
javadoc.noindex=false javadoc.encoding=${source.encoding}
javadoc.nonavbar=false javadoc.noindex=false
javadoc.notree=false javadoc.nonavbar=false
javadoc.private=false javadoc.notree=false
javadoc.splitindex=true javadoc.private=false
javadoc.use=true javadoc.splitindex=true
javadoc.version=false javadoc.use=true
javadoc.windowtitle= javadoc.version=false
meta.inf.dir=${src.dir}/META-INF javadoc.windowtitle=
mkdist.disabled=false meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform mkdist.disabled=false
project.Essentials=../Essentials platform.active=default_platform
project.EssentialsChat=../EssentialsChat project.Essentials=../Essentials
project.EssentialsGeoIP=../EssentialsGeoIP project.EssentialsChat=../EssentialsChat
project.EssentialsGroupBridge=../EssentialsGroupBridge project.EssentialsGeoIP=../EssentialsGeoIP
project.EssentialsGroupManager=../EssentialsGroupManager project.EssentialsGroupBridge=../EssentialsGroupBridge
project.EssentialsiConomyBridge=../EssentialsiConomyBridge project.EssentialsGroupManager=../EssentialsGroupManager
project.EssentialsProtect=../EssentialsProtect project.EssentialsiConomyBridge=../EssentialsiConomyBridge
project.EssentialsSpawn=../EssentialsSpawn project.EssentialsiConomyBridge5=../EssentialsiConomyBridge5
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar project.EssentialsProtect=../EssentialsProtect
reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar project.EssentialsSpawn=../EssentialsSpawn
reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar
run.classpath=\ reference.EssentialsiConomyBridge5.jar=${project.EssentialsiConomyBridge5}/dist/EssentialsiConomyBridge5.jar
${javac.classpath}:\ reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
${build.classes.dir} reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
# Space-separated list of JVM arguments used when running the project run.classpath=\
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value ${javac.classpath}:\
# or test-sys-prop.name=value to set system properties for unit tests): ${build.classes.dir}
run.jvmargs= # Space-separated list of JVM arguments used when running the project
run.test.classpath=\ # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
${javac.test.classpath}:\ # or test-sys-prop.name=value to set system properties for unit tests):
${build.test.classes.dir} run.jvmargs=
source.encoding=UTF-8 run.test.classpath=\
src.dir=src ${javac.test.classpath}:\
test.src.dir=test ${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test

176
BuildAll/nbproject/project.xml
View file

@ -1,84 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>BuildAll</name> <name>BuildAll</name>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>
<test-roots> <test-roots>
<root id="test.src.dir"/> <root id="test.src.dir"/>
</test-roots> </test-roots>
</data> </data>
<libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1"> <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
<definitions>..\lib\nblibraries.properties</definitions> <definitions>..\lib\nblibraries.properties</definitions>
</libraries> </libraries>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference> <reference>
<foreign-project>Essentials</foreign-project> <foreign-project>Essentials</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsChat</foreign-project> <foreign-project>EssentialsChat</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsGeoIP</foreign-project> <foreign-project>EssentialsGeoIP</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsGroupBridge</foreign-project> <foreign-project>EssentialsGroupBridge</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsGroupManager</foreign-project> <foreign-project>EssentialsGroupManager</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsProtect</foreign-project> <foreign-project>EssentialsProtect</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsSpawn</foreign-project> <foreign-project>EssentialsSpawn</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>EssentialsiConomyBridge</foreign-project> <foreign-project>EssentialsiConomyBridge</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
</references> <reference>
</configuration> <foreign-project>EssentialsiConomyBridge5</foreign-project>
</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>

8
Essentials/src/com/earth2me/essentials/IConfExternal.java
View file

@ -1,8 +0,0 @@
package com.earth2me.essentials;
public abstract class IConfExternal implements IConf
{
public abstract void reloadConfig();
}

1
Essentials/src/plugin.yml
View file

@ -6,6 +6,7 @@ version: TeamCity
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: Provides an essential, core set of commands for Bukkit. description: Provides an essential, core set of commands for Bukkit.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
softdepend: [Permissions]
commands: commands:
afk: afk:
description: Marks you as away-from-keyboard. description: Marks you as away-from-keyboard.

6
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
View file

@ -22,12 +22,6 @@ public class EssentialsChat extends JavaPlugin
public void onEnable() public void onEnable()
{ {
Plugin p = this.getServer().getPluginManager().getPlugin("Essentials");
if (p != null) {
if (!this.getServer().getPluginManager().isPluginEnabled(p)) {
this.getServer().getPluginManager().enablePlugin(p);
}
}
PluginManager pm = getServer().getPluginManager(); PluginManager pm = getServer().getPluginManager();
EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer()); EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer());
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this); pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);

3
EssentialsChat/src/plugin.yml
View file

@ -5,4 +5,5 @@ main: com.earth2me.essentials.chat.EssentialsChat
version: TeamCity version: TeamCity
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: Provides chat control features for Essentials. Requires Permissions. description: Provides chat control features for Essentials. Requires Permissions.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
depend: [Essentials]

8
EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
View file

@ -28,14 +28,6 @@ public class EssentialsGeoIP extends JavaPlugin
public void onEnable() public void onEnable()
{ {
PluginManager pm = getServer().getPluginManager(); PluginManager pm = getServer().getPluginManager();
Plugin ess = pm.getPlugin("Essentials");
if (ess != null)
{
if (!pm.isPluginEnabled(ess))
{
pm.enablePlugin(ess);
}
}
EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder()); EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder());
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this); pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);

3
EssentialsGeoIP/src/plugin.yml
View file

@ -5,4 +5,5 @@ main: com.earth2me.essentials.geoip.EssentialsGeoIP
version: TeamCity version: TeamCity
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: Shows the country or city of a user on login and /whois. description: Shows the country or city of a user on login and /whois.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
depend: [Essentials]

3
EssentialsGroupBridge/src/plugin.yml
View file

@ -1,3 +1,4 @@
name: Permissions name: Permissions
version: 2.5.1 version: 2.7.2
main: com.nijikokun.bukkit.Permissions.Permissions main: com.nijikokun.bukkit.Permissions.Permissions
depend: [GroupManager]

15
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.Essentials; import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.IConfExternal; import com.earth2me.essentials.IConf;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util; import com.earth2me.essentials.Util;
import java.util.ArrayList; import java.util.ArrayList;
@ -16,7 +16,7 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
public class EssentialsProtect extends JavaPlugin public class EssentialsProtect extends JavaPlugin implements IConf
{ {
private EssentialsProtectBlockListener blockListener = null; private EssentialsProtectBlockListener blockListener = null;
private EssentialsProtectPlayerListener playerListener = null; private EssentialsProtectPlayerListener playerListener = null;
@ -43,9 +43,6 @@ public class EssentialsProtect extends JavaPlugin
public void onEnable() public void onEnable()
{ {
PluginManager pm = this.getServer().getPluginManager(); PluginManager pm = this.getServer().getPluginManager();
Essentials ess = (Essentials)pm.getPlugin("Essentials");
if (!ess.isEnabled())
pm.enablePlugin(ess);
playerListener = new EssentialsProtectPlayerListener(this); playerListener = new EssentialsProtectPlayerListener(this);
blockListener = new EssentialsProtectBlockListener(this); blockListener = new EssentialsProtectBlockListener(this);
@ -77,13 +74,7 @@ public class EssentialsProtect extends JavaPlugin
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Highest, this); pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Highest, this);
reloadConfig(); reloadConfig();
Essentials.getStatic().addReloadListener(new IConfExternal() { Essentials.getStatic().addReloadListener(this);
public void reloadConfig()
{
EssentialsProtect.this.reloadConfig();
}
});
if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) { if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) {
logger.log(Level.WARNING, Util.i18n("versionMismatchAll")); logger.log(Level.WARNING, Util.i18n("versionMismatchAll"));
} }

3
EssentialsProtect/src/plugin.yml
View file

@ -5,4 +5,5 @@ main: com.earth2me.essentials.protect.EssentialsProtect
version: TeamCity version: TeamCity
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: Provides protection for various parts of the world. description: Provides protection for various parts of the world.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
depend: [Essentials]

6
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
View file

@ -22,12 +22,6 @@ public class EssentialsSpawn extends JavaPlugin
public void onEnable() public void onEnable()
{ {
Plugin p = this.getServer().getPluginManager().getPlugin("Essentials");
if (p != null) {
if (!this.getServer().getPluginManager().isPluginEnabled(p)) {
this.getServer().getPluginManager().enablePlugin(p);
}
}
EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(); EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener();
getServer().getPluginManager().registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this); getServer().getPluginManager().registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
getServer().getPluginManager().registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this); getServer().getPluginManager().registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);

1
EssentialsSpawn/src/plugin.yml
View file

@ -6,6 +6,7 @@ version: TeamCity
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: Provides spawn control commands, utilizing Essentials. description: Provides spawn control commands, utilizing Essentials.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
depend: [Essentials]
commands: commands:
setspawn: setspawn:
description: Set the spawnpoint to your current position. description: Set the spawnpoint to your current position.

3
EssentialsiConomyBridge/src/plugin.yml
View file

@ -3,4 +3,5 @@ version: 4.65
main: com.nijiko.coelho.iConomy.iConomy main: com.nijiko.coelho.iConomy.iConomy
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: "Essentials iConomy Bridge version: TeamCity" description: "Essentials iConomy Bridge version: TeamCity"
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Xeology]
depend: [Essentials]

156
EssentialsiConomyBridge5/nbproject/project.properties
View file

@ -1,78 +1,78 @@
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsiConomyBridge5 application.title=EssentialsiConomyBridge5
application.vendor=schlex application.vendor=schlex
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
build.dir=build build.dir=build
build.generated.dir=${build.dir}/generated build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here: # Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport: # Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket #debug.transport=dt_socket
debug.classpath=\ debug.classpath=\
${run.classpath} ${run.classpath}
debug.test.classpath=\ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/EssentialsiConomyBridge5.jar dist.jar=${dist.dir}/EssentialsiConomyBridge5.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
file.reference.Essentials.jar=..\\Essentials\\dist\\Essentials.jar file.reference.Essentials.jar=..\\Essentials\\dist\\Essentials.jar
file.reference.Essentials.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar file.reference.Essentials.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
includes=** includes=**
jar.compress=false jar.compress=false
javac.classpath=\ javac.classpath=\
${reference.Essentials.jar}:\ ${reference.Essentials.jar}:\
${file.reference.bukkit-0.0.1-SNAPSHOT.jar} ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false
javac.processorpath=\ javac.processorpath=\
${javac.classpath} ${javac.classpath}
javac.source=1.6 javac.source=1.6
javac.target=1.6 javac.target=1.6
javac.test.classpath=\ javac.test.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
javac.test.processorpath=\ javac.test.processorpath=\
${javac.test.classpath} ${javac.test.classpath}
javadoc.additionalparam= javadoc.additionalparam=
javadoc.author=false javadoc.author=false
javadoc.encoding=${source.encoding} javadoc.encoding=${source.encoding}
javadoc.noindex=false javadoc.noindex=false
javadoc.nonavbar=false javadoc.nonavbar=false
javadoc.notree=false javadoc.notree=false
javadoc.private=false javadoc.private=false
javadoc.splitindex=true javadoc.splitindex=true
javadoc.use=true javadoc.use=true
javadoc.version=false javadoc.version=false
javadoc.windowtitle= javadoc.windowtitle=
main.class= main.class=
manifest.file=manifest.mf manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false mkdist.disabled=false
platform.active=default_platform platform.active=default_platform
project.Essentials=../Essentials project.Essentials=../Essentials
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
# Space-separated list of JVM arguments used when running the project # 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 # (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): # or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs= run.jvmargs=
run.test.classpath=\ run.test.classpath=\
${javac.test.classpath}:\ ${javac.test.classpath}:\
${build.test.classes.dir} ${build.test.classes.dir}
source.encoding=UTF-8 source.encoding=UTF-8
src.dir=src src.dir=src
test.src.dir=test test.src.dir=test

3
EssentialsiConomyBridge5/src/plugin.yml
View file

@ -3,4 +3,5 @@ version: 5.0
main: com.iConomy.iConomy main: com.iConomy.iConomy
website: http://www.earth2me.net:8001/ website: http://www.earth2me.net:8001/
description: "Essentials iConomy Bridge version: TeamCity" description: "Essentials iConomy Bridge version: TeamCity"
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] authors: [Xeology]
depend: [Essentials]