Format line endings

src/org/apollo/fs/decoder/GameObjectDecoder.java

@@ -116,11 +116,9 @@ public final class GameObjectDecoder {
 			block = true;
 		}
 
-		Predicate<Integer> walls = (value) -> value >= ObjectType.LENGTHWISE_WALL.getValue()
+		Predicate<Integer> walls = (value) -> value >= ObjectType.LENGTHWISE_WALL.getValue() && value <= ObjectType.RECTANGULAR_CORNER.getValue() || value == ObjectType.DIAGONAL_WALL.getValue();
-				&& value <= ObjectType.RECTANGULAR_CORNER.getValue() || value == ObjectType.DIAGONAL_WALL.getValue();
 
-		Predicate<Integer> roofs = (value) -> value > ObjectType.DIAGONAL_INTERACTABLE.getValue()
+		Predicate<Integer> roofs = (value) -> value > ObjectType.DIAGONAL_INTERACTABLE.getValue() && value < ObjectType.FLOOR_DECORATION.getValue();
-				&& value < ObjectType.FLOOR_DECORATION.getValue();
 
 		if (walls.test(type) || roofs.test(type)) {
 			block = true;

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(
+	private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("GameService"));
-			"GameService"));
 
 	/**
 	 * The {@link ClientSynchronizer}.
@@ -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,
+		scheduledExecutor.scheduleAtFixedRate(new GamePulseHandler(this), GameConstants.PULSE_DELAY, GameConstants.PULSE_DELAY, TimeUnit.MILLISECONDS);
-				TimeUnit.MILLISECONDS);
 	}
 
 	/**

src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java

@@ -35,7 +35,6 @@ public final class ObjectActionVerificationHandler extends MessageHandler<Object
 			return;
 		}
 
-
 		Position position = message.getPosition();
 		Region region = repository.fromPosition(position);
 		Set<GameObject> objects = region.getEntities(position, EntityType.STATIC_OBJECT, EntityType.DYNAMIC_OBJECT);

src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java

@@ -53,8 +53,7 @@ public final class PlayerSynchronizationMessage extends Message {
 	 * @param localPlayers The number of local players.
 	 * @param segments A list of segments.
 	 */
-	public PlayerSynchronizationMessage(Position lastKnownRegion, Position position, boolean regionChanged,
+	public PlayerSynchronizationMessage(Position lastKnownRegion, Position position, boolean regionChanged, SynchronizationSegment segment, int localPlayers, List<SynchronizationSegment> segments) {
-			SynchronizationSegment segment, int localPlayers, List<SynchronizationSegment> segments) {
 		this.lastKnownRegion = lastKnownRegion;
 		this.position = position;
 		this.regionChanged = regionChanged;

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())
+		return MoreObjects.toStringHelper(this).add("x", getX()).add("y", getY()).add("height", getHeight()).add("region", getRegionCoordinates()).toString();
-				.add("region", getRegionCoordinates()).toString();
 	}
 
 }

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
+			if (type != EntityType.PLAYER && type != EntityType.NPC && (type != EntityType.STATIC_OBJECT || update == EntityUpdateType.REMOVE)) {
-					&& (type != EntityType.STATIC_OBJECT || update == EntityUpdateType.REMOVE)) {
 				region.record(entity, update);
 			}
 		}
