From 0155bcedb7f00726d0b2f14e612a5342322a8278 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Dec 2011 16:31:08 +0100 Subject: Updated all modules to new api, some settings are still missing --- .../src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index c4cd7c727..7eb62238a 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -1,8 +1,10 @@ package com.earth2me.essentials.spawn; +import com.earth2me.essentials.EssentialsCommandHandler; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.IEssentialsModule; +import com.earth2me.essentials.api.ICommandHandler; +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.api.IEssentialsModule; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; @@ -19,6 +21,7 @@ public class EssentialsSpawn extends JavaPlugin private static final Logger LOGGER = Bukkit.getLogger(); private transient IEssentials ess; private transient SpawnStorage spawns; + private transient ICommandHandler commandHandler; public void onEnable() { @@ -36,6 +39,8 @@ public class EssentialsSpawn extends JavaPlugin spawns = new SpawnStorage(ess); ess.addReloadListener(spawns); + + commandHandler = new EssentialsCommandHandler(EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns, ess); final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess, spawns); pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, ess.getSettings().getRespawnPriority(), this); @@ -52,6 +57,6 @@ public class EssentialsSpawn extends JavaPlugin public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args) { - return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns); + return commandHandler.handleCommand(sender, command, commandLabel, args); } } -- cgit v1.2.3 From 41e0e64a5f83cb036e90d3c299f65b69caa9dd63 Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 2 Jan 2012 22:38:47 +0100 Subject: EssentialsSpawn and EssentialsChat should build now again --- EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index 7eb62238a..7376ed8c4 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -5,6 +5,7 @@ import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.ICommandHandler; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IEssentialsModule; +import com.earth2me.essentials.api.ISettings; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; @@ -43,7 +44,7 @@ public class EssentialsSpawn extends JavaPlugin commandHandler = new EssentialsCommandHandler(EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns, ess); final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess, spawns); - pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, ess.getSettings().getRespawnPriority(), this); + pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, spawns.getRespawnPriority(), this); pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this); LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team")); -- cgit v1.2.3 From 3513d72a7b883701ba8d90c523da5af8bf4d0d07 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jan 2012 21:41:05 +0000 Subject: Fixing Warp, Spawnmob signs Fix Imports --- EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index 7376ed8c4..8cbd57c31 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -4,8 +4,6 @@ import com.earth2me.essentials.EssentialsCommandHandler; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.ICommandHandler; import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IEssentialsModule; -import com.earth2me.essentials.api.ISettings; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; -- cgit v1.2.3 From c689b55c4ddff6483799e021334e403db745562e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 25 Jan 2012 23:53:31 +0000 Subject: Fix depends --- EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index 1d73ee4c1..666bb1614 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -29,7 +29,7 @@ public class EssentialsSpawn extends JavaPlugin public void onEnable() { final PluginManager pluginManager = getServer().getPluginManager(); - ess = (IEssentials)pluginManager.getPlugin("Essentials"); + ess = (IEssentials)pluginManager.getPlugin("Essentials3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); -- cgit v1.2.3 From 3ed78c052086d7838fd8e5dd2b3acf50acb3ecf1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Mar 2012 13:19:10 +1100 Subject: Move EssentialsSpawn into the main plugin, going to make it a component in the near future --- .../earth2me/essentials/spawn/EssentialsSpawn.java | 77 ---------------------- 1 file changed, 77 deletions(-) delete mode 100644 EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java (limited to 'EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java') diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java deleted file mode 100644 index 666bb1614..000000000 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.earth2me.essentials.spawn; - -import com.earth2me.essentials.EssentialsCommandHandler; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ICommandHandler; -import com.earth2me.essentials.api.IEssentials; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.event.Event; -import org.bukkit.event.EventException; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.plugin.EventExecutor; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; - - -public class EssentialsSpawn extends JavaPlugin -{ - private static final Logger LOGGER = Bukkit.getLogger(); - private transient IEssentials ess; - private transient SpawnStorage spawns; - private transient ICommandHandler commandHandler; - - public void onEnable() - { - final PluginManager pluginManager = getServer().getPluginManager(); - ess = (IEssentials)pluginManager.getPlugin("Essentials3"); - if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) - { - LOGGER.log(Level.WARNING, _("versionMismatchAll")); - } - if (!ess.isEnabled()) - { - this.setEnabled(false); - return; - } - - spawns = new SpawnStorage(ess); - ess.addReloadListener(spawns); - - commandHandler = new EssentialsCommandHandler(EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns, ess); - - final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess, spawns); - pluginManager.registerEvent(PlayerRespawnEvent.class, playerListener, spawns.getRespawnPriority(), new EventExecutor() - { - @Override - public void execute(final Listener ll, final Event event) throws EventException - { - ((EssentialsSpawnPlayerListener)ll).onPlayerRespawn((PlayerRespawnEvent)event); - } - }, this); - pluginManager.registerEvent(PlayerJoinEvent.class, playerListener, spawns.getRespawnPriority(), new EventExecutor() - { - @Override - public void execute(final Listener ll, final Event event) throws EventException - { - ((EssentialsSpawnPlayerListener)ll).onPlayerJoin((PlayerJoinEvent)event); - } - }, this); - } - - public void onDisable() - { - } - - @Override - public boolean onCommand(final CommandSender sender, final Command command, - final String commandLabel, final String[] args) - { - return commandHandler.handleCommand(sender, command, commandLabel, args); - } -} -- cgit v1.2.3