From b4176e809712ba855e507b4d4693de7225d37c9d Mon Sep 17 00:00:00 2001 From: atomicint Date: Mon, 23 Mar 2015 09:04:37 -0700 Subject: [PATCH] Format line endings --- .../apollo/fs/decoder/GameObjectDecoder.java | 6 ++---- .../fs/decoder/ObjectDefinitionDecoder.java | 2 +- src/org/apollo/game/GameService.java | 8 +++----- .../impl/ObjectActionVerificationHandler.java | 1 - .../impl/PlayerSynchronizationMessage.java | 3 +-- src/org/apollo/game/model/Position.java | 3 +-- src/org/apollo/game/model/area/Region.java | 9 +++------ .../model/area/collision/CollisionMatrix.java | 3 +-- .../game/model/area/update/package-info.java | 2 +- src/org/apollo/game/model/entity/Mob.java | 4 ++-- src/org/apollo/game/model/entity/Player.java | 9 +++------ .../model/entity/attr/StringAttribute.java | 2 +- .../game/model/entity/obj/GameObject.java | 3 +-- .../game/model/entity/obj/ObjectGroup.java | 3 +-- .../game/model/entity/obj/package-info.java | 2 +- .../task/PrePlayerSynchronizationTask.java | 18 ++++++------------ src/org/apollo/net/NetworkConstants.java | 6 ++---- .../GroupedRegionUpdateMessageEncoder.java | 3 +-- .../r317/NpcSynchronizationMessageEncoder.java | 4 ++-- .../r317/RemoveObjectMessageEncoder.java | 3 +-- .../GroupedRegionUpdateMessageEncoder.java | 6 ++---- .../r377/NpcSynchronizationMessageEncoder.java | 2 +- .../apollo/net/release/r377/Release377.java | 3 +-- .../update/ComparableChannelRequest.java | 3 +-- src/org/apollo/util/xml/XmlNode.java | 16 ++++++++-------- 25 files changed, 47 insertions(+), 77 deletions(-) diff --git a/src/org/apollo/fs/decoder/GameObjectDecoder.java b/src/org/apollo/fs/decoder/GameObjectDecoder.java index b0cf8148..bb6b9de5 100644 --- a/src/org/apollo/fs/decoder/GameObjectDecoder.java +++ b/src/org/apollo/fs/decoder/GameObjectDecoder.java @@ -116,11 +116,9 @@ public final class GameObjectDecoder { block = true; } - Predicate walls = (value) -> value >= ObjectType.LENGTHWISE_WALL.getValue() - && value <= ObjectType.RECTANGULAR_CORNER.getValue() || value == ObjectType.DIAGONAL_WALL.getValue(); + Predicate walls = (value) -> value >= ObjectType.LENGTHWISE_WALL.getValue() && value <= ObjectType.RECTANGULAR_CORNER.getValue() || value == ObjectType.DIAGONAL_WALL.getValue(); - Predicate roofs = (value) -> value > ObjectType.DIAGONAL_INTERACTABLE.getValue() - && value < ObjectType.FLOOR_DECORATION.getValue(); + Predicate roofs = (value) -> value > ObjectType.DIAGONAL_INTERACTABLE.getValue() && value < ObjectType.FLOOR_DECORATION.getValue(); if (walls.test(type) || roofs.test(type)) { block = true; diff --git a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java b/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java index 946d8236..ac998c30 100644 --- a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java +++ b/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java @@ -128,7 +128,7 @@ public final class ObjectDefinitionDecoder { data.getShort(); data.getShort(); int count = data.get(); - for (int i = 0; i <= count; i++){ + for (int i = 0; i <= count; i++) { data.getShort(); } } else { diff --git a/src/org/apollo/game/GameService.java b/src/org/apollo/game/GameService.java index 49fd689d..388489d4 100644 --- a/src/org/apollo/game/GameService.java +++ b/src/org/apollo/game/GameService.java @@ -50,8 +50,7 @@ public final class GameService extends Service { /** * The scheduled executor service. */ - private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory( - "GameService")); + private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("GameService")); /** * The {@link ClientSynchronizer}. @@ -157,7 +156,7 @@ public final class GameService extends Service { */ public RegistrationStatus registerPlayer(Player player, GameSession session) { World world = World.getWorld(); - + synchronized (this) { RegistrationStatus status = world.register(player); if (status == RegistrationStatus.OK) { @@ -176,8 +175,7 @@ public final class GameService extends Service { */ @Override public void start() { - scheduledExecutor.scheduleAtFixedRate(new GamePulseHandler(this), GameConstants.PULSE_DELAY, GameConstants.PULSE_DELAY, - TimeUnit.MILLISECONDS); + scheduledExecutor.scheduleAtFixedRate(new GamePulseHandler(this), GameConstants.PULSE_DELAY, GameConstants.PULSE_DELAY, TimeUnit.MILLISECONDS); } /** diff --git a/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java index e8899b45..f2666fb6 100644 --- a/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java @@ -34,7 +34,6 @@ public final class ObjectActionVerificationHandler extends MessageHandler segments) { + public PlayerSynchronizationMessage(Position lastKnownRegion, Position position, boolean regionChanged, SynchronizationSegment segment, int localPlayers, List segments) { this.lastKnownRegion = lastKnownRegion; this.position = position; this.regionChanged = regionChanged; diff --git a/src/org/apollo/game/model/Position.java b/src/org/apollo/game/model/Position.java index 804c0da1..7e57c5af 100644 --- a/src/org/apollo/game/model/Position.java +++ b/src/org/apollo/game/model/Position.java @@ -226,8 +226,7 @@ public final class Position { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("x", getX()).add("y", getY()).add("height", getHeight()) - .add("region", getRegionCoordinates()).toString(); + return MoreObjects.toStringHelper(this).add("x", getX()).add("y", getY()).add("height", getHeight()).add("region", getRegionCoordinates()).toString(); } } \ No newline at end of file diff --git a/src/org/apollo/game/model/area/Region.java b/src/org/apollo/game/model/area/Region.java index c04da299..e5caff4b 100644 --- a/src/org/apollo/game/model/area/Region.java +++ b/src/org/apollo/game/model/area/Region.java @@ -41,8 +41,7 @@ public final class Region { @Override public void execute(Region region, Entity entity, EntityUpdateType update) { EntityType type = entity.getEntityType(); - if (type != EntityType.PLAYER && type != EntityType.NPC - && (type != EntityType.STATIC_OBJECT || update == EntityUpdateType.REMOVE)) { + if (type != EntityType.PLAYER && type != EntityType.NPC && (type != EntityType.STATIC_OBJECT || update == EntityUpdateType.REMOVE)) { region.record(entity, update); } } @@ -190,8 +189,7 @@ public final class Region { Set set = new HashSet<>(Arrays.asList(types)); @SuppressWarnings("unchecked") - Set filtered = (Set) local.stream().filter(entity -> set.contains(entity.getEntityType())) - .collect(Collectors.toSet()); + Set filtered = (Set) local.stream().filter(entity -> set.contains(entity.getEntityType())).collect(Collectors.toSet()); return ImmutableSet.copyOf(filtered); } @@ -291,8 +289,7 @@ public final class Region { * @throws IllegalArgumentException If the specified position is not included in this Region. */ private void checkPosition(Position position) { - Preconditions.checkArgument(coordinates.equals(RegionCoordinates.fromPosition(position)), - "Position is not included in this Region."); + Preconditions.checkArgument(coordinates.equals(RegionCoordinates.fromPosition(position)), "Position is not included in this Region."); } /** diff --git a/src/org/apollo/game/model/area/collision/CollisionMatrix.java b/src/org/apollo/game/model/area/collision/CollisionMatrix.java index 46c25ca1..7c57c153 100644 --- a/src/org/apollo/game/model/area/collision/CollisionMatrix.java +++ b/src/org/apollo/game/model/area/collision/CollisionMatrix.java @@ -184,8 +184,7 @@ public final class CollisionMatrix { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("width", width).add("length", length).add("matrix", Arrays.toString(matrix)) - .toString(); + return MoreObjects.toStringHelper(this).add("width", width).add("length", length).add("matrix", Arrays.toString(matrix)).toString(); } /** diff --git a/src/org/apollo/game/model/area/update/package-info.java b/src/org/apollo/game/model/area/update/package-info.java index 864c3acd..04b2110c 100644 --- a/src/org/apollo/game/model/area/update/package-info.java +++ b/src/org/apollo/game/model/area/update/package-info.java @@ -1,4 +1,4 @@ /** - * Contains snapshot-related classes. + * Contains snapshot-related classes. */ package org.apollo.game.model.area.update; \ No newline at end of file diff --git a/src/org/apollo/game/model/entity/Mob.java b/src/org/apollo/game/model/entity/Mob.java index 7e56f344..6aadedae 100644 --- a/src/org/apollo/game/model/entity/Mob.java +++ b/src/org/apollo/game/model/entity/Mob.java @@ -196,8 +196,8 @@ public abstract class Mob extends Entity { */ public final Direction[] getDirections() { if (firstDirection != Direction.NONE) { - return secondDirection == Direction.NONE ? new Direction[] { firstDirection } : new Direction[] { firstDirection, - secondDirection }; + return secondDirection == Direction.NONE ? new Direction[] { firstDirection } : new Direction[] { + firstDirection, secondDirection }; } return Direction.EMPTY_DIRECTION_ARRAY; diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java index 7fdfd74c..4fd66a28 100644 --- a/src/org/apollo/game/model/entity/Player.java +++ b/src/org/apollo/game/model/entity/Player.java @@ -942,8 +942,7 @@ public final class Player extends Mob { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("username", getUsername()).add("privilege", privilegeLevel) - .add("client version", getClientVersion()).toString(); + return MoreObjects.toStringHelper(this).add("username", getUsername()).add("privilege", privilegeLevel).add("client version", getClientVersion()).toString(); } /** @@ -962,11 +961,9 @@ public final class Player extends Mob { InventoryListener fullBankListener = new FullInventoryListener(this, FullInventoryListener.FULL_BANK_MESSAGE); InventoryListener appearanceListener = new AppearanceInventoryListener(this); - InventoryListener syncInventoryListener = new SynchronizationInventoryListener(this, - SynchronizationInventoryListener.INVENTORY_ID); + InventoryListener syncInventoryListener = new SynchronizationInventoryListener(this, SynchronizationInventoryListener.INVENTORY_ID); InventoryListener syncBankListener = new SynchronizationInventoryListener(this, BankConstants.BANK_INVENTORY_ID); - InventoryListener syncEquipmentListener = new SynchronizationInventoryListener(this, - SynchronizationInventoryListener.EQUIPMENT_ID); + InventoryListener syncEquipmentListener = new SynchronizationInventoryListener(this, SynchronizationInventoryListener.EQUIPMENT_ID); inventory.addListener(syncInventoryListener); inventory.addListener(fullInventoryListener); diff --git a/src/org/apollo/game/model/entity/attr/StringAttribute.java b/src/org/apollo/game/model/entity/attr/StringAttribute.java index 231dac55..2691bbc3 100644 --- a/src/org/apollo/game/model/entity/attr/StringAttribute.java +++ b/src/org/apollo/game/model/entity/attr/StringAttribute.java @@ -33,7 +33,7 @@ public final class StringAttribute extends Attribute { public byte[] encode() { byte[] bytes = value.getBytes(Charset.forName("UTF-8")); int length = bytes.length; - + bytes = Arrays.copyOf(bytes, length + 1); bytes[length - 1] = 0; return bytes; diff --git a/src/org/apollo/game/model/entity/obj/GameObject.java b/src/org/apollo/game/model/entity/obj/GameObject.java index e04cf80c..c1e12958 100644 --- a/src/org/apollo/game/model/entity/obj/GameObject.java +++ b/src/org/apollo/game/model/entity/obj/GameObject.java @@ -89,8 +89,7 @@ public abstract class GameObject extends Entity { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("id", getId()).add("type", getType()).add("orientation", getOrientation()) - .toString(); + return MoreObjects.toStringHelper(this).add("id", getId()).add("type", getType()).add("orientation", getOrientation()).toString(); } @Override diff --git a/src/org/apollo/game/model/entity/obj/ObjectGroup.java b/src/org/apollo/game/model/entity/obj/ObjectGroup.java index 5955f8ab..9bb50d22 100644 --- a/src/org/apollo/game/model/entity/obj/ObjectGroup.java +++ b/src/org/apollo/game/model/entity/obj/ObjectGroup.java @@ -38,8 +38,7 @@ public enum ObjectGroup { * @throws IllegalArgumentException If there is no ObjectGroup with the specified value. */ public static ObjectGroup valueOf(int value) { - return Arrays.stream(values()).filter(group -> group.value == value).findAny() - .orElseThrow(() -> new IllegalArgumentException("No ObjectGroup with a value of " + value + " exists.")); + return Arrays.stream(values()).filter(group -> group.value == value).findAny().orElseThrow(() -> new IllegalArgumentException("No ObjectGroup with a value of " + value + " exists.")); } /** diff --git a/src/org/apollo/game/model/entity/obj/package-info.java b/src/org/apollo/game/model/entity/obj/package-info.java index 5dd694f7..89834bb4 100644 --- a/src/org/apollo/game/model/entity/obj/package-info.java +++ b/src/org/apollo/game/model/entity/obj/package-info.java @@ -1,4 +1,4 @@ /** - * Contains object-related classes. + * Contains object-related classes. */ package org.apollo.game.model.entity.obj; \ No newline at end of file diff --git a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java index 6589e69b..d20978d6 100644 --- a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java @@ -79,8 +79,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { * @param updates The {@link Map} containing {@link Region} updates. * @param snapshots The Map containing Region snapshots. */ - public PrePlayerSynchronizationTask(Player player, Map> updates, - Map> snapshots) { + public PrePlayerSynchronizationTask(Player player, Map> updates, Map> snapshots) { this.player = player; this.updates = updates; this.snapshots = snapshots; @@ -210,8 +209,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { int deltaX = current.getLocalX(last); int deltaY = current.getLocalY(last); - return deltaX <= Position.MAX_DISTANCE || deltaX >= (VIEWPORT_WIDTH - Position.MAX_DISTANCE - 1) - || deltaY <= Position.MAX_DISTANCE || deltaY >= (VIEWPORT_WIDTH - Position.MAX_DISTANCE - 1); + return deltaX <= Position.MAX_DISTANCE || deltaX >= (VIEWPORT_WIDTH - Position.MAX_DISTANCE - 1) || deltaY <= Position.MAX_DISTANCE || deltaY >= (VIEWPORT_WIDTH - Position.MAX_DISTANCE - 1); } /** @@ -224,8 +222,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { * @param repository The {@link RegionRepository} containing the Regions. * @return The Optional containing the GroupedRegionUpdateMessage. */ - private Optional toUpdateMessage(RegionUpdateMode mode, Position position, - RegionCoordinates coordinates, RegionRepository repository) { + private Optional toUpdateMessage(RegionUpdateMode mode, Position position, RegionCoordinates coordinates, RegionRepository repository) { List messages; /* @@ -241,8 +238,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { messages = updates.get(coordinates); if (messages == null) { synchronized (updates) { - messages = updates.computeIfAbsent(coordinates, - coords -> repository.get(coords).getUpdates(position.getHeight())); + messages = updates.computeIfAbsent(coordinates, coords -> repository.get(coords).getUpdates(position.getHeight())); } } @@ -251,8 +247,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { messages = snapshots.get(coordinates); if (messages == null) { synchronized (snapshots) { - messages = snapshots.computeIfAbsent(coordinates, - coords -> repository.get(coords).getSnapshot(position.getHeight())); + messages = snapshots.computeIfAbsent(coordinates, coords -> repository.get(coords).getSnapshot(position.getHeight())); } } @@ -261,8 +256,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { throw new IllegalArgumentException("Unrecognised RegionUpdateMode " + mode + "."); } - return messages.isEmpty() ? Optional.empty() : Optional - .of(new GroupedRegionUpdateMessage(position, coordinates, messages)); + return messages.isEmpty() ? Optional.empty() : Optional.of(new GroupedRegionUpdateMessage(position, coordinates, messages)); } } \ No newline at end of file diff --git a/src/org/apollo/net/NetworkConstants.java b/src/org/apollo/net/NetworkConstants.java index 56c3e20b..a4bac1c7 100644 --- a/src/org/apollo/net/NetworkConstants.java +++ b/src/org/apollo/net/NetworkConstants.java @@ -72,8 +72,7 @@ public final class NetworkConstants { Preconditions.checkState(rsa != null, "Root node must have a child named 'rsa'."); XmlNode modulus = rsa.getChild("modulus"), exponent = rsa.getChild("private-exponent"); - Preconditions.checkState(modulus != null && exponent != null, - "Rsa node must have two children: 'modulus' and 'private-exponent'."); + Preconditions.checkState(modulus != null && exponent != null, "Rsa node must have two children: 'modulus' and 'private-exponent'."); RSA_MODULUS = new BigInteger(modulus.getValue()); RSA_EXPONENT = new BigInteger(exponent.getValue()); @@ -82,8 +81,7 @@ public final class NetworkConstants { Preconditions.checkState(ports != null, "Root node must have a child named 'ports'."); XmlNode http = ports.getChild("http"), service = ports.getChild("service"), jaggrab = ports.getChild("jaggrab"); - Preconditions.checkState(http != null && service != null && jaggrab != null, - "Ports node must have three children: 'http', 'service', and 'jaggrab'."); + Preconditions.checkState(http != null && service != null && jaggrab != null, "Ports node must have three children: 'http', 'service', and 'jaggrab'."); HTTP_PORT = Integer.parseInt(http.getValue()); SERVICE_PORT = Integer.parseInt(service.getValue()); diff --git a/src/org/apollo/net/release/r317/GroupedRegionUpdateMessageEncoder.java b/src/org/apollo/net/release/r317/GroupedRegionUpdateMessageEncoder.java index a2de6474..289134c8 100644 --- a/src/org/apollo/net/release/r317/GroupedRegionUpdateMessageEncoder.java +++ b/src/org/apollo/net/release/r317/GroupedRegionUpdateMessageEncoder.java @@ -44,8 +44,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder encoder = (MessageEncoder) release.getMessageEncoder(update - .getClass()); + MessageEncoder encoder = (MessageEncoder) release.getMessageEncoder(update.getClass()); GamePacket packet = encoder.encode(update); builder.put(DataType.BYTE, packet.getOpcode()); diff --git a/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java index c4bd440e..a8acc59d 100644 --- a/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java +++ b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java @@ -194,8 +194,8 @@ public final class NpcSynchronizationMessageEncoder extends MessageEncoder encoder = (MessageEncoder) encoders.get(update); - Preconditions.checkState(encoder != null, update.getClass() - + " does not have a registered encoder in GroupedRegionUpdateMessageEncoder."); + Preconditions.checkState(encoder != null, update.getClass() + " does not have a registered encoder in GroupedRegionUpdateMessageEncoder."); GamePacket packet = encoder.encode(update); builder.put(DataType.BYTE, packet.getOpcode()); diff --git a/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java index 9625b8c0..8702363f 100644 --- a/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java +++ b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java @@ -194,7 +194,7 @@ public final class NpcSynchronizationMessageEncoder extends MessageEncoder, MessageEncoder> entry : regionUpdates - .entrySet()) { + for (Map.Entry, MessageEncoder> entry : regionUpdates.entrySet()) { @SuppressWarnings("unchecked") Class clazz = (Class) entry.getKey(); @SuppressWarnings("unchecked") diff --git a/src/org/apollo/update/ComparableChannelRequest.java b/src/org/apollo/update/ComparableChannelRequest.java index 02f90f1d..606d2f9b 100644 --- a/src/org/apollo/update/ComparableChannelRequest.java +++ b/src/org/apollo/update/ComparableChannelRequest.java @@ -9,8 +9,7 @@ import io.netty.channel.Channel; * * @param The type of request. */ -public final class ComparableChannelRequest> extends ChannelRequest implements - Comparable> { +public final class ComparableChannelRequest> extends ChannelRequest implements Comparable> { /** * Creates the ComparableChannelRequest. diff --git a/src/org/apollo/util/xml/XmlNode.java b/src/org/apollo/util/xml/XmlNode.java index 533892ab..fceab153 100644 --- a/src/org/apollo/util/xml/XmlNode.java +++ b/src/org/apollo/util/xml/XmlNode.java @@ -146,14 +146,14 @@ public final class XmlNode implements Iterable { return value; } - /** - * Gets the value of this node, wrapped in an {@link Optional} - * - * @return The value of this node if it exists otherwise {@link Optional#empty()} is returned - */ - public Optional getOptionalValue() { - return Optional.ofNullable(value); - } + /** + * Gets the value of this node, wrapped in an {@link Optional} + * + * @return The value of this node if it exists otherwise {@link Optional#empty()} is returned + */ + public Optional getOptionalValue() { + return Optional.ofNullable(value); + } /** * Checks if this node has a value.