@@ -190,8 +189,7 @@ public final class Region {
 
 		Set<EntityType> set = new HashSet<>(Arrays.asList(types));
 		@SuppressWarnings("unchecked")
-		Set<T> filtered = (Set<T>) local.stream().filter(entity -> set.contains(entity.getEntityType()))
+		Set<T> filtered = (Set<T>) local.stream().filter(entity -> set.contains(entity.getEntityType())).collect(Collectors.toSet());
-				.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)),
+		Preconditions.checkArgument(coordinates.equals(RegionCoordinates.fromPosition(position)), "Position is not included in this Region.");
-				"Position is not included in this Region.");
 	}
 
 	/**

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))
+		return MoreObjects.toStringHelper(this).add("width", width).add("length", length).add("matrix", Arrays.toString(matrix)).toString();
-				.toString();
 	}
 
 	/**

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,
+			return secondDirection == Direction.NONE ? new Direction[] { firstDirection } : new Direction[] {
-					secondDirection };
+					firstDirection, secondDirection };
 		}
 
 		return Direction.EMPTY_DIRECTION_ARRAY;

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)
+		return MoreObjects.toStringHelper(this).add("username", getUsername()).add("privilege", privilegeLevel).add("client version", getClientVersion()).toString();
-				.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,
+		InventoryListener syncInventoryListener = new SynchronizationInventoryListener(this, SynchronizationInventoryListener.INVENTORY_ID);
-				SynchronizationInventoryListener.INVENTORY_ID);
 		InventoryListener syncBankListener = new SynchronizationInventoryListener(this, BankConstants.BANK_INVENTORY_ID);
-		InventoryListener syncEquipmentListener = new SynchronizationInventoryListener(this,
+		InventoryListener syncEquipmentListener = new SynchronizationInventoryListener(this, SynchronizationInventoryListener.EQUIPMENT_ID);
-				SynchronizationInventoryListener.EQUIPMENT_ID);
 
 		inventory.addListener(syncInventoryListener);
 		inventory.addListener(fullInventoryListener);

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())
+		return MoreObjects.toStringHelper(this).add("id", getId()).add("type", getType()).add("orientation", getOrientation()).toString();
-				.toString();
 	}
 
 	@Override

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()
+		return Arrays.stream(values()).filter(group -> group.value == value).findAny().orElseThrow(() -> new IllegalArgumentException("No ObjectGroup with a value of " + value + " exists."));
-				.orElseThrow(() -> new IllegalArgumentException("No ObjectGroup with a value of " + value + " exists."));
 	}
 
 	/**

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<RegionCoordinates, List<RegionUpdateMessage>> updates,
+	public PrePlayerSynchronizationTask(Player player, Map<RegionCoordinates, List<RegionUpdateMessage>> updates, Map<RegionCoordinates, List<RegionUpdateMessage>> snapshots) {
-			Map<RegionCoordinates, List<RegionUpdateMessage>> 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)
+		return deltaX <= Position.MAX_DISTANCE || deltaX >= (VIEWPORT_WIDTH - Position.MAX_DISTANCE - 1) || deltaY <= Position.MAX_DISTANCE || deltaY >= (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<GroupedRegionUpdateMessage> toUpdateMessage(RegionUpdateMode mode, Position position,
+	private Optional<GroupedRegionUpdateMessage> toUpdateMessage(RegionUpdateMode mode, Position position, RegionCoordinates coordinates, RegionRepository repository) {
-			RegionCoordinates coordinates, RegionRepository repository) {
 		List<RegionUpdateMessage> messages;
 
 		/*
@@ -241,8 +238,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask {
 				messages = updates.get(coordinates);
 				if (messages == null) {
 					synchronized (updates) {
-						messages = updates.computeIfAbsent(coordinates,
+						messages = updates.computeIfAbsent(coordinates, coords -> repository.get(coords).getUpdates(position.getHeight()));
-								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,
+						messages = snapshots.computeIfAbsent(coordinates, coords -> repository.get(coords).getSnapshot(position.getHeight()));
-								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
+		return messages.isEmpty() ? Optional.empty() : Optional.of(new GroupedRegionUpdateMessage(position, coordinates, messages));
-				.of(new GroupedRegionUpdateMessage(position, coordinates, messages));
 	}
 
 }

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,
+			Preconditions.checkState(modulus != null && exponent != null, "Rsa node must have two children: 'modulus' and 'private-exponent'.");
-					"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,
+			Preconditions.checkState(http != null && service != null && jaggrab != null, "Ports node must have three children: 'http', 'service', and 'jaggrab'.");
-					"Ports node must have three children: 'http', 'service', and 'jaggrab'.");
 
 			HTTP_PORT = Integer.parseInt(http.getValue());
 			SERVICE_PORT = Integer.parseInt(service.getValue());

src/org/apollo/net/release/r317/GroupedRegionUpdateMessageEncoder.java

@@ -44,8 +44,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder<Grou
 		for (RegionUpdateMessage update : message.getMessages()) {
 			System.out.println("==== Sending " + update + " as part of grum");
 			@SuppressWarnings("unchecked")
-			MessageEncoder<RegionUpdateMessage> encoder = (MessageEncoder<RegionUpdateMessage>) release.getMessageEncoder(update
+			MessageEncoder<RegionUpdateMessage> encoder = (MessageEncoder<RegionUpdateMessage>) release.getMessageEncoder(update.getClass());
-					.getClass());
 
 			GamePacket packet = encoder.encode(update);
 			builder.put(DataType.BYTE, packet.getOpcode());

src/org/apollo/net/release/r317/RemoveObjectMessageEncoder.java

@@ -20,8 +20,7 @@ public final class RemoveObjectMessageEncoder extends MessageEncoder<RemoveObjec
 		builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getType() << 2 | message.getOrientation());
 		builder.put(DataType.BYTE, message.getPositionOffset());
 
-		System.out.println("Sending rm obj: type=" + message.getType() + ", orient=" + message.getOrientation() + ",posoff="
+		System.out.println("Sending rm obj: type=" + message.getType() + ", orient=" + message.getOrientation() + ",posoff=" + Integer.toBinaryString(message.getPositionOffset()));
-				+ Integer.toBinaryString(message.getPositionOffset()));
 		return builder.toGamePacket();
 	}
 

src/org/apollo/net/release/r377/GroupedRegionUpdateMessageEncoder.java

@@ -32,8 +32,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder<Grou
 	 *
 	 * @param encoders The Map of RegionUpdateMessages to MessageEncoders.
 	 */
