From 224c18348ae18ddd6c3e3de0f98a9d3f039e67d8 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 1 May 2011 21:07:30 +0000 Subject: This is a big refactoring of the user class and more. Many commands have been cleaned. File changes: - all user data has been moved from users.yml to userdata folder - all files in userdata folder are lower case Both changes should be done automatically. Class changes: - Moved all user data functions to UserData class - Moved all user teleport functions to Teleport class - Moved the user list to Essentials class - Less static functions for better testing - EssentialsCommand now has ess Property (Essentials class) - New NotEnoughArgumentsException, that will show command description and syntax New commands: - /seen, shows the last login or logout - /tempban, temporarily ban someone - /tjail and mute, temporarily option added Other changes: - ban reason is saved - don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission - time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../com/earth2me/essentials/chat/EssentialsChatWorker.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'EssentialsChat/src') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java index 3c74fd8f0..1ba7f8274 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java @@ -19,13 +19,13 @@ public class EssentialsChatWorker public static void onPlayerRespawn(Server server, PlayerRespawnEvent event) { - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); updateDisplayName(user); } public static void onPlayerJoin(Server server, PlayerEvent event) { - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(event.getPlayer()); updateDisplayName(user); } @@ -55,15 +55,15 @@ public class EssentialsChatWorker public static void onPlayerChat(Server server, PlayerChatEvent event) { if (event.isCancelled()) return; - User user = User.get(event.getPlayer()); + User user = Essentials.getStatic().getUser(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())); + event.setFormat(Essentials.getStatic().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(); + int radius = Essentials.getStatic().getSettings().getChatRadius(); if (radius < 1) return; if (event.getMessage().startsWith("!") && event.getMessage().length() > 1) @@ -103,7 +103,7 @@ public class EssentialsChatWorker for (Player p : server.getOnlinePlayers()) { - User u = User.get(p); + User u = Essentials.getStatic().getUser(p); if (u != user && !u.isAuthorized("essentials.chat.spy")) { Location l = u.getLocation(); -- cgit v1.2.3