PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Apply and enforce import ordering rules

Browse Source
This commit is contained in:
md_5
2019-04-23 15:22:02 +10:00
parent 3f01748d75
commit af10f82d14
75 changed files with 157 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@@ -166,7 +166,6 @@ public class BungeeCord extends ProxyServer
private ConnectionThrottle connectionThrottle;
private final ModuleManager moduleManager = new ModuleManager();
{
// TODO: Proper fallback when we interface the manager
registerChannel( "BungeeCord" );

2
proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
View File

@@ -18,8 +18,8 @@ import net.md_5.bungee.jni.NativeCode;
import net.md_5.bungee.jni.cipher.BungeeCipher;
import net.md_5.bungee.jni.cipher.JavaCipher;
import net.md_5.bungee.jni.cipher.NativeCipher;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
/**
* Class containing all encryption related methods for the proxy.

4
proxy/src/main/java/net/md_5/bungee/Metrics.java
View File

@@ -17,7 +17,7 @@ public class Metrics extends TimerTask
/**
* The current revision number
*/
private final static int REVISION = 5;
private static final int REVISION = 5;
/**
* The base url of the metrics domain
*/
@@ -29,7 +29,7 @@ public class Metrics extends TimerTask
/**
* Interval of time to ping (in minutes)
*/
final static int PING_INTERVAL = 10;
static final int PING_INTERVAL = 10;
boolean firstPost = true;
@Override

2
proxy/src/main/java/net/md_5/bungee/PlayerSkinConfiguration.java
View File

@@ -6,7 +6,7 @@ import net.md_5.bungee.api.SkinConfiguration;
/*
* Bitmask, displayed Skin Parts flags:
*
*
* Bit 0 (0x01 ): Cape enabled
* Bit 1 (0x02): Jacket enabled
* Bit 2 (0x04): Left Sleeve enabled

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

@@ -3,8 +3,8 @@ package net.md_5.bungee.command;
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.plugin.Command;
import net.md_5.bungee.api.event.ProxyReloadEvent;
import net.md_5.bungee.api.plugin.Command;
public class CommandReload extends Command
{

9
proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java
View File

@@ -2,7 +2,9 @@ package net.md_5.bungee.command;
import java.util.Collection;
import java.util.Collections;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.chat.BaseComponent;
@@ -10,16 +12,13 @@ import net.md_5.bungee.api.chat.BaseComponent;
/**
* Command sender representing the proxy console.
*/
public class ConsoleCommandSender implements CommandSender
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ConsoleCommandSender implements CommandSender
{
@Getter
private static final ConsoleCommandSender instance = new ConsoleCommandSender();
private ConsoleCommandSender()
{
}
@Override
public void sendMessage(String message)
{

16
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@@ -10,30 +10,28 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.context.StringRange;
import com.mojang.brigadier.suggestion.Suggestion;
import com.mojang.brigadier.suggestion.SuggestionProvider;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.tree.LiteralCommandNode;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
import java.io.DataInput;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.event.ServerDisconnectEvent;
import net.md_5.bungee.api.event.TabCompleteResponseEvent;
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.chat.TextComponent;
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.ServerConnectEvent;
import net.md_5.bungee.api.event.ServerDisconnectEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.event.TabCompleteResponseEvent;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.api.score.Position;
@@ -49,13 +47,13 @@ import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.BossBar;
import net.md_5.bungee.protocol.packet.Commands;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.PlayerListItem;
import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.protocol.packet.Respawn;
import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
import net.md_5.bungee.protocol.packet.ScoreboardObjective;
import net.md_5.bungee.protocol.packet.ScoreboardScore;
import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.SetCompression;
import net.md_5.bungee.protocol.packet.TabCompleteResponse;
import net.md_5.bungee.tab.TabList;

1
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -9,7 +9,6 @@ import java.net.URLEncoder;
import java.security.MessageDigest;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import javax.crypto.SecretKey;
import lombok.Getter;

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_10 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_11 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_12 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_12_1 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_13 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_14 extends EntityMap
{

2
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_8.java
View File

@@ -2,12 +2,12 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_8 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_9 extends EntityMap
{

3
proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java
View File

@@ -2,14 +2,13 @@ package net.md_5.bungee.entitymap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.ProtocolConstants;
import java.util.UUID;
class EntityMap_1_9_4 extends EntityMap
{

9
proxy/src/main/java/net/md_5/bungee/forge/ForgeLogger.java
View File

@@ -1,10 +1,13 @@
package net.md_5.bungee.forge;
import java.util.logging.Level;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.protocol.packet.PluginMessage;
class ForgeLogger
@NoArgsConstructor(access = AccessLevel.PRIVATE)
final class ForgeLogger
{
static void logServer(LogDirection direction, String stateName, PluginMessage message)
@@ -64,8 +67,4 @@ class ForgeLogger
SENDING,
RECEIVED
}
private ForgeLogger()
{ // Don't allow instantiations
}
}

1
proxy/src/main/java/net/md_5/bungee/forge/ForgeServerHandler.java
View File

@@ -1,7 +1,6 @@
package net.md_5.bungee.forge;
import java.util.ArrayDeque;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

4
proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
View File

@@ -29,9 +29,9 @@ import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.BungeeServerInfo;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.Util;
import net.md_5.bungee.connection.InitialHandler;
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.KickStringWriter;
import net.md_5.bungee.protocol.LegacyDecoder;
import net.md_5.bungee.protocol.MinecraftDecoder;
@@ -128,7 +128,7 @@ public class PipelineUtils
private static final int HIGH_MARK = Integer.getInteger( "net.md_5.bungee.high_mark", 2 << 20 ); // 2 mb
private static final WriteBufferWaterMark MARK = new WriteBufferWaterMark( LOW_MARK, HIGH_MARK );
public final static class Base extends ChannelInitializer<Channel>
public static final class Base extends ChannelInitializer<Channel>
{
@Override