eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused imports

Browse Source
This commit is contained in:
LAX1DUDE 2022-07-21 21:26:26 -07:00
parent 685ce5e025
commit b2fe26b357
155 changed files with 1078 additions and 655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -4,48 +4,71 @@
package net.md_5.bungee; package net.md_5.bungee;
import net.md_5.bungee.tab.Custom; import java.io.File;
import net.md_5.bungee.api.tab.CustomTabList; import java.io.IOException;
import net.md_5.bungee.protocol.packet.Packet3Chat; import java.io.PrintStream;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import java.util.Collections;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.MissingResourceException;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import io.netty.channel.ChannelException;
import io.netty.util.concurrent.GenericFutureListener;
import java.net.SocketAddress; import java.net.SocketAddress;
import io.netty.channel.EventLoopGroup; import java.util.ArrayList;
import io.netty.channel.ChannelHandler; import java.util.Collection;
import io.netty.util.AttributeKey; import java.util.Collections;
import net.md_5.bungee.netty.PipelineUtils; import java.util.HashSet;
import io.netty.channel.socket.nio.NioServerSocketChannel; import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.fusesource.jansi.AnsiConsole;
import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import net.md_5.bungee.api.config.ListenerInfo; import io.netty.channel.ChannelHandler;
import java.util.TimerTask; import io.netty.channel.EventLoopGroup;
import net.md_5.bungee.reconnect.SQLReconnectHandler; import io.netty.channel.MultithreadEventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.util.AttributeKey;
import io.netty.util.concurrent.GenericFutureListener;
import jline.UnsupportedTerminal;
import jline.console.ConsoleReader;
import jline.internal.Log;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.command.ConsoleCommandSender; import net.md_5.bungee.api.ProxyServer;
import java.util.concurrent.TimeUnit; import net.md_5.bungee.api.ReconnectHandler;
import java.util.ArrayList; import net.md_5.bungee.api.config.ConfigurationAdapter;
import java.io.IOException; import net.md_5.bungee.api.config.ListenerInfo;
import jline.UnsupportedTerminal; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.log.LoggingOutputStream; import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.logging.Level; import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.log.BungeeLogger; import net.md_5.bungee.api.plugin.Plugin;
import org.fusesource.jansi.AnsiConsole; import net.md_5.bungee.api.plugin.PluginManager;
import jline.internal.Log; import net.md_5.bungee.api.scheduler.TaskScheduler;
import java.io.PrintStream; import net.md_5.bungee.api.tab.CustomTabList;
import com.google.common.io.ByteStreams; import net.md_5.bungee.command.CommandAlert;
import net.md_5.bungee.command.CommandBungee;
import net.md_5.bungee.command.CommandClearRatelimit;
import net.md_5.bungee.command.CommandConfirmCode;
import net.md_5.bungee.command.CommandDomain;
import net.md_5.bungee.command.CommandDomainBlock;
import net.md_5.bungee.command.CommandDomainBlockDomain;
import net.md_5.bungee.command.CommandDomainUnblock;
import net.md_5.bungee.command.CommandEnd;
import net.md_5.bungee.command.CommandFind; import net.md_5.bungee.command.CommandFind;
import net.md_5.bungee.command.CommandGlobalBan; import net.md_5.bungee.command.CommandGlobalBan;
import net.md_5.bungee.command.CommandGlobalBanIP; import net.md_5.bungee.command.CommandGlobalBanIP;
@ -55,54 +78,31 @@ import net.md_5.bungee.command.CommandGlobalBanWildcard;
import net.md_5.bungee.command.CommandGlobalCheckBan; import net.md_5.bungee.command.CommandGlobalCheckBan;
import net.md_5.bungee.command.CommandGlobalListBan; import net.md_5.bungee.command.CommandGlobalListBan;
import net.md_5.bungee.command.CommandGlobalUnban; import net.md_5.bungee.command.CommandGlobalUnban;
import net.md_5.bungee.command.CommandSend;
import net.md_5.bungee.command.CommandPerms;
import net.md_5.bungee.command.CommandBungee;
import net.md_5.bungee.command.CommandClearRatelimit;
import net.md_5.bungee.command.CommandConfirmCode;
import net.md_5.bungee.command.CommandDomain;
import net.md_5.bungee.command.CommandDomainBlock;
import net.md_5.bungee.command.CommandDomainBlockDomain;
import net.md_5.bungee.command.CommandDomainUnblock;
import net.md_5.bungee.command.CommandAlert;
import net.md_5.bungee.command.CommandIP; import net.md_5.bungee.command.CommandIP;
import net.md_5.bungee.command.CommandServer;
import net.md_5.bungee.command.CommandList; import net.md_5.bungee.command.CommandList;
import net.md_5.bungee.command.CommandEnd; import net.md_5.bungee.command.CommandPerms;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.command.CommandReload; import net.md_5.bungee.command.CommandReload;
import net.md_5.bungee.scheduler.BungeeScheduler; import net.md_5.bungee.command.CommandSend;
import net.md_5.bungee.command.CommandServer;
import net.md_5.bungee.command.ConsoleCommandSender;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.YamlConfig; import net.md_5.bungee.config.YamlConfig;
import net.md_5.bungee.eaglercraft.BanList; import net.md_5.bungee.eaglercraft.BanList;
import net.md_5.bungee.eaglercraft.DomainBlacklist; import net.md_5.bungee.eaglercraft.DomainBlacklist;
import net.md_5.bungee.eaglercraft.PluginEaglerSkins; import net.md_5.bungee.eaglercraft.PluginEaglerSkins;
import net.md_5.bungee.eaglercraft.PluginEaglerVoice; import net.md_5.bungee.eaglercraft.PluginEaglerVoice;
import net.md_5.bungee.eaglercraft.WebSocketListener; import net.md_5.bungee.eaglercraft.WebSocketListener;
import net.md_5.bungee.log.BungeeLogger;
import java.util.concurrent.locks.ReentrantReadWriteLock; import net.md_5.bungee.log.LoggingOutputStream;
import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.netty.PipelineUtils;
import java.util.HashSet; import net.md_5.bungee.protocol.packet.DefinedPacket;
import io.netty.channel.nio.NioEventLoopGroup; import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.reconnect.SQLReconnectHandler;
import net.md_5.bungee.scheduler.BungeeScheduler;
import net.md_5.bungee.scheduler.BungeeThreadPool; import net.md_5.bungee.scheduler.BungeeThreadPool;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import net.md_5.bungee.tab.Custom;
import java.util.logging.Logger; import net.md_5.bungee.util.CaseInsensitiveMap;
import jline.console.ConsoleReader;
import net.md_5.bungee.api.scheduler.TaskScheduler;
import java.io.File;
import net.md_5.bungee.api.config.ConfigurationAdapter;
import net.md_5.bungee.api.ReconnectHandler;
import net.md_5.bungee.api.plugin.PluginManager;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.Map;
import io.netty.channel.Channel;
import java.util.Collection;
import java.util.Timer;
import io.netty.channel.MultithreadEventLoopGroup;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.ResourceBundle;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.api.ProxyServer;
public class BungeeCord extends ProxyServer { public class BungeeCord extends ProxyServer {
public volatile boolean isRunning; public volatile boolean isRunning;

46
eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeServerInfo.java
View File

@ -5,36 +5,36 @@
package net.md_5.bungee; package net.md_5.bungee;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.LinkedList; import java.net.InetSocketAddress;
import java.util.ArrayList;
import io.netty.util.concurrent.GenericFutureListener;
import java.net.SocketAddress; import java.net.SocketAddress;
import io.netty.channel.ChannelOption; import java.util.ArrayList;
import io.netty.channel.ChannelHandler; import java.util.Collection;
import net.md_5.bungee.netty.PipelineUtils; import java.util.Collections;
import io.netty.channel.EventLoopGroup; import java.util.LinkedList;
import io.netty.channel.socket.nio.NioSocketChannel; import java.util.Objects;
import java.util.Queue;
import com.google.common.base.Preconditions;
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.util.concurrent.Future;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.connection.PingHandler;
import net.md_5.bungee.netty.HandlerBoss;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import net.md_5.bungee.api.ServerPing; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.concurrent.GenericFutureListener;
import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import java.util.Objects;
import com.google.common.base.Preconditions;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import java.util.Collections; import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import java.util.Queue;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.Collection;
import java.net.InetSocketAddress;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.connection.PingHandler;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
public class BungeeServerInfo implements ServerInfo { public class BungeeServerInfo implements ServerInfo {
private final String name; private final String name;

24
eaglercraftbungee/src/main/java/net/md_5/bungee/EncryptionUtil.java
View File

@ -4,22 +4,24 @@
package net.md_5.bungee; package net.md_5.bungee;
import java.security.NoSuchAlgorithmException;
import java.security.KeyPairGenerator;
import java.security.spec.X509EncodedKeySpec;
import java.security.KeyFactory;
import java.security.PublicKey;
import javax.crypto.spec.IvParameterSpec;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import javax.crypto.spec.SecretKeySpec;
import java.util.Arrays;
import java.security.Key; import java.security.Key;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
import java.util.Arrays;
import java.util.Random;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse; import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest; import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import javax.crypto.SecretKey;
import java.security.KeyPair;
import java.util.Random;
public class EncryptionUtil public class EncryptionUtil
{ {

4
eaglercraftbungee/src/main/java/net/md_5/bungee/PacketConstants.java
View File

@ -4,9 +4,9 @@
package net.md_5.bungee; package net.md_5.bungee;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.Packet9Respawn; import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
public class PacketConstants { public class PacketConstants {
public static final Packet9Respawn DIM1_SWITCH; public static final Packet9Respawn DIM1_SWITCH;

9
eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnection.java
View File

@ -7,12 +7,13 @@ package net.md_5.bungee;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.protocol.packet.DefinedPacket; import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage; import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.api.connection.Connection; import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.api.connection.Server;
public class ServerConnection implements Server { public class ServerConnection implements Server {
private final ChannelWrapper ch; private final ChannelWrapper ch;

76
eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -5,50 +5,48 @@
package net.md_5.bungee; package net.md_5.bungee;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import com.google.common.io.ByteArrayDataInput;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.event.ServerKickEvent;
import java.util.Objects;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.netty.CipherDecoder;
import javax.crypto.Cipher;
import java.security.PublicKey; import java.security.PublicKey;
import io.netty.channel.ChannelHandler; import java.util.Objects;
import net.md_5.bungee.netty.CipherEncoder;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import java.security.Key;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.api.score.Scoreboard;
import java.util.Iterator;
import java.util.Queue; import java.util.Queue;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.api.event.ServerSwitchEvent; import javax.crypto.Cipher;
import net.md_5.bungee.connection.DownstreamBridge;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.forge.Forge1Login;
import net.md_5.bungee.protocol.Forge;
import net.md_5.bungee.netty.PacketDecoder;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.ServerConnectedEvent;
import com.google.common.base.Preconditions;
import net.md_5.bungee.protocol.packet.Packet1Login;
import com.google.common.io.ByteArrayDataOutput;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import com.google.common.io.ByteStreams;
import net.md_5.bungee.api.ChatColor;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import net.md_5.bungee.netty.ChannelWrapper;
import com.google.common.base.Preconditions;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import io.netty.channel.ChannelHandler;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.event.ServerConnectedEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.event.ServerSwitchEvent;
import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.api.score.Scoreboard;
import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.connection.DownstreamBridge;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.CipherDecoder;
import net.md_5.bungee.netty.CipherEncoder;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PacketDecoder;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.Forge;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.forge.Forge1Login;
public class ServerConnector extends PacketHandler public class ServerConnector extends PacketHandler
{ {

69
eaglercraftbungee/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -5,52 +5,49 @@
package net.md_5.bungee; package net.md_5.bungee;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.util.CaseInsensitiveSet;
import java.util.HashSet;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.event.PermissionCheckEvent;
import java.util.Collections;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import java.util.logging.Level;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.internal.PlatformDependent;
import java.net.SocketAddress; import java.net.SocketAddress;
import io.netty.channel.ChannelOption; import java.util.Collection;
import io.netty.channel.ChannelHandler; import java.util.Collections;
import io.netty.channel.EventLoopGroup; import java.util.HashSet;
import io.netty.channel.socket.nio.NioSocketChannel; import java.util.Map;
import io.netty.bootstrap.Bootstrap;
import io.netty.util.concurrent.Future;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PipelineUtils;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
import net.md_5.bungee.api.ChatColor;
import java.util.Objects; import java.util.Objects;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.logging.Level;
import net.md_5.bungee.api.event.ServerConnectEvent;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import java.util.Iterator;
import java.util.Map;
import net.md_5.bungee.api.connection.Connection; import io.netty.bootstrap.Bootstrap;
import net.md_5.bungee.api.score.Scoreboard; import io.netty.channel.Channel;
import net.md_5.bungee.protocol.packet.PacketCCSettings; import io.netty.channel.ChannelFuture;
import net.md_5.bungee.api.tab.TabListHandler; import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.internal.PlatformDependent;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import java.util.Collection; import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PermissionCheckEvent;
import net.md_5.bungee.api.event.ServerConnectEvent;
import net.md_5.bungee.api.score.Scoreboard;
import net.md_5.bungee.api.tab.TabListHandler;
import net.md_5.bungee.connection.InitialHandler; import net.md_5.bungee.connection.InitialHandler;
import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.util.CaseInsensitiveSet;
public final class UserConnection implements ProxiedPlayer { public final class UserConnection implements ProxiedPlayer {
private final ProxyServer bungee; private final ProxyServer bungee;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/Util.java
View File

@ -4,9 +4,8 @@
package net.md_5.bungee; package net.md_5.bungee;
import java.util.Iterator;
import java.util.Collection;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Collection;
public class Util { public class Util {
private static final int DEFAULT_PORT = 25565; private static final int DEFAULT_PORT = 25565;

16
eaglercraftbungee/src/main/java/net/md_5/bungee/api/ProxyServer.java
View File

@ -4,19 +4,21 @@
package net.md_5.bungee.api; package net.md_5.bungee.api;
import net.md_5.bungee.api.tab.CustomTabList;
import net.md_5.bungee.api.scheduler.TaskScheduler;
import java.io.File; import java.io.File;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import net.md_5.bungee.api.config.ConfigurationAdapter;
import net.md_5.bungee.api.plugin.PluginManager;
import net.md_5.bungee.api.config.ServerInfo;
import java.util.Map;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.Collection; import java.util.Collection;
import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
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.PluginManager;
import net.md_5.bungee.api.scheduler.TaskScheduler;
import net.md_5.bungee.api.tab.CustomTabList;
public abstract class ProxyServer { public abstract class ProxyServer {
private static ProxyServer instance; private static ProxyServer instance;

5
eaglercraftbungee/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java
View File

@ -5,14 +5,13 @@
package net.md_5.bungee.api.config; package net.md_5.bungee.api.config;
import java.io.File; import java.io.File;
import java.net.InetSocketAddress;
import java.util.Map;
import net.md_5.bungee.api.ServerIcon; import net.md_5.bungee.api.ServerIcon;
import net.md_5.bungee.api.tab.TabListHandler; import net.md_5.bungee.api.tab.TabListHandler;
import net.md_5.bungee.eaglercraft.WebSocketRateLimiter; import net.md_5.bungee.eaglercraft.WebSocketRateLimiter;
import java.util.Map;
import java.net.InetSocketAddress;
public class ListenerInfo { public class ListenerInfo {
private final String hostString; private final String hostString;
private final InetSocketAddress host; private final InetSocketAddress host;

7
eaglercraftbungee/src/main/java/net/md_5/bungee/api/config/ServerInfo.java
View File

@ -4,12 +4,13 @@
package net.md_5.bungee.api.config; package net.md_5.bungee.api.config;
import net.md_5.bungee.api.ServerPing; import java.net.InetSocketAddress;
import java.util.Collection;
import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.Collection;
import java.net.InetSocketAddress;
public interface ServerInfo { public interface ServerInfo {
String getName(); String getName();

3
eaglercraftbungee/src/main/java/net/md_5/bungee/api/connection/Connection.java
View File

@ -4,9 +4,10 @@
package net.md_5.bungee.api.connection; package net.md_5.bungee.api.connection;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import net.md_5.bungee.protocol.packet.DefinedPacket;
public interface Connection { public interface Connection {
InetSocketAddress getAddress(); InetSocketAddress getAddress();

3
eaglercraftbungee/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java
View File

@ -4,9 +4,10 @@
package net.md_5.bungee.api.connection; package net.md_5.bungee.api.connection;
import net.md_5.bungee.api.config.ListenerInfo;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import net.md_5.bungee.api.config.ListenerInfo;
public interface PendingConnection extends Connection { public interface PendingConnection extends Connection {
String getName(); String getName();

6
eaglercraftbungee/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
View File

@ -4,10 +4,10 @@
package net.md_5.bungee.api.connection; package net.md_5.bungee.api.connection;
import net.md_5.bungee.api.tab.TabListHandler;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.tab.TabListHandler;
public interface ProxiedPlayer extends Connection, CommandSender { public interface ProxiedPlayer extends Connection, CommandSender {
String getDisplayName(); String getDisplayName();

13
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java
View File

@ -5,16 +5,17 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.Map;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Preconditions;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicBoolean;
import net.md_5.bungee.api.plugin.Plugin;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.base.Preconditions;
import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;
import net.md_5.bungee.api.plugin.Plugin;
public class AsyncEvent<T> extends Event { public class AsyncEvent<T> extends Event {
private final Callback<T> done; private final Callback<T> done;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/PermissionCheckEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/PlayerDisconnectEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/PluginMessageEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.util.Arrays; import java.util.Arrays;
import net.md_5.bungee.api.connection.Connection; import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.plugin.Cancellable; import net.md_5.bungee.api.plugin.Cancellable;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/PostLoginEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/ProxyPingEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/ServerConnectedEvent.java
View File

@ -5,8 +5,9 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;
public class ServerConnectedEvent extends Event { public class ServerConnectedEvent extends Event {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/ServerSwitchEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/event/TargetedEvent.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.event; package net.md_5.bungee.api.event;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.api.connection.Connection; import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.plugin.Event; import net.md_5.bungee.api.plugin.Event;

4
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/Command.java
View File

@ -5,9 +5,11 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.util.Arrays; import java.util.Arrays;
import net.md_5.bungee.api.CommandSender;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import net.md_5.bungee.api.CommandSender;
public abstract class Command { public abstract class Command {
private final String name; private final String name;
private final String permission; private final String permission;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
View File

@ -4,9 +4,10 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.io.File;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
public class Plugin { public class Plugin {

5
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/PluginClassloader.java
View File

@ -4,11 +4,10 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.util.HashSet;
import java.util.Iterator;
import java.net.URL; import java.net.URL;
import java.util.Set;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.HashSet;
import java.util.Set;
public class PluginClassloader extends URLClassLoader { public class PluginClassloader extends URLClassLoader {
private static final Set<PluginClassloader> allLoaders; private static final Set<PluginClassloader> allLoaders;

2
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/PluginDescription.java
View File

@ -5,8 +5,8 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.HashSet;
import java.io.File; import java.io.File;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class PluginDescription { public class PluginDescription {

3
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/PluginLogger.java
View File

@ -5,9 +5,10 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
import net.md_5.bungee.api.ProxyServer;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.md_5.bungee.api.ProxyServer;
public class PluginLogger extends Logger { public class PluginLogger extends Logger {
private String pluginName; private String pluginName;

43
eaglercraftbungee/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
View File

@ -5,36 +5,35 @@
package net.md_5.bungee.api.plugin; package net.md_5.bungee.api.plugin;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.lang.reflect.Method;
import java.io.InputStream;
import java.util.jar.JarEntry;
import java.util.zip.ZipEntry;
import java.util.jar.JarFile;
import com.google.common.base.Preconditions;
import java.io.File; import java.io.File;
import java.net.URLClassLoader; import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
import java.util.Stack;
import java.util.Collection;
import java.util.logging.Level;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ChatColor;
import java.util.Arrays;
import net.md_5.bungee.api.CommandSender;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import net.md_5.bungee.event.EventHandler; import java.lang.reflect.Method;
import com.google.common.eventbus.Subscribe; import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import net.md_5.bungee.event.EventBus; import java.util.Stack;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.regex.Pattern;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import com.google.common.base.Preconditions;
import com.google.common.eventbus.Subscribe;
import net.md_5.bungee.BungeeCord;
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.api.ProxyServer;
import net.md_5.bungee.command.ConsoleCommandSender; import net.md_5.bungee.command.ConsoleCommandSender;
import net.md_5.bungee.event.EventBus;
import java.util.regex.Pattern; import net.md_5.bungee.event.EventHandler;
public class PluginManager { public class PluginManager {
private static final Pattern argsSplit; private static final Pattern argsSplit;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/scheduler/ScheduledTask.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.scheduler; package net.md_5.bungee.api.scheduler;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
public interface ScheduledTask { public interface ScheduledTask {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.api.scheduler; package net.md_5.bungee.api.scheduler;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
public interface TaskScheduler { public interface TaskScheduler {

7
eaglercraftbungee/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
View File

@ -4,12 +4,13 @@
package net.md_5.bungee.api.score; package net.md_5.bungee.api.score;
import java.util.HashMap;
import com.google.common.base.Preconditions;
import java.util.Collections;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.google.common.base.Preconditions;
public class Scoreboard { public class Scoreboard {
private String name; private String name;
private Position position; private Position position;

4
eaglercraftbungee/src/main/java/net/md_5/bungee/api/score/Team.java
View File

@ -5,9 +5,9 @@
package net.md_5.bungee.api.score; package net.md_5.bungee.api.score;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.HashSet;
import java.util.Collections;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class Team { public class Team {

2
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandAlert.java
View File

@ -4,9 +4,9 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandAlert extends Command { public class CommandAlert extends Command {

2
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandBungee.java
View File

@ -4,9 +4,9 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandBungee extends Command { public class CommandBungee extends Command {

4
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandFind.java
View File

@ -4,10 +4,10 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandFind extends Command { public class CommandFind extends Command {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandGlobalBanIP.java
View File

@ -1,7 +1,6 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandGlobalListBan.java
View File

@ -1,7 +1,5 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.List;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;

5
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandIP.java
View File

@ -4,13 +4,12 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.ProxyServer;
import java.net.InetAddress; import java.net.InetAddress;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandIP extends Command { public class CommandIP extends Command {

17
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandList.java
View File

@ -4,18 +4,17 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.List;
import java.util.Iterator;
import java.util.Collection;
import net.md_5.bungee.Util;
import java.util.Comparator;
import java.util.Collections;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandList extends Command { public class CommandList extends Command {

9
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandPerms.java
View File

@ -4,13 +4,12 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.Iterator;
import java.util.Set;
import net.md_5.bungee.api.ChatColor;
import java.util.Collection;
import net.md_5.bungee.api.ProxyServer;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandPerms extends Command { public class CommandPerms extends Command {

2
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandReload.java
View File

@ -4,8 +4,8 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;

7
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandSend.java
View File

@ -4,12 +4,11 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.Iterator;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandSend extends Command { public class CommandSend extends Command {

8
eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandServer.java
View File

@ -4,12 +4,12 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Command;
public class CommandServer extends Command { public class CommandServer extends Command {

5
eaglercraftbungee/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java
View File

@ -4,12 +4,13 @@
package net.md_5.bungee.command; package net.md_5.bungee.command;
import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.Collection;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
public class ConsoleCommandSender implements CommandSender { public class ConsoleCommandSender implements CommandSender {
private static final ConsoleCommandSender instance; private static final ConsoleCommandSender instance;

18
eaglercraftbungee/src/main/java/net/md_5/bungee/config/Configuration.java
View File

@ -4,18 +4,20 @@
package net.md_5.bungee.config; package net.md_5.bungee.config;
import java.util.Collection;
import java.util.Map;
import java.util.UUID;
import com.google.common.base.Preconditions;
import gnu.trove.map.TMap;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.AuthServiceInfo; import net.md_5.bungee.api.config.AuthServiceInfo;
import net.md_5.bungee.api.config.ConfigurationAdapter; import net.md_5.bungee.api.config.ConfigurationAdapter;
import java.util.Map; import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.util.CaseInsensitiveMap;
import com.google.common.base.Preconditions;
import net.md_5.bungee.api.ProxyServer;
import java.util.UUID;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.eaglercraft.EaglercraftBungee; import net.md_5.bungee.eaglercraft.EaglercraftBungee;
import gnu.trove.map.TMap; import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.api.config.ListenerInfo;
import java.util.Collection;
public class Configuration { public class Configuration {
private int timeout; private int timeout;

49
eaglercraftbungee/src/main/java/net/md_5/bungee/config/YamlConfig.java
View File

@ -4,43 +4,42 @@
package net.md_5.bungee.config; package net.md_5.bungee.config;
import net.md_5.bungee.tab.ServerUnique; import java.io.File;
import net.md_5.bungee.tab.GlobalPing; import java.io.FileInputStream;
import net.md_5.bungee.tab.Global;
import net.md_5.bungee.api.tab.TabListHandler;
import net.md_5.bungee.eaglercraft.WebSocketRateLimiter;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.ChatColor;
import java.util.HashSet;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.api.config.MOTDCacheConfiguration;
import java.util.Collection;
import java.net.InetSocketAddress;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.config.ServerInfo;
import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer;
import java.io.Writer;
import java.io.FileWriter; import java.io.FileWriter;
import java.util.LinkedHashMap; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collections; import java.io.Writer;
import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.io.IOException; import java.util.HashSet;
import net.md_5.bungee.util.CaseInsensitiveMap; import java.util.LinkedHashMap;
import java.io.FileInputStream;
import org.yaml.snakeyaml.DumperOptions;
import java.io.File;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.logging.Level;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.AuthServiceInfo; import net.md_5.bungee.api.config.AuthServiceInfo;
import net.md_5.bungee.api.config.ConfigurationAdapter; import net.md_5.bungee.api.config.ConfigurationAdapter;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.api.config.MOTDCacheConfiguration;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.tab.TabListHandler;
import net.md_5.bungee.eaglercraft.WebSocketRateLimiter;
import net.md_5.bungee.tab.Global;
import net.md_5.bungee.tab.GlobalPing;
import net.md_5.bungee.tab.ServerUnique;
import net.md_5.bungee.util.CaseInsensitiveMap;
public class YamlConfig implements ConfigurationAdapter { public class YamlConfig implements ConfigurationAdapter {
private Yaml yaml; private Yaml yaml;

48
eaglercraftbungee/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -6,40 +6,38 @@ package net.md_5.bungee.connection;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.net.InetAddress; import java.net.InetAddress;
import net.md_5.bungee.api.event.ServerKickEvent;
import java.util.Objects; import java.util.Objects;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import java.util.Iterator;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import java.util.Collection; import com.google.common.io.ByteArrayDataOutput;
import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.event.PluginMessageEvent;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.api.score.Position;
import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.api.score.Score;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
import net.md_5.bungee.api.score.Scoreboard;
import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EntityMap; import net.md_5.bungee.EntityMap;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.ServerConnection; import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.api.score.Position;
import net.md_5.bungee.api.score.Score;
import net.md_5.bungee.api.score.Scoreboard;
import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFFKick;
public class DownstreamBridge extends PacketHandler { public class DownstreamBridge extends PacketHandler {
private final ProxyServer bungee; private final ProxyServer bungee;

82
eaglercraftbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -5,59 +5,57 @@
package net.md_5.bungee.connection; package net.md_5.bungee.connection;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.ArrayList;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.api.event.PostLoginEvent;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import net.md_5.bungee.netty.CipherEncoder; import java.util.ArrayList;
import net.md_5.bungee.api.event.LoginEvent; import java.util.List;
import net.md_5.bungee.api.Callback;
import javax.crypto.Cipher;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.net.URLEncoder;
import io.netty.channel.ChannelHandler;
import net.md_5.bungee.netty.CipherDecoder;
import net.md_5.bungee.netty.PipelineUtils;
import java.security.Key;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.EncryptionUtil;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.PacketConstants;
import net.md_5.bungee.BungeeCord;
import java.util.logging.Level; import java.util.logging.Level;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.Forge; import javax.crypto.Cipher;
import net.md_5.bungee.netty.PacketDecoder; import javax.crypto.SecretKey;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import io.netty.channel.ChannelHandler;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EncryptionUtil;
import net.md_5.bungee.PacketConstants;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.LoginEvent;
import net.md_5.bungee.api.event.PostLoginEvent;
import net.md_5.bungee.api.event.ProxyPingEvent; import net.md_5.bungee.api.event.ProxyPingEvent;
import net.md_5.bungee.eaglercraft.BanList; import net.md_5.bungee.eaglercraft.BanList;
import net.md_5.bungee.eaglercraft.WebSocketProxy;
import net.md_5.bungee.eaglercraft.BanList.BanCheck; import net.md_5.bungee.eaglercraft.BanList.BanCheck;
import net.md_5.bungee.eaglercraft.BanList.BanState; import net.md_5.bungee.eaglercraft.BanList.BanState;
import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.eaglercraft.WebSocketProxy;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.connection.Connection;
import javax.crypto.SecretKey;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import java.util.List;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.netty.CipherDecoder;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.netty.CipherEncoder;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PacketDecoder;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.Forge;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFFKick;
public class InitialHandler extends PacketHandler implements PendingConnection { public class InitialHandler extends PacketHandler implements PendingConnection {
private final ProxyServer bungee; private final ProxyServer bungee;

7
eaglercraftbungee/src/main/java/net/md_5/bungee/connection/PingHandler.java
View File

@ -5,12 +5,13 @@
package net.md_5.bungee.connection; package net.md_5.bungee.connection;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.Callback; import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.PacketFFKick;
public class PingHandler extends PacketHandler { public class PingHandler extends PacketHandler {
private final ServerInfo target; private final ServerInfo target;

26
eaglercraftbungee/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@ -4,25 +4,21 @@
package net.md_5.bungee.connection; package net.md_5.bungee.connection;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.Connection;
import net.md_5.bungee.api.event.ChatEvent;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.EntityMap;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EntityMap;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.TexturePackInfo;
import net.md_5.bungee.api.event.ChatEvent;
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
public class UpstreamBridge extends PacketHandler { public class UpstreamBridge extends PacketHandler {
private final ProxyServer bungee; private final ProxyServer bungee;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/eaglercraft/PluginEaglerAuth.java
View File

@ -3,7 +3,6 @@ package net.md_5.bungee.eaglercraft;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import net.md_5.bungee.PacketConstants;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.event.PostLoginEvent;
import net.md_5.bungee.api.event.ServerConnectEvent; import net.md_5.bungee.api.event.ServerConnectEvent;
@ -11,8 +10,6 @@ import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.plugin.PluginDescription; import net.md_5.bungee.api.plugin.PluginDescription;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
public class PluginEaglerAuth extends Plugin implements Listener { public class PluginEaglerAuth extends Plugin implements Listener {

21
eaglercraftbungee/src/main/java/net/md_5/bungee/eaglercraft/PluginEaglerVoice.java
View File

@ -1,5 +1,18 @@
package net.md_5.bungee.eaglercraft; package net.md_5.bungee.eaglercraft;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.PlayerDisconnectEvent;
@ -10,14 +23,6 @@ import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.plugin.PluginDescription; import net.md_5.bungee.api.plugin.PluginDescription;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import java.io.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Collection;
import java.util.Collections;
public class PluginEaglerVoice extends Plugin implements Listener { public class PluginEaglerVoice extends Plugin implements Listener {
private final boolean voiceEnabled; private final boolean voiceEnabled;

19
eaglercraftbungee/src/main/java/net/md_5/bungee/event/EventBus.java
View File

@ -4,19 +4,18 @@
package net.md_5.bungee.event; package net.md_5.bungee.event;
import java.util.HashSet;
import java.util.Set;
import java.util.Iterator;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
import java.util.logging.Level;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.HashMap;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.logging.Logger; import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.locks.ReadWriteLock;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Level;
import java.util.logging.Logger;
public class EventBus { public class EventBus {
private final Map<Class<?>, Map<Object, Method[]>> eventToHandler; private final Map<Class<?>, Map<Object, Method[]>> eventToHandler;

5
eaglercraftbungee/src/main/java/net/md_5/bungee/event/EventHandler.java
View File

@ -5,10 +5,9 @@
package net.md_5.bungee.event; package net.md_5.bungee.event;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.Annotation; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD }) @Target({ ElementType.METHOD })

6
eaglercraftbungee/src/main/java/net/md_5/bungee/log/BungeeLogger.java
View File

@ -4,14 +4,14 @@
package net.md_5.bungee.log; package net.md_5.bungee.log;
import java.util.logging.LogRecord;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Handler;
import java.util.logging.FileHandler; import java.util.logging.FileHandler;
import java.util.logging.Formatter; import java.util.logging.Formatter;
import net.md_5.bungee.BungeeCord; import java.util.logging.LogRecord;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.md_5.bungee.BungeeCord;
public class BungeeLogger extends Logger { public class BungeeLogger extends Logger {
private final BungeeCord bungee; private final BungeeCord bungee;
private final ColouredWriter writer; private final ColouredWriter writer;

6
eaglercraftbungee/src/main/java/net/md_5/bungee/log/ColouredWriter.java
View File

@ -5,11 +5,13 @@
package net.md_5.bungee.log; package net.md_5.bungee.log;
import java.io.IOException; import java.io.IOException;
import org.fusesource.jansi.Ansi;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Map;
import org.fusesource.jansi.Ansi;
import jline.console.ConsoleReader; import jline.console.ConsoleReader;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import java.util.Map;
public class ColouredWriter { public class ColouredWriter {
private final Map<ChatColor, String> replacements; private final Map<ChatColor, String> replacements;

5
eaglercraftbungee/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
View File

@ -4,13 +4,12 @@
package net.md_5.bungee.log; package net.md_5.bungee.log;
import java.io.Writer;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.logging.LogRecord;
import java.text.SimpleDateFormat;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.logging.Formatter; import java.util.logging.Formatter;
import java.util.logging.LogRecord;
public class ConciseFormatter extends Formatter { public class ConciseFormatter extends Formatter {
private final DateFormat date; private final DateFormat date;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/log/LogDispatcher.java
View File

@ -4,10 +4,9 @@
package net.md_5.bungee.log; package net.md_5.bungee.log;
import java.util.Iterator; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
import java.util.concurrent.BlockingQueue;
public class LogDispatcher extends Thread { public class LogDispatcher extends Thread {
private final BungeeLogger logger; private final BungeeLogger logger;

2
eaglercraftbungee/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java
View File

@ -5,10 +5,10 @@
package net.md_5.bungee.log; package net.md_5.bungee.log;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.io.ByteArrayOutputStream;
public class LoggingOutputStream extends ByteArrayOutputStream { public class LoggingOutputStream extends ByteArrayOutputStream {
private static final String separator; private static final String separator;

2
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
View File

@ -4,8 +4,8 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
public class ChannelWrapper { public class ChannelWrapper {
private final Channel ch; private final Channel ch;

8
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/CipherBase.java
View File

@ -5,10 +5,12 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import javax.crypto.ShortBufferException;
import io.netty.channel.ChannelHandlerContext;
import io.netty.buffer.ByteBuf;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.ShortBufferException;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
public class CipherBase { public class CipherBase {
private final Cipher cipher; private final Cipher cipher;

5
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/CipherDecoder.java
View File

@ -4,10 +4,11 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import io.netty.channel.MessageList;
import io.netty.channel.ChannelHandlerContext;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.MessageList;
import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.MessageToMessageDecoder;
public class CipherDecoder extends MessageToMessageDecoder<ByteBuf> { public class CipherDecoder extends MessageToMessageDecoder<ByteBuf> {

3
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/CipherEncoder.java
View File

@ -4,9 +4,10 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import io.netty.channel.ChannelHandlerContext;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
public class CipherEncoder extends MessageToByteEncoder<ByteBuf> { public class CipherEncoder extends MessageToByteEncoder<ByteBuf> {

4
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/DefinedPacketEncoder.java
View File

@ -5,10 +5,10 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import net.md_5.bungee.protocol.packet.DefinedPacket; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
import net.md_5.bungee.protocol.packet.DefinedPacket;
@ChannelHandler.Sharable @ChannelHandler.Sharable
public class DefinedPacketEncoder extends MessageToByteEncoder<DefinedPacket> { public class DefinedPacketEncoder extends MessageToByteEncoder<DefinedPacket> {

18
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
View File

@ -5,18 +5,18 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import java.io.IOException; import java.io.IOException;
import io.netty.handler.timeout.ReadTimeoutException;
import java.util.Iterator;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.protocol.packet.AbstractPacketHandler;
import io.netty.channel.MessageList;
import java.util.logging.Level; import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.connection.PingHandler;
import net.md_5.bungee.connection.InitialHandler;
import io.netty.channel.ChannelHandlerContext;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.MessageList;
import io.netty.handler.timeout.ReadTimeoutException;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.connection.InitialHandler;
import net.md_5.bungee.connection.PingHandler;
public class HandlerBoss extends ChannelInboundHandlerAdapter { public class HandlerBoss extends ChannelInboundHandlerAdapter {
private ChannelWrapper channel; private ChannelWrapper channel;

7
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/PacketDecoder.java
View File

@ -5,12 +5,13 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import io.netty.channel.MessageList;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import net.md_5.bungee.protocol.Protocol; import io.netty.channel.MessageList;
import io.netty.handler.codec.ReplayingDecoder; import io.netty.handler.codec.ReplayingDecoder;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.packet.DefinedPacket;
public class PacketDecoder extends ReplayingDecoder<Void> { public class PacketDecoder extends ReplayingDecoder<Void> {
private Protocol protocol; private Protocol protocol;

28
eaglercraftbungee/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
View File

@ -4,24 +4,24 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.Vanilla;
import io.netty.channel.ChannelHandler;
import io.netty.handler.timeout.ReadTimeoutHandler;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.md_5.bungee.BungeeCord;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelOption;
import net.md_5.bungee.ServerConnector;
import net.md_5.bungee.connection.InitialHandler;
import net.md_5.bungee.api.ProxyServer;
import io.netty.handler.codec.bytes.ByteArrayEncoder;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
import net.md_5.bungee.BungeeServerInfo; import io.netty.channel.ChannelOption;
import net.md_5.bungee.UserConnection; import io.netty.handler.codec.bytes.ByteArrayEncoder;
import net.md_5.bungee.api.config.ListenerInfo; import io.netty.handler.timeout.ReadTimeoutHandler;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.BungeeServerInfo;
import net.md_5.bungee.ServerConnector;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.connection.InitialHandler;
import net.md_5.bungee.protocol.Vanilla;
public class PipelineUtils { public class PipelineUtils {
public static final AttributeKey<ListenerInfo> LISTENER; public static final AttributeKey<ListenerInfo> LISTENER;

4
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/Forge.java
View File

@ -4,10 +4,10 @@
package net.md_5.bungee.protocol; package net.md_5.bungee.protocol;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.skip.PacketReader; import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.forge.Forge1Login; import net.md_5.bungee.protocol.packet.forge.Forge1Login;
import net.md_5.bungee.protocol.skip.PacketReader;
public class Forge extends Vanilla { public class Forge extends Vanilla {
private static final Forge instance; private static final Forge instance;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/Protocol.java
View File

@ -5,8 +5,9 @@
package net.md_5.bungee.protocol; package net.md_5.bungee.protocol;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.skip.PacketReader; import net.md_5.bungee.protocol.skip.PacketReader;
public interface Protocol { public interface Protocol {

41
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/Vanilla.java
View File

@ -4,28 +4,29 @@
package net.md_5.bungee.protocol; package net.md_5.bungee.protocol;
import java.lang.reflect.InvocationTargetException;
import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.skip.PacketReader;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.packet.DefinedPacket; import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.Packet0KeepAlive;
import net.md_5.bungee.protocol.packet.Packet1Login;
import net.md_5.bungee.protocol.packet.Packet2Handshake;
import net.md_5.bungee.protocol.packet.Packet3Chat;
import net.md_5.bungee.protocol.packet.Packet9Respawn;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.protocol.packet.PacketCCSettings;
import net.md_5.bungee.protocol.packet.PacketCDClientStatus;
import net.md_5.bungee.protocol.packet.PacketCEScoreboardObjective;
import net.md_5.bungee.protocol.packet.PacketCFScoreboardScore;
import net.md_5.bungee.protocol.packet.PacketD0DisplayScoreboard;
import net.md_5.bungee.protocol.packet.PacketD1Team;
import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
import net.md_5.bungee.protocol.packet.PacketFCEncryptionResponse;
import net.md_5.bungee.protocol.packet.PacketFDEncryptionRequest;
import net.md_5.bungee.protocol.packet.PacketFEPing;
import net.md_5.bungee.protocol.packet.PacketFFKick;
import net.md_5.bungee.protocol.skip.PacketReader;
public class Vanilla implements Protocol { public class Vanilla implements Protocol {
public static final byte PROTOCOL_VERSION = 61; public static final byte PROTOCOL_VERSION = 61;

1
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/DefinedPacket.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.protocol.packet; package net.md_5.bungee.protocol.packet;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
public abstract class DefinedPacket { public abstract class DefinedPacket {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.protocol.packet; package net.md_5.bungee.protocol.packet;
import java.util.Arrays; import java.util.Arrays;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
public class PacketD1Team extends DefinedPacket { public class PacketD1Team extends DefinedPacket {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/PacketFAPluginMessage.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.protocol.packet; package net.md_5.bungee.protocol.packet;
import java.util.Arrays; import java.util.Arrays;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
public class PacketFAPluginMessage extends DefinedPacket { public class PacketFAPluginMessage extends DefinedPacket {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/PacketFCEncryptionResponse.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.protocol.packet; package net.md_5.bungee.protocol.packet;
import java.util.Arrays; import java.util.Arrays;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
public class PacketFCEncryptionResponse extends DefinedPacket { public class PacketFCEncryptionResponse extends DefinedPacket {

1
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/PacketFDEncryptionRequest.java
View File

@ -5,6 +5,7 @@
package net.md_5.bungee.protocol.packet; package net.md_5.bungee.protocol.packet;
import java.util.Arrays; import java.util.Arrays;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
public class PacketFDEncryptionRequest extends DefinedPacket { public class PacketFDEncryptionRequest extends DefinedPacket {

2
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/packet/forge/Forge1Login.java
View File

@ -4,8 +4,8 @@
package net.md_5.bungee.protocol.packet.forge; package net.md_5.bungee.protocol.packet.forge;
import net.md_5.bungee.protocol.packet.AbstractPacketHandler;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.packet.AbstractPacketHandler;
import net.md_5.bungee.protocol.packet.Packet1Login; import net.md_5.bungee.protocol.packet.Packet1Login;
public class Forge1Login extends Packet1Login { public class Forge1Login extends Packet1Login {

5
eaglercraftbungee/src/main/java/net/md_5/bungee/protocol/skip/PacketReader.java
View File

@ -4,10 +4,11 @@
package net.md_5.bungee.protocol.skip; package net.md_5.bungee.protocol.skip;
import java.util.ArrayList;
import java.util.List;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.md_5.bungee.protocol.OpCode; import net.md_5.bungee.protocol.OpCode;
import java.util.List;
import java.util.ArrayList;
import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.Protocol;
public class PacketReader { public class PacketReader {

5
eaglercraftbungee/src/main/java/net/md_5/bungee/reconnect/AbstractReconnectManager.java
View File

@ -4,12 +4,13 @@
package net.md_5.bungee.reconnect; package net.md_5.bungee.reconnect;
import net.md_5.bungee.api.config.ListenerInfo;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.ReconnectHandler;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.ReconnectHandler;
public abstract class AbstractReconnectManager implements ReconnectHandler { public abstract class AbstractReconnectManager implements ReconnectHandler {
@Override @Override

9
eaglercraftbungee/src/main/java/net/md_5/bungee/reconnect/SQLReconnectHandler.java
View File

@ -4,14 +4,15 @@
package net.md_5.bungee.reconnect; package net.md_5.bungee.reconnect;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.logging.Level; import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.sql.SQLException;
import java.sql.PreparedStatement;
import java.sql.DriverManager;
import java.sql.Connection;
public class SQLReconnectHandler extends AbstractReconnectManager { public class SQLReconnectHandler extends AbstractReconnectManager {
private final Connection connection; private final Connection connection;

26
eaglercraftbungee/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java
View File

@ -4,20 +4,22 @@
package net.md_5.bungee.scheduler; package net.md_5.bungee.scheduler;
import com.google.common.base.Preconditions;
import net.md_5.bungee.BungeeCord;
import java.util.concurrent.TimeUnit;
import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
import net.md_5.bungee.api.scheduler.ScheduledTask; import java.util.Set;
import com.google.common.collect.Multimaps; import java.util.concurrent.TimeUnit;
import com.google.common.collect.HashMultimap;
import gnu.trove.TCollections;
import gnu.trove.map.hash.TIntObjectHashMap;
import net.md_5.bungee.api.plugin.Plugin;
import com.google.common.collect.Multimap;
import gnu.trove.map.TIntObjectMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import gnu.trove.TCollections;
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.scheduler.ScheduledTask;
import net.md_5.bungee.api.scheduler.TaskScheduler; import net.md_5.bungee.api.scheduler.TaskScheduler;
public class BungeeScheduler implements TaskScheduler { public class BungeeScheduler implements TaskScheduler {

3
eaglercraftbungee/src/main/java/net/md_5/bungee/scheduler/BungeeTask.java
View File

@ -5,8 +5,9 @@
package net.md_5.bungee.scheduler; package net.md_5.bungee.scheduler;
import java.beans.ConstructorProperties; import java.beans.ConstructorProperties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.scheduler.ScheduledTask; import net.md_5.bungee.api.scheduler.ScheduledTask;

9
eaglercraftbungee/src/main/java/net/md_5/bungee/scheduler/BungeeThreadPool.java
View File

@ -4,11 +4,12 @@
package net.md_5.bungee.scheduler; package net.md_5.bungee.scheduler;
import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import net.md_5.bungee.api.ProxyServer;
public class BungeeThreadPool extends ScheduledThreadPoolExecutor { public class BungeeThreadPool extends ScheduledThreadPoolExecutor {
public BungeeThreadPool(final ThreadFactory threadFactory) { public BungeeThreadPool(final ThreadFactory threadFactory) {

12
eaglercraftbungee/src/main/java/net/md_5/bungee/tab/Custom.java
View File

@ -4,14 +4,16 @@
package net.md_5.bungee.tab; package net.md_5.bungee.tab;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.api.ChatColor;
import com.google.common.base.Preconditions;
import java.util.HashSet;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import com.google.common.base.Preconditions;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.tab.CustomTabList; import net.md_5.bungee.api.tab.CustomTabList;
import net.md_5.bungee.api.tab.TabListAdapter; import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
public class Custom extends TabListAdapter implements CustomTabList { public class Custom extends TabListAdapter implements CustomTabList {
private static final int ROWS = 20; private static final int ROWS = 20;

6
eaglercraftbungee/src/main/java/net/md_5/bungee/tab/Global.java
View File

@ -4,13 +4,11 @@
package net.md_5.bungee.tab; package net.md_5.bungee.tab;
import java.util.Iterator;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.tab.TabListAdapter; import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
public class Global extends TabListAdapter { public class Global extends TabListAdapter {
private boolean sentPing; private boolean sentPing;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/tab/GlobalPing.java
View File

@ -4,9 +4,8 @@
package net.md_5.bungee.tab; package net.md_5.bungee.tab;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
public class GlobalPing extends Global { public class GlobalPing extends Global {
private static final int PING_THRESHOLD = 20; private static final int PING_THRESHOLD = 20;

7
eaglercraftbungee/src/main/java/net/md_5/bungee/tab/ServerUnique.java
View File

@ -4,12 +4,11 @@
package net.md_5.bungee.tab; package net.md_5.bungee.tab;
import java.util.Iterator;
import net.md_5.bungee.protocol.packet.DefinedPacket;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
import java.util.HashSet;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import net.md_5.bungee.api.tab.TabListAdapter; import net.md_5.bungee.api.tab.TabListAdapter;
import net.md_5.bungee.protocol.packet.PacketC9PlayerListItem;
public class ServerUnique extends TabListAdapter { public class ServerUnique extends TabListAdapter {
private final Collection<String> usernames; private final Collection<String> usernames;

3
eaglercraftbungee/src/main/java/net/md_5/bungee/util/CaseInsensitiveMap.java
View File

@ -5,8 +5,9 @@
package net.md_5.bungee.util; package net.md_5.bungee.util;
import java.util.Map; import java.util.Map;
import gnu.trove.strategy.HashingStrategy;
import gnu.trove.map.hash.TCustomHashMap; import gnu.trove.map.hash.TCustomHashMap;
import gnu.trove.strategy.HashingStrategy;
public class CaseInsensitiveMap<V> extends TCustomHashMap<String, V> { public class CaseInsensitiveMap<V> extends TCustomHashMap<String, V> {
public CaseInsensitiveMap() { public CaseInsensitiveMap() {

3
eaglercraftbungee/src/main/java/net/md_5/bungee/util/CaseInsensitiveSet.java
View File

@ -5,8 +5,9 @@
package net.md_5.bungee.util; package net.md_5.bungee.util;
import java.util.Collection; import java.util.Collection;
import gnu.trove.strategy.HashingStrategy;
import gnu.trove.set.hash.TCustomHashSet; import gnu.trove.set.hash.TCustomHashSet;
import gnu.trove.strategy.HashingStrategy;
public class CaseInsensitiveSet extends TCustomHashSet<String> { public class CaseInsensitiveSet extends TCustomHashSet<String> {
public CaseInsensitiveSet() { public CaseInsensitiveSet() {

2
src/main/java/net/lax1dude/eaglercraft/BaseNCodec.java
View File

@ -3,8 +3,6 @@ package net.lax1dude.eaglercraft;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import net.lax1dude.eaglercraft.BaseNCodec.CodecPolicy;
public abstract class BaseNCodec { public abstract class BaseNCodec {
static enum CodecPolicy { static enum CodecPolicy {

60
src/main/java/net/lax1dude/eaglercraft/EarlyLoadScreen.java
View File

@ -1,10 +1,68 @@
package net.lax1dude.eaglercraft; package net.lax1dude.eaglercraft;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.*; import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CLAMP;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_NEAREST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGBA;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MAG_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MIN_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_S;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_T;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TRIANGLES;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglActiveTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindAttributeLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglClear;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglClearColor;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawArrays;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFlush;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGenTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexImage2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexParameteri;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglViewport;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.getCanvasHeight;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.getCanvasWidth;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.updateDisplay;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL; import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ShaderGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.TextureGL;
import net.minecraft.src.GLAllocation; import net.minecraft.src.GLAllocation;
public class EarlyLoadScreen { public class EarlyLoadScreen {

2
src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java
View File

@ -5,8 +5,6 @@ import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerImage;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.Block; import net.minecraft.src.Block;
import net.minecraft.src.GLAllocation; import net.minecraft.src.GLAllocation;

2
src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java
View File

@ -1,11 +1,11 @@
package net.lax1dude.eaglercraft; package net.lax1dude.eaglercraft;
import java.io.InputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.LinkedList; import java.util.LinkedList;

1
src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
View File

@ -8,7 +8,6 @@ import java.nio.IntBuffer;
import java.util.HashMap; import java.util.HashMap;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2; import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2;
import net.lax1dude.eaglercraft.glemu.vector.Matrix4f; import net.lax1dude.eaglercraft.glemu.vector.Matrix4f;
import net.lax1dude.eaglercraft.glemu.vector.Vector3f; import net.lax1dude.eaglercraft.glemu.vector.Vector3f;

87
src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java
View File

@ -1,17 +1,96 @@
package net.lax1dude.eaglercraft.glemu; package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CLAMP;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_ATTACHMENT0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CULL_FACE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH24_STENCIL8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_STENCIL;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_STENCIL_ATTACHMENT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_TEST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_LINEAR;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_NEAREST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE1;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE2;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MAG_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MIN_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_S;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_T;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TRIANGLES;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_INT_24_8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VIEWPORT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglActiveTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindAttributeLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDepthMask;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawArrays;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferTexture2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGenTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetParameter;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexImage2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexParameteri;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform3f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniformMat4fv;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglViewport;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.isWebGL;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.matProjPointer;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.matProjV;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.HashMap; import java.util.HashMap;
import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.FramebufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ShaderGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.TextureGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.UniformGL;
import net.lax1dude.eaglercraft.glemu.vector.Matrix4f; import net.lax1dude.eaglercraft.glemu.vector.Matrix4f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CULL_FACE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.*;
public class EffectPipeline { public class EffectPipeline {
private static String[] pipeline_tmp = null; private static String[] pipeline_tmp = null;

93
src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipelineFXAA.java
View File

@ -1,16 +1,101 @@
package net.lax1dude.eaglercraft.glemu; package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_BACK;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CLAMP;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_ATTACHMENT0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CULL_FACE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_ATTACHMENT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_COMPONENT32F;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_TEST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DRAW_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_LINE_SMOOTH;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_MULTISAMPLE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_NEAREST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_READ_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MAG_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MIN_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_S;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_T;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TRIANGLES;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglActiveTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBlitFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglClear;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateRenderBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDepthMask;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawArrays;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferTexture2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGenTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglRenderbufferStorage;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglRenderbufferStorageMultisample;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexImage2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexParameteri;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglViewport;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.isWebGL;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.FramebufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RenderbufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ShaderGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.TextureGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.UniformGL;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_TEST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.*;
public class EffectPipelineFXAA { public class EffectPipelineFXAA {
private static boolean isUsingFXAA = false; private static boolean isUsingFXAA = false;

41
src/main/java/net/lax1dude/eaglercraft/glemu/FixedFunctionShader.java
View File

@ -1,12 +1,49 @@
package net.lax1dude.eaglercraft.glemu; package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindAttributeLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform3f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform4f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniformMat4fv;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ShaderGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.UniformGL;
import net.lax1dude.eaglercraft.glemu.vector.Matrix4f; import net.lax1dude.eaglercraft.glemu.vector.Matrix4f;
import net.lax1dude.eaglercraft.glemu.vector.Vector2f; import net.lax1dude.eaglercraft.glemu.vector.Vector2f;
import net.lax1dude.eaglercraft.glemu.vector.Vector4f; import net.lax1dude.eaglercraft.glemu.vector.Vector4f;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.*;
public class FixedFunctionShader { public class FixedFunctionShader {
private static final FixedFunctionShader[] instances = new FixedFunctionShader[4096]; //lol private static final FixedFunctionShader[] instances = new FixedFunctionShader[4096]; //lol

21
src/main/java/net/lax1dude/eaglercraft/glemu/HighPolyMesh.java
View File

@ -1,19 +1,32 @@
package net.lax1dude.eaglercraft.glemu; package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ELEMENT_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.minecraft.src.GLAllocation; import net.minecraft.src.GLAllocation;
import static net.lax1dude.eaglercraft.EaglerAdapter.*;
public class HighPolyMesh { public class HighPolyMesh {
final BufferArrayGL vertexArray; final BufferArrayGL vertexArray;

66
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -7,17 +7,77 @@ import java.util.List;
import net.lax1dude.eaglercraft.DefaultSkinRenderer; import net.lax1dude.eaglercraft.DefaultSkinRenderer;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerProfile; import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.GuiScreenEditProfile; import net.lax1dude.eaglercraft.GuiScreenEditProfile;
import net.lax1dude.eaglercraft.GuiScreenLicense; import net.lax1dude.eaglercraft.GuiScreenLicense;
import net.lax1dude.eaglercraft.GuiVoiceOverlay; import net.lax1dude.eaglercraft.GuiVoiceOverlay;
import net.lax1dude.eaglercraft.LocalStorageManager; import net.lax1dude.eaglercraft.LocalStorageManager;
import net.lax1dude.eaglercraft.Voice; import net.lax1dude.eaglercraft.Voice;
import net.minecraft.src.*;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.glemu.EffectPipeline; import net.lax1dude.eaglercraft.glemu.EffectPipeline;
import net.lax1dude.eaglercraft.glemu.FixedFunctionShader; import net.lax1dude.eaglercraft.glemu.FixedFunctionShader;
import net.minecraft.src.AchievementList;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;
import net.minecraft.src.ChatAllowedCharacters;
import net.minecraft.src.ColorizerFoliage;
import net.minecraft.src.ColorizerGrass;
import net.minecraft.src.EffectRenderer;
import net.minecraft.src.EntityBoat;
import net.minecraft.src.EntityClientPlayerMP;
import net.minecraft.src.EntityItemFrame;
import net.minecraft.src.EntityList;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityMinecart;
import net.minecraft.src.EntityPainting;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EntityRenderer;
import net.minecraft.src.EnumChatFormatting;
import net.minecraft.src.EnumMovingObjectType;
import net.minecraft.src.EnumOS;
import net.minecraft.src.EnumOptions;
import net.minecraft.src.FontRenderer;
import net.minecraft.src.GLAllocation;
import net.minecraft.src.GameSettings;
import net.minecraft.src.GuiAchievement;
import net.minecraft.src.GuiChat;
import net.minecraft.src.GuiConnecting;
import net.minecraft.src.GuiGameOver;
import net.minecraft.src.GuiIngame;
import net.minecraft.src.GuiIngameMenu;
import net.minecraft.src.GuiInventory;
import net.minecraft.src.GuiMainMenu;
import net.minecraft.src.GuiMultiplayer;
import net.minecraft.src.GuiScreen;
import net.minecraft.src.GuiSleepMP;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Item;
import net.minecraft.src.ItemRenderer;
import net.minecraft.src.ItemStack;
import net.minecraft.src.KeyBinding;
import net.minecraft.src.LoadingScreenRenderer;
import net.minecraft.src.MathHelper;
import net.minecraft.src.MouseHelper;
import net.minecraft.src.MovementInputFromOptions;
import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.NetClientHandler;
import net.minecraft.src.OpenGlHelper;
import net.minecraft.src.Packet3Chat;
import net.minecraft.src.PlayerControllerMP;
import net.minecraft.src.Profiler;
import net.minecraft.src.ProfilerResult;
import net.minecraft.src.RenderBlocks;
import net.minecraft.src.RenderEngine;
import net.minecraft.src.RenderGlobal;
import net.minecraft.src.RenderManager;
import net.minecraft.src.ScaledResolution;
import net.minecraft.src.ServerData;
import net.minecraft.src.SoundManager;
import net.minecraft.src.StatStringFormatKeyInv;
import net.minecraft.src.StringTranslate;
import net.minecraft.src.TextureManager;
import net.minecraft.src.TexturePackList;
import net.minecraft.src.Timer;
import net.minecraft.src.WorldClient;
public class Minecraft implements Runnable { public class Minecraft implements Runnable {

1
src/main/java/net/minecraft/src/ActiveRenderInfo.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;

Some files were not shown because too many files have changed in this diff Show More