2.1 prerelease, part 2 of 3

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk2.1@1015 e251c2fe-e539-e718-e476-b85c1f46cddb

EssentialsChat/build.xml

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

EssentialsChat/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=7c7f517b
+build.xml.script.CRC32=71afd555
+build.xml.stylesheet.CRC32=28e38971@1.38.2.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=7c7f517b
+nbproject/build-impl.xml.script.CRC32=c24d2db5
+nbproject/build-impl.xml.stylesheet.CRC32=19debb58@1.42.1.45

EssentialsChat/nbproject/private/private.properties

@@ -0,0 +1 @@
+user.properties.file=C:\\Users\\Paul\\.netbeans\\7.0beta2\\build.properties

EssentialsChat/nbproject/project.properties

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

EssentialsChat/nbproject/project.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>EssentialsChat</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>..\lib\nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>Essentials</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>

EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java

@@ -0,0 +1,43 @@
+package com.earth2me.essentials.chat;
+
+import com.earth2me.essentials.Essentials;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.Event.Type;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+
+
+public class EssentialsChat extends JavaPlugin
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	public EssentialsChat()
+	{
+		super();
+	}
+
+	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);
+		pm.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this);
+		if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) {
+			logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version.");
+		}
+		logger.info("Loaded " + this.getDescription().getName() + " build " + this.getDescription().getVersion() + " by " + Essentials.AUTHORS);
+	}
+
+	public void onDisable()
+	{
+	}
+}

EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java

@@ -0,0 +1,61 @@
+package com.earth2me.essentials.chat;
+
+import com.earth2me.essentials.Essentials;
+import org.bukkit.Server;
+import org.bukkit.event.player.*;
+
+
+public class EssentialsChatPlayerListener extends PlayerListener
+{
+	private final Server server;
+
+	public EssentialsChatPlayerListener(Server server)
+	{
+		this.server = server;
+	}
+
+	@Override
+	@SuppressWarnings("CallToThreadDumpStack")
+	public void onPlayerJoin(PlayerJoinEvent event)
+	{
+		try
+		{
+			Essentials.loadClasses();
+			EssentialsChatWorker.onPlayerJoin(server, event);
+		}
+		catch (Throwable ex)
+		{
+			ex.printStackTrace();
+		}
+	}
+
+	@Override
+	@SuppressWarnings("CallToThreadDumpStack")
+	public void onPlayerRespawn(PlayerRespawnEvent event)
+	{
+		try
+		{
+			Essentials.loadClasses();
+			EssentialsChatWorker.onPlayerRespawn(server, event);
+		}
+		catch (Throwable ex)
+		{
+			ex.printStackTrace();
+		}
+	}
+
+	@Override
+	@SuppressWarnings("CallToThreadDumpStack")
+	public void onPlayerChat(PlayerChatEvent event)
+	{
+		try
+		{
+			Essentials.loadClasses();
+			EssentialsChatWorker.onPlayerChat(server, event);
+		}
+		catch (Throwable ex)
+		{
+			ex.printStackTrace();
+		}
+	}
+}

EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java

@@ -0,0 +1,122 @@
+package com.earth2me.essentials.chat;
+
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
+import com.nijikokun.bukkit.Permissions.Permissions;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+
+public class EssentialsChatWorker
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	public static void onPlayerRespawn(Server server, PlayerRespawnEvent event)
+	{
+		User user = User.get(event.getPlayer());
+		updateDisplayName(user);
+	}
+
+	public static void onPlayerJoin(Server server, PlayerEvent event)
+	{
+		User user = User.get(event.getPlayer());
+		updateDisplayName(user);
+	}
+
+	private static void updateDisplayName(User user)
+	{
+		try
+		{
+			String group = user.getGroup();
+			try
+			{
+				String prefix = Permissions.Security.getGroupPrefix(user.getWorld().getName(), group).replace('&', '§').replace("{WORLDNAME}", user.getWorld().getName());
+				String suffix = Permissions.Security.getGroupSuffix(user.getWorld().getName(), group).replace('&', '§').replace("{WORLDNAME}", user.getWorld().getName());
+				user.setDisplayName(prefix + user.getNick() + suffix + (suffix.endsWith("§f") ? "" : "§f"));
+			}
+			catch (Throwable ex)
+			{
+				logger.warning("Missing a prefix or suffix for " + group);
+			}
+		}
+		catch (Throwable ex)
+		{
+			logger.warning("Missing Permissions/GroupManager; chat prefixes/suffixes will be disabled.");
+		}
+	}
+
+	public static void onPlayerChat(Server server, PlayerChatEvent event)
+	{
+		User user = User.get(event.getPlayer());
+		updateDisplayName(user);
+
+		if (user.isAuthorized("essentials.chat.color"))
+			event.setMessage(event.getMessage().replaceAll("&([0-9a-f])", "§$1"));
+		
+		event.setFormat(Essentials.getSettings().getChatFormat(user.getGroup())
+				.replace('&', '§')
+				.replace("§§", "&")
+				.replace("{DISPLAYNAME}", "%1$s")
+				.replace("{GROUP}", user.getGroup())
+				.replace("{MESSAGE}", "%2$s")
+		        .replace("{WORLDNAME}", user.getWorld().getName()));
+		
+		int radius = Essentials.getSettings().getChatRadius();
+		if (radius < 1) return;
+
+		if (event.getMessage().startsWith("!") && event.getMessage().length() > 1)
+		{
+			if (user.isAuthorized("essentials.chat.shout"))
+			{
+				event.setMessage(event.getMessage().substring(1));
+				event.setFormat("§7[Shout]§f " + event.getFormat());
+				return;
+			}
+			user.sendMessage("§cYou are not authorized to shout.");
+			event.setCancelled(true);
+			return;
+		}
+		
+		if (event.getMessage().startsWith("?") && event.getMessage().length() > 1)
+		{
+			if (user.isAuthorized("essentials.chat.question"))
+			{
+				event.setMessage(event.getMessage().substring(1));
+				event.setFormat("§7[Question]§f " + event.getFormat());
+				return;
+			}
+			user.sendMessage("§cYou are not authorized to use question.");
+			event.setCancelled(true);
+			return;
+		}
+
+		event.setCancelled(true);
+		logger.info("Local: <" + user.getName() + "> " + event.getMessage());
+
+		Location loc = user.getLocation();
+		int x = loc.getBlockX();
+		int y = loc.getBlockY();
+		int z = loc.getBlockZ();
+
+		for (Player p : server.getOnlinePlayers())
+		{
+			User u = User.get(p);
+			if (u != user && !u.isAuthorized("essentials.chat.spy"))
+			{
+				Location l = u.getLocation();
+				int dx = Math.abs(x - l.getBlockX());
+				int dy = Math.abs(y - l.getBlockY());
+				int dz = Math.abs(z - l.getBlockZ());
+				int delta = dx + dy + dz;
+				if (delta > radius) continue;
+			}
+
+			u.sendMessage(String.format(event.getFormat(), user.getDisplayName(), event.getMessage()));
+		}
+	}
+}

EssentialsChat/src/plugin.yml

@@ -0,0 +1,8 @@
+# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
+name: EssentialsChat
+main: com.earth2me.essentials.chat.EssentialsChat
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
+version: TeamCity
+website: http://www.earth2me.net:8001/
+description: Provides chat control features for Essentials.  Requires Permissions.
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo]