From 556c990eff34a4848fe92afa43f27cd81505f05a Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 17 Dec 2011 17:40:47 +0000 Subject: EssentialsChat cleaning. --- .../essentials/chat/EssentialsLocalChatEvent.java | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java new file mode 100644 index 000000000..5d024a852 --- /dev/null +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -0,0 +1,100 @@ +package com.earth2me.essentials.chat; + +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.player.PlayerChatEvent; + + +public class EssentialsLocalChatEvent extends Event implements Cancellable +{ + private Player player; + private String message; + private String format = "<%1$s> %2$s"; + private long radius; + private boolean cancelled = false; + private PlayerChatEvent parentEvent = null; + + public EssentialsLocalChatEvent(final Player player, final String message, final String format, final long radius) + { + super("LocalChat"); + this.player = player; + this.message = message; + this.format = format; + this.radius = radius; + } + + public EssentialsLocalChatEvent(final PlayerChatEvent event, final long radius) + { + this(event.getPlayer(), event.getMessage(), event.getFormat(), radius); + this.parentEvent = event; + } + + @Override + public boolean isCancelled() + { + return cancelled; + } + + @Override + public void setCancelled(final boolean cancel) + { + this.cancelled = cancel; + } + + public String getMessage() + { + return message; + } + + public void setMessage(final String message) + { + this.message = message; + } + + public void setPlayer(final Player player) + { + this.player = player; + } + + public Player getPlayer() + { + return player; + } + + public String getFormat() + { + return format; + } + + public void setFormat(final String format) + { + // Oh for a better way to do this! + try + { + String.format(format, player, message); + } + catch (RuntimeException ex) + { + ex.fillInStackTrace(); + throw ex; + } + + this.format = format; + } + + public long getRadius() + { + return radius; + } + + public void setRadius(final long radius) + { + this.radius = radius; + } + + public PlayerChatEvent getParentEvent() + { + return parentEvent; + } +} \ No newline at end of file -- cgit v1.2.3 From b05e4079d9c0270e6f09e1d43229c1189fbce92c Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 17 Dec 2011 17:57:57 +0000 Subject: Essentials now throws a custom event, to handle local chat. (Changing event name, so we don't get custom event conflicts.) --- .../src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java index 5d024a852..fe605b89a 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -17,7 +17,7 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable public EssentialsLocalChatEvent(final Player player, final String message, final String format, final long radius) { - super("LocalChat"); + super("EssLocalChat"); this.player = player; this.message = message; this.format = format; -- cgit v1.2.3 From bdc695c85b97a31694c75716f33566b171a9559f Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 24 Jan 2012 22:08:20 +0000 Subject: First sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented. --- .../essentials/chat/EssentialsLocalChatEvent.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java index fe605b89a..04f70aff7 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.chat; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerChatEvent; @@ -14,6 +15,7 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable private long radius; private boolean cancelled = false; private PlayerChatEvent parentEvent = null; + private static final HandlerList handlers = new HandlerList(); public EssentialsLocalChatEvent(final Player player, final String message, final String format, final long radius) { @@ -24,9 +26,9 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable this.radius = radius; } - public EssentialsLocalChatEvent(final PlayerChatEvent event, final long radius) + public EssentialsLocalChatEvent(final PlayerChatEvent event, final ChatStore chatStore) { - this(event.getPlayer(), event.getMessage(), event.getFormat(), radius); + this(event.getPlayer(), event.getMessage(), event.getFormat(), chatStore.getRadius()); this.parentEvent = event; } @@ -97,4 +99,14 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable { return parentEvent; } + + public HandlerList getHandlers() + { + return handlers; + } + + public static HandlerList getHandlerList() + { + return handlers; + } } \ No newline at end of file -- cgit v1.2.3 From df061749ddf3df4ee4b80315cfdea546e661ac28 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 24 Jan 2012 23:20:00 +0000 Subject: 2nd sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented. --- .../src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java index 4973841a3..e566de685 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -25,9 +25,9 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable this.radius = radius; } - public EssentialsLocalChatEvent(final PlayerChatEvent event, final ChatStore chatStore) + public EssentialsLocalChatEvent(final PlayerChatEvent event, final long radius) { - this(event.getPlayer(), event.getMessage(), event.getFormat(), chatStore.getRadius()); + this(event.getPlayer(), event.getMessage(), event.getFormat(), radius); this.parentEvent = event; } -- cgit v1.2.3 From e960078e1ad87cd509e5b13eafd02e3ecb7136a7 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 14:05:50 +0000 Subject: Random Cleanup --- .../src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java | 1 - 1 file changed, 1 deletion(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java index e566de685..2eae385a9 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -80,7 +80,6 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable ex.fillInStackTrace(); throw ex; } - this.format = format; } -- cgit v1.2.3