minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-01-17 21:39:26 +01:00
Code Issues 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 6f79a84587
commit 30a5198abb
19 changed files with 377 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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="transfer.built-jar.properties" value="${built-jar.properties}"/>
</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 depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-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="transfer.built-clean.properties" value="${built-clean.properties}"/>
</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 depends="init" name="-do-clean">
<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.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=ce72f3c5
nbproject/build-impl.xml.script.CRC32=79b2da51
nbproject/build-impl.xml.data.CRC32=80b9b3a4
nbproject/build-impl.xml.script.CRC32=3170ac34
nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45

5
BuildAll/nbproject/project.properties
View File

@ -36,7 +36,8 @@ javac.classpath=\
${reference.EssentialsProtect.jar}:\
${reference.EssentialsSpawn.jar}:\
${reference.EssentialsGeoIP.jar}:\
${reference.EssentialsiConomyBridge.jar}
${reference.EssentialsiConomyBridge.jar}:\
${reference.EssentialsiConomyBridge5.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@ -71,6 +72,7 @@ project.EssentialsGeoIP=../EssentialsGeoIP
project.EssentialsGroupBridge=../EssentialsGroupBridge
project.EssentialsGroupManager=../EssentialsGroupManager
project.EssentialsiConomyBridge=../EssentialsiConomyBridge
project.EssentialsiConomyBridge5=../EssentialsiConomyBridge5
project.EssentialsProtect=../EssentialsProtect
project.EssentialsSpawn=../EssentialsSpawn
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
@ -79,6 +81,7 @@ reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.ja
reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar
reference.EssentialsiConomyBridge5.jar=${project.EssentialsiConomyBridge5}/dist/EssentialsiConomyBridge5.jar
reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
run.classpath=\

8
BuildAll/nbproject/project.xml
View File

@ -79,6 +79,14 @@
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
<reference>
<foreign-project>EssentialsiConomyBridge5</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>

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/
description: Provides an essential, core set of commands for Bukkit.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
softdepend: [Permissions]
commands:
afk:
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()
{
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();
EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer());
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);

1
EssentialsChat/src/plugin.yml
View File

@ -6,3 +6,4 @@ version: TeamCity
website: http://www.earth2me.net:8001/
description: Provides chat control features for Essentials. Requires Permissions.
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()
{
PluginManager pm = getServer().getPluginManager();
Plugin ess = pm.getPlugin("Essentials");
if (ess != null)
{
if (!pm.isPluginEnabled(ess))
{
pm.enablePlugin(ess);
}
}
EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder());
pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);

1
EssentialsGeoIP/src/plugin.yml
View File

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

3
EssentialsGroupBridge/src/plugin.yml
View File

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

1
EssentialsProtect/src/plugin.yml
View File

@ -6,3 +6,4 @@ version: TeamCity
website: http://www.earth2me.net:8001/
description: Provides protection for various parts of the world.
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()
{
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();
getServer().getPluginManager().registerEvent(Type.PLAYER_RESPAWN, 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/
description: Provides spawn control commands, utilizing Essentials.
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
depend: [Essentials]
commands:
setspawn:
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
website: http://www.earth2me.net:8001/
description: "Essentials iConomy Bridge version: TeamCity"
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
authors: [Xeology]
depend: [Essentials]

3
EssentialsiConomyBridge5/src/plugin.yml
View File

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