Skip to content

Commit

Permalink
Experimental chat fix(thanks to @xxyy for the original patch) and and…
Browse files Browse the repository at this point in the history 
… organizing of imports
  • Loading branch information
@sillerud
sillerud committed Dec 3, 2013
1 parent 0e8d5af commit 44f0f7a
Show file tree
Hide file tree
Showing 88 changed files with 564 additions and 391 deletions.
1 change: 1 addition & 0 deletions api/src/main/java/net/md_5/bungee/api/ChatColor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public enum ChatColor
* you need to dynamically convert colour codes from your custom format.
*/
public static final char COLOR_CHAR = '\u00A7';
public static final String COLOR_CHAR_STRING = "\u00A7";
/**
* Pattern to remove all colour codes.
*/
Expand Down
1 change: 0 additions & 1 deletion api/src/main/java/net/md_5/bungee/api/NewServerPing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.google.gson.JsonPrimitive;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
* Represents the standard list data returned by opening a server in the
Expand Down
13 changes: 7 additions & 6 deletions api/src/main/java/net/md_5/bungee/api/ProxyServer.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
package net.md_5.bungee.api;

import net.md_5.bungee.api.plugin.PluginManager;
import com.google.common.base.Preconditions;
import java.io.File;
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.Map;
import java.util.logging.Logger;
import lombok.Getter;
import net.md_5.bungee.api.config.ConfigurationAdapter;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.plugin.PluginManager;
import net.md_5.bungee.api.scheduler.TaskScheduler;
import net.md_5.bungee.api.tab.CustomTabList;

import java.io.File;
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.Map;
import java.util.logging.Logger;

