From dc2da29c161ee68575e652e8249ee2e4b1f08caf Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:15:41 +1000 Subject: [PATCH] Code format. --- .../java/net/md_5/bungee/api/CommandSender.java | 4 +++- .../net/md_5/bungee/api/chat/TextComponent.java | 14 +++++++++----- .../md_5/bungee/chat/BaseComponentSerializer.java | 8 +++++--- .../md_5/bungee/chat/TextComponentSerializer.java | 2 +- .../net/md_5/bungee/config/YamlConfiguration.java | 10 +++++----- .../md_5/bungee/module/cmd/alert/PluginAlert.java | 10 ++++++---- .../md_5/bungee/module/cmd/send/CommandSend.java | 10 ++++++++-- .../bungee/module/cmd/server/CommandServer.java | 2 +- .../java/net/md_5/bungee/protocol/Protocol.java | 4 ---- proxy/src/main/java/net/md_5/bungee/EntityMap.java | 2 +- .../java/net/md_5/bungee/PlayerInfoSerializer.java | 2 +- .../java/net/md_5/bungee/command/CommandEnd.java | 3 ++- .../net/md_5/bungee/command/CommandReload.java | 2 +- .../net/md_5/bungee/connection/InitialHandler.java | 2 +- .../net/md_5/bungee/connection/LoginResult.java | 3 ++- 15 files changed, 46 insertions(+), 32 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/CommandSender.java b/api/src/main/java/net/md_5/bungee/api/CommandSender.java index f549aa9f..a35b3fd0 100644 --- a/api/src/main/java/net/md_5/bungee/api/CommandSender.java +++ b/api/src/main/java/net/md_5/bungee/api/CommandSender.java @@ -85,7 +85,9 @@ public interface CommandSender /** * Get all Permissions which this CommandSender has - * @return a unmodifiable Collection of Strings which represent their permissions + * + * @return a unmodifiable Collection of Strings which represent their + * permissions */ public Collection getPermissions(); } diff --git a/api/src/main/java/net/md_5/bungee/api/chat/TextComponent.java b/api/src/main/java/net/md_5/bungee/api/chat/TextComponent.java index 393394ee..01e1a3e9 100644 --- a/api/src/main/java/net/md_5/bungee/api/chat/TextComponent.java +++ b/api/src/main/java/net/md_5/bungee/api/chat/TextComponent.java @@ -47,7 +47,10 @@ public class TextComponent extends BaseComponent c += 32; } ChatColor format = ChatColor.getByChar( c ); - if ( format == null ) continue; + if ( format == null ) + { + continue; + } if ( builder.length() > 0 ) { TextComponent old = component; @@ -145,14 +148,15 @@ public class TextComponent extends BaseComponent } /** - * Creates a TextComponent with blank text and the extras set - * to the passed array + * Creates a TextComponent with blank text and the extras set to the passed + * array * * @param extras the extras to set */ - public TextComponent(BaseComponent ...extras) { + public TextComponent(BaseComponent... extras) + { setText( "" ); - setExtra( Arrays.asList(extras) ); + setExtra( Arrays.asList( extras ) ); } @Override diff --git a/api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java index d4afbd42..bf17391f 100644 --- a/api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java +++ b/api/src/main/java/net/md_5/bungee/chat/BaseComponentSerializer.java @@ -75,9 +75,10 @@ public class BaseComponentSerializer protected void serialize(JsonObject object, BaseComponent component, JsonSerializationContext context) { boolean first = false; - if ( ComponentSerializer.serializedComponents.get() == null ) { + if ( ComponentSerializer.serializedComponents.get() == null ) + { first = true; - ComponentSerializer.serializedComponents.set( new HashSet( ) ); + ComponentSerializer.serializedComponents.set( new HashSet() ); } try { @@ -131,7 +132,8 @@ public class BaseComponentSerializer } finally { ComponentSerializer.serializedComponents.get().remove( component ); - if (first) { + if ( first ) + { ComponentSerializer.serializedComponents.set( null ); } } diff --git a/api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java b/api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java index 2a08a005..0092aaca 100644 --- a/api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java +++ b/api/src/main/java/net/md_5/bungee/chat/TextComponentSerializer.java @@ -31,7 +31,7 @@ public class TextComponentSerializer extends BaseComponentSerializer implements public JsonElement serialize(TextComponent src, Type typeOfSrc, JsonSerializationContext context) { List extra = src.getExtra(); - if ( !src.hasFormatting() && (extra == null || extra.size() == 0) ) + if ( !src.hasFormatting() && ( extra == null || extra.size() == 0 ) ) { return new JsonPrimitive( src.getText() ); } diff --git a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java index 67bc17a2..9689d7be 100644 --- a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java +++ b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java @@ -56,20 +56,20 @@ public class YamlConfiguration extends ConfigurationProvider @SuppressWarnings("unchecked") public Configuration load(Reader reader) { - Map map = yaml.get().loadAs( reader, LinkedHashMap.class ); - if( map == null ) + Map map = yaml.get().loadAs( reader, LinkedHashMap.class ); + if ( map == null ) { map = new LinkedHashMap<>(); } - return new Configuration( map , null ); + return new Configuration( map, null ); } @Override @SuppressWarnings("unchecked") public Configuration load(String string) { - Map map = yaml.get().loadAs( string, LinkedHashMap.class ); - if( map == null ) + Map map = yaml.get().loadAs( string, LinkedHashMap.class ); + if ( map == null ) { map = new LinkedHashMap<>(); } diff --git a/module/cmd-alert/src/main/java/net/md_5/bungee/module/cmd/alert/PluginAlert.java b/module/cmd-alert/src/main/java/net/md_5/bungee/module/cmd/alert/PluginAlert.java index d743c544..b6f84865 100644 --- a/module/cmd-alert/src/main/java/net/md_5/bungee/module/cmd/alert/PluginAlert.java +++ b/module/cmd-alert/src/main/java/net/md_5/bungee/module/cmd/alert/PluginAlert.java @@ -2,11 +2,13 @@ package net.md_5.bungee.module.cmd.alert; import net.md_5.bungee.api.plugin.Plugin; -public class PluginAlert extends Plugin { +public class PluginAlert extends Plugin +{ @Override - public void onEnable() { - getProxy().getPluginManager().registerCommand(this, new CommandAlert()); - getProxy().getPluginManager().registerCommand(this, new CommandAlertRaw()); + public void onEnable() + { + getProxy().getPluginManager().registerCommand( this, new CommandAlert() ); + getProxy().getPluginManager().registerCommand( this, new CommandAlertRaw() ); } } diff --git a/module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/CommandSend.java b/module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/CommandSend.java index da45a450..70cdb9c1 100644 --- a/module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/CommandSend.java +++ b/module/cmd-send/src/main/java/net/md_5/bungee/module/cmd/send/CommandSend.java @@ -95,8 +95,14 @@ public class CommandSend extends Command implements TabExecutor matches.add( player.getName() ); } } - if ( "all".startsWith( search ) ) matches.add( "all" ); - if ( "current".startsWith( search ) ) matches.add( "current" ); + if ( "all".startsWith( search ) ) + { + matches.add( "all" ); + } + if ( "current".startsWith( search ) ) + { + matches.add( "current" ); + } } else { String search = args[1].toLowerCase(); diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java index 1bf5c787..d97848e5 100644 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java @@ -48,7 +48,7 @@ public class CommandServer extends Command implements TabExecutor if ( server.canAccess( player ) ) { TextComponent serverTextComponent = new TextComponent( first ? server.getName() : ", " + server.getName() ); - serverTextComponent.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(server.getPlayers().size() + " players").create() ) ); + serverTextComponent.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder( server.getPlayers().size() + " players" ).create() ) ); serverTextComponent.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/server " + server.getName() ) ); serverList.addExtra( serverTextComponent ); first = false; diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java index 32107b04..2d55e568 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java @@ -37,7 +37,6 @@ public enum Protocol HANDSHAKE { - { TO_SERVER.registerPacket( 0x00, Handshake.class ); } @@ -46,7 +45,6 @@ public enum Protocol GAME { - { TO_CLIENT.registerPacket( 0x00, KeepAlive.class ); TO_CLIENT.registerPacket( 0x01, Login.class ); @@ -72,7 +70,6 @@ public enum Protocol STATUS { - { TO_CLIENT.registerPacket( 0x00, StatusResponse.class ); TO_CLIENT.registerPacket( 0x01, PingPacket.class ); @@ -85,7 +82,6 @@ public enum Protocol LOGIN { - { TO_CLIENT.registerPacket( 0x00, Kick.class ); TO_CLIENT.registerPacket( 0x01, EncryptionRequest.class ); diff --git a/proxy/src/main/java/net/md_5/bungee/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/EntityMap.java index 46f9376e..f29f50b5 100644 --- a/proxy/src/main/java/net/md_5/bungee/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/EntityMap.java @@ -163,7 +163,7 @@ public class EntityMap packet.readerIndex( readerIndex ); packet.writerIndex( readerIndex + packetIdLength + idLength ); DefinedPacket.writeString( player.getUniqueId().toString(), packet ); - DefinedPacket.writeString( username, packet); + DefinedPacket.writeString( username, packet ); DefinedPacket.writeVarInt( profile.getProperties().length, packet ); for ( LoginResult.Property property : profile.getProperties() ) { diff --git a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java index a7b7ba43..5b03fdf4 100644 --- a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java +++ b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java @@ -28,7 +28,7 @@ public class PlayerInfoSerializer implements JsonSerializer