-	public GroupedRegionUpdateMessageEncoder(
+	public GroupedRegionUpdateMessageEncoder(Map<Class<? extends RegionUpdateMessage>, MessageEncoder<? extends RegionUpdateMessage>> encoders) {
-			Map<Class<? extends RegionUpdateMessage>, MessageEncoder<? extends RegionUpdateMessage>> encoders) {
 		this.encoders = ImmutableMap.copyOf(encoders);
 	}
 
@@ -49,8 +48,7 @@ public final class GroupedRegionUpdateMessageEncoder extends MessageEncoder<Grou
 			@SuppressWarnings("unchecked")
 			MessageEncoder<RegionUpdateMessage> encoder = (MessageEncoder<RegionUpdateMessage>) encoders.get(update);
 
-			Preconditions.checkState(encoder != null, update.getClass()
+			Preconditions.checkState(encoder != null, update.getClass() + " does not have a registered encoder in GroupedRegionUpdateMessageEncoder.");
-					+ " does not have a registered encoder in GroupedRegionUpdateMessageEncoder.");
 
 			GamePacket packet = encoder.encode(update);
 			builder.put(DataType.BYTE, packet.getOpcode());

src/org/apollo/net/release/r377/Release377.java

@@ -221,8 +221,7 @@ public final class Release377 extends Release {
 		regionUpdates.put(SendObjectMessage.class, new SendObjectMessageEncoder());
 		regionUpdates.put(RemoveObjectMessage.class, new RemoveObjectMessageEncoder());
 
-		for (Map.Entry<Class<? extends RegionUpdateMessage>, MessageEncoder<? extends RegionUpdateMessage>> entry : regionUpdates
+		for (Map.Entry<Class<? extends RegionUpdateMessage>, MessageEncoder<? extends RegionUpdateMessage>> entry : regionUpdates.entrySet()) {
-				.entrySet()) {
 			@SuppressWarnings("unchecked")
 			Class<RegionUpdateMessage> clazz = (Class<RegionUpdateMessage>) entry.getKey();
 			@SuppressWarnings("unchecked")

src/org/apollo/update/ComparableChannelRequest.java

@@ -9,8 +9,7 @@ import io.netty.channel.Channel;
  *
  * @param <T> The type of request.
  */
-public final class ComparableChannelRequest<T extends Comparable<T>> extends ChannelRequest<T> implements
+public final class ComparableChannelRequest<T extends Comparable<T>> extends ChannelRequest<T> implements Comparable<ComparableChannelRequest<T>> {
-		Comparable<ComparableChannelRequest<T>> {
 
 	/**
 	 * Creates the ComparableChannelRequest.