From bc33ed5824ba396b624a2c7f483e0f58cb16f304 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Mon, 12 Dec 2011 03:05:51 +0100 Subject: [PATCH] Blabla --- src/com/garbagemule/MobArena/MAMessages.java | 2 +- src/com/garbagemule/MobArena/MobArena.java | 2 +- .../garbagemule/MobArena/MobArenaPlugin.java | 28 +++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/com/garbagemule/MobArena/MAMessages.java b/src/com/garbagemule/MobArena/MAMessages.java index 3947bc2..f1883bb 100644 --- a/src/com/garbagemule/MobArena/MAMessages.java +++ b/src/com/garbagemule/MobArena/MAMessages.java @@ -9,7 +9,7 @@ import java.io.InputStreamReader; public class MAMessages { - public static void init(MobArena plugin) { + public static void init(MobArenaPlugin plugin) { // Grab the file File msgFile = new File(MobArena.dir, "anouncements.properties"); diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index ecbb0c0..c4549ed 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -73,7 +73,7 @@ public class MobArena extends JavaPlugin implements MobArenaPlugin // Set up the ArenaMaster and the announcements am = new ArenaMasterStandard(this); am.initialize(); - System.out.println(am.arenas); + MAMessages.init(this); // Register event listeners diff --git a/src/com/garbagemule/MobArena/MobArenaPlugin.java b/src/com/garbagemule/MobArena/MobArenaPlugin.java index 8b7ea94..33ef25e 100644 --- a/src/com/garbagemule/MobArena/MobArenaPlugin.java +++ b/src/com/garbagemule/MobArena/MobArenaPlugin.java @@ -2,11 +2,35 @@ package com.garbagemule.MobArena; import org.bukkit.command.CommandSender; +import com.garbagemule.MobArena.util.Config; + public interface MobArenaPlugin { + /** + * Get the Config object associated with this MobArena instance. + * @return the Config object used by MobArena + */ + public Config getMAConfig(); + + /** + * Get the ArenaMaster used by this instance of MobArena. + * @return the ArenaMaster object + */ public ArenaMaster getArenaMaster(); - public void tell(CommandSender sender, String msg); + /** + * Send a message to a player or the console. + * The message is prefixed with [MobArena]. + * @param recipient the player or console to send the message to + * @param msg the message to send + */ + public void tell(CommandSender recipient, String msg); - public void tell(CommandSender sender, Msg msg); + /** + * Send a predefined announcement to a player or the console. + * Convenience method: the above method is called with Msg.toString() + * @param recipient the player or console to send the message to + * @param msg the message to send + */ + public void tell(CommandSender recipient, Msg msg); }