public abstract class ProxyServer
{

Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package net.md_5.bungee.api.config;

import java.net.InetSocketAddress;
import java.util.Map;
import lombok.Data;
import net.md_5.bungee.api.tab.TabListHandler;

import java.net.InetSocketAddress;
import java.util.Map;

/**
* Class representing the configuration of a server listener. Used for allowing
* multiple listeners on different ports.
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/net/md_5/bungee/api/config/ServerInfo.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.md_5.bungee.api.config;

import java.net.InetSocketAddress;
import java.util.Collection;
import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.connection.ProxiedPlayer;

import java.net.InetSocketAddress;
import java.util.Collection;

/**
* Class used to represent a server to connect to.
*/
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/net/md_5/bungee/api/connection/Connection.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package net.md_5.bungee.api.connection;

import java.net.InetSocketAddress;
import net.md_5.bungee.protocol.packet.DefinedPacket;

import java.net.InetSocketAddress;

/**
* A proxy connection is defined as a connection directly connected to a socket.
* It should expose information about the remote peer, however not be specific
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package net.md_5.bungee.api.connection;

import java.net.InetSocketAddress;
import net.md_5.bungee.api.config.ListenerInfo;

import java.net.InetSocketAddress;

/**
* Represents a user attempting to log into the proxy.
*/
Expand Down
11 changes: 6 additions & 5 deletions api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package net.md_5.bungee.api.event;

import com.google.common.base.Preconditions;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.plugin.Event;
import net.md_5.bungee.api.plugin.Plugin;

import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

/**
* Represents an event which depends on the result of asynchronous operations.
*
Expand Down
7 changes: 1 addition & 6 deletions api/src/main/java/net/md_5/bungee/api/event/PermissionCheckEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
package net.md_5.bungee.api.event;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import lombok.*;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Event;

Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/net/md_5/bungee/api/event/PlayerHandshakeEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import lombok.EqualsAndHashCode;
import lombok.ToString;
import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.api.plugin.Event;
import net.md_5.bungee.protocol.packet.Packet2Handshake;

/**
* Event called to represent a player first making their presence and username
Expand Down
6 changes: 1 addition & 5 deletions api/src/main/java/net/md_5/bungee/api/event/ServerDisconnectEvent.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package net.md_5.bungee.api.event;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.ToString;
import lombok.*;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Event;
Expand Down
7 changes: 4 additions & 3 deletions api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.md_5.bungee.api.plugin;

import java.io.File;
import java.io.InputStream;
import java.util.logging.Logger;
import lombok.Getter;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ConfigurationAdapter;

import java.io.File;
import java.io.InputStream;
import java.util.logging.Logger;

/**
* Represents any Plugin that may be loaded at runtime to enhance existing
* functionality.
Expand Down
7 changes: 4 additions & 3 deletions api/src/main/java/net/md_5/bungee/api/plugin/PluginDescription.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.md_5.bungee.api.plugin;

import java.io.File;
import java.util.HashSet;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.File;
import java.util.HashSet;
import java.util.Set;

/**
* POJO representing the plugin.yml file.
*/
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/net/md_5/bungee/api/plugin/PluginLogger.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package net.md_5.bungee.api.plugin;

import net.md_5.bungee.api.ProxyServer;

import java.util.logging.LogRecord;
import java.util.logging.Logger;
import net.md_5.bungee.api.ProxyServer;

public class PluginLogger extends Logger
{
Expand Down
24 changes: 9 additions & 15 deletions api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,24 @@
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.eventbus.Subscribe;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.event.EventBus;
import net.md_5.bungee.event.EventHandler;
import org.yaml.snakeyaml.Yaml;

import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Stack;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.regex.Pattern;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.event.EventBus;
import net.md_5.bungee.event.EventHandler;
import org.yaml.snakeyaml.Yaml;

/**
* Class to manage bridging between plugin duties and implementation duties, for
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package net.md_5.bungee.api.scheduler;

import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.plugin.Plugin;

import java.util.concurrent.TimeUnit;

/**
* This interface represents a scheduler which may be used to queue, delay and
* execute tasks in an asynchronous fashion.
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package net.md_5.bungee.api.score;

import com.google.common.base.Preconditions;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@NoArgsConstructor
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/net/md_5/bungee/api/score/Team.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package net.md_5.bungee.api.score;

import lombok.Data;
import lombok.NonNull;

import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import lombok.Data;
import lombok.NonNull;

@Data
public class Team
Expand Down
11 changes: 6 additions & 5 deletions bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package net.md_5.bungee;

import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.concurrent.TimeUnit;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.command.ConsoleCommandSender;

import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.concurrent.TimeUnit;

public class Bootstrap
{

Expand Down
7 changes: 2 additions & 5 deletions config/src/main/java/net/md_5/bungee/config/Configuration.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package net.md_5.bungee.config;

import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;

import java.util.*;

@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
public final class Configuration
{
Expand Down
10 changes: 3 additions & 7 deletions config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package net.md_5.bungee.config;

import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;

import java.io.*;
import java.util.Map;

@NoArgsConstructor(access = AccessLevel.PACKAGE)
public class YamlConfiguration extends ConfigurationProvider
{
Expand Down
5 changes: 3 additions & 2 deletions config/src/test/java/net/md_5/bungee/config/YamlConfigurationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package net.md_5.bungee.config;

import java.util.List;
import java.util.Map;
import org.junit.Assert;
import org.junit.Test;

import java.util.List;
import java.util.Map;

public class YamlConfigurationTest
{

Expand Down
7 changes: 1 addition & 6 deletions event/src/main/java/net/md_5/bungee/event/EventBus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Level;
Expand Down
5 changes: 3 additions & 2 deletions event/src/main/java/net/md_5/bungee/event/EventHandlerMethod.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package net.md_5.bungee.event;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import lombok.AllArgsConstructor;
import lombok.Getter;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

@AllArgsConstructor
public class EventHandlerMethod
{
Expand Down
3 changes: 2 additions & 1 deletion event/src/test/java/net/md_5/bungee/event/EventBusTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package net.md_5.bungee.event;

import java.util.concurrent.CountDownLatch;
import org.junit.Assert;
import org.junit.Test;

import java.util.concurrent.CountDownLatch;

public class EventBusTest
{

Expand Down
Loading

0 comments on commit 44f0f7a

Please sign in to comment.