From 500c513e2880d733726773b5d02be54947301dd5 Mon Sep 17 00:00:00 2001 From: Ryley Kimmel Date: Wed, 4 Mar 2015 15:51:07 -0500 Subject: [PATCH] Improve poor/legacy code. --- src/org/apollo/fs/IndexedFileSystem.java | 4 +--- src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java | 2 -- .../game/message/handler/impl/BankMessageHandler.java | 2 +- .../apollo/game/model/area/collision/CollisionMatrix.java | 3 +-- src/org/apollo/game/model/entity/GameObject.java | 3 +-- src/org/apollo/game/model/entity/SkillSet.java | 2 +- src/org/apollo/game/model/entity/WalkingQueue.java | 4 +--- .../apollo/game/model/entity/attr/NumericalAttribute.java | 2 +- src/org/apollo/game/model/event/EventListenerChainSet.java | 2 +- src/org/apollo/game/model/inter/InterfaceSet.java | 5 +---- src/org/apollo/io/player/BinaryPlayerSerializer.java | 2 +- src/org/apollo/io/player/PlayerLoaderResponse.java | 6 ++---- .../apollo/net/release/r377/PrivateChatMessageDecoder.java | 2 +- 13 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/org/apollo/fs/IndexedFileSystem.java b/src/org/apollo/fs/IndexedFileSystem.java index 50d3ee0c..a890b8eb 100644 --- a/src/org/apollo/fs/IndexedFileSystem.java +++ b/src/org/apollo/fs/IndexedFileSystem.java @@ -176,9 +176,7 @@ public final class IndexedFileSystem implements Closeable { int nextBlock = (header[4] & 0xFF) << 16 | (header[5] & 0xFF) << 8 | header[6] & 0xFF; int nextType = header[7] & 0xFF; - if (i != curChunk) { - Preconditions.checkArgument(i == curChunk, "Chunk id mismatch."); - } + Preconditions.checkArgument(i == curChunk, "Chunk id mismatch."); int chunkSize = size - read; if (chunkSize > FileSystemConstants.CHUNK_SIZE) { diff --git a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java b/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java index 672e633b..ef46991e 100644 --- a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java +++ b/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java @@ -124,8 +124,6 @@ public final class ObjectDefinitionDecoder { definition.setObstructive(true); } else if (opcode == 75) { data.get(); - } else { - continue; } } } diff --git a/src/org/apollo/game/message/handler/impl/BankMessageHandler.java b/src/org/apollo/game/message/handler/impl/BankMessageHandler.java index 02df5c4c..62e904c7 100644 --- a/src/org/apollo/game/message/handler/impl/BankMessageHandler.java +++ b/src/org/apollo/game/message/handler/impl/BankMessageHandler.java @@ -23,7 +23,7 @@ public final class BankMessageHandler extends MessageHandler * @return The amount. * @throws IllegalArgumentException If the option is invalid. */ - private static final int optionToAmount(int option) { + private static int optionToAmount(int option) { switch (option) { case 1: return 1; diff --git a/src/org/apollo/game/model/area/collision/CollisionMatrix.java b/src/org/apollo/game/model/area/collision/CollisionMatrix.java index f043fbc7..795ae71c 100644 --- a/src/org/apollo/game/model/area/collision/CollisionMatrix.java +++ b/src/org/apollo/game/model/area/collision/CollisionMatrix.java @@ -161,8 +161,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/entity/GameObject.java b/src/org/apollo/game/model/entity/GameObject.java index 958383cd..db29efd7 100644 --- a/src/org/apollo/game/model/entity/GameObject.java +++ b/src/org/apollo/game/model/entity/GameObject.java @@ -89,8 +89,7 @@ public final 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(); } } \ No newline at end of file diff --git a/src/org/apollo/game/model/entity/SkillSet.java b/src/org/apollo/game/model/entity/SkillSet.java index c3b61223..1c0500f8 100644 --- a/src/org/apollo/game/model/entity/SkillSet.java +++ b/src/org/apollo/game/model/entity/SkillSet.java @@ -209,7 +209,7 @@ public final class SkillSet { * @return The total level. */ public int getTotalLevel() { - return Arrays.stream(skills).map(skill -> skill.getMaximumLevel()).reduce(0, (total, level) -> total + level); + return Arrays.stream(skills).map(Skill::getMaximumLevel).reduce(0, (total, level) -> total + level); } /** diff --git a/src/org/apollo/game/model/entity/WalkingQueue.java b/src/org/apollo/game/model/entity/WalkingQueue.java index fa70f042..0069b28e 100644 --- a/src/org/apollo/game/model/entity/WalkingQueue.java +++ b/src/org/apollo/game/model/entity/WalkingQueue.java @@ -121,9 +121,7 @@ public final class WalkingQueue { points.clear(); oldPoints.clear(); - for (Position travelBackPosition : travelBackQueue) { - addStep(travelBackPosition); - } + travelBackQueue.forEach(this::addStep); addStep(clientPosition); return true; diff --git a/src/org/apollo/game/model/entity/attr/NumericalAttribute.java b/src/org/apollo/game/model/entity/attr/NumericalAttribute.java index ffc3915b..018e9158 100644 --- a/src/org/apollo/game/model/entity/attr/NumericalAttribute.java +++ b/src/org/apollo/game/model/entity/attr/NumericalAttribute.java @@ -15,7 +15,7 @@ public final class NumericalAttribute extends Attribute { * @param value The value of this attribute. * @return The type. */ - private static final AttributeType typeOf(Number value) { + private static AttributeType typeOf(Number value) { return value instanceof Double ? AttributeType.DOUBLE : AttributeType.LONG; } diff --git a/src/org/apollo/game/model/event/EventListenerChainSet.java b/src/org/apollo/game/model/event/EventListenerChainSet.java index 8dbe8bfa..293632cd 100644 --- a/src/org/apollo/game/model/event/EventListenerChainSet.java +++ b/src/org/apollo/game/model/event/EventListenerChainSet.java @@ -24,7 +24,7 @@ public final class EventListenerChainSet { public boolean notify(E event) { @SuppressWarnings("unchecked") EventListenerChain chain = (EventListenerChain) chains.get(event.getClass()); - return (chain == null) ? true : chain.notify(event); + return (chain == null) || chain.notify(event); } /** diff --git a/src/org/apollo/game/model/inter/InterfaceSet.java b/src/org/apollo/game/model/inter/InterfaceSet.java index 3e77387e..613d7d38 100644 --- a/src/org/apollo/game/model/inter/InterfaceSet.java +++ b/src/org/apollo/game/model/inter/InterfaceSet.java @@ -79,10 +79,7 @@ public final class InterfaceSet { * @return {@code true} if the message handler chain should be broken. */ public boolean buttonClicked(int button) { - if (dialogueListener.isPresent()) { - return dialogueListener.get().buttonClicked(button); - } - return false; + return dialogueListener.isPresent() && dialogueListener.get().buttonClicked(button); } /** diff --git a/src/org/apollo/io/player/BinaryPlayerSerializer.java b/src/org/apollo/io/player/BinaryPlayerSerializer.java index 6ae08b98..91a01126 100644 --- a/src/org/apollo/io/player/BinaryPlayerSerializer.java +++ b/src/org/apollo/io/player/BinaryPlayerSerializer.java @@ -102,7 +102,7 @@ public final class BinaryPlayerSerializer implements PlayerSerializer { for (int slot = 0; slot < style.length; slot++) { style[slot] = in.readUnsignedByte(); } - + int[] colors = new int[5]; for (int slot = 0; slot < colors.length; slot++) { colors[slot] = in.readUnsignedByte(); diff --git a/src/org/apollo/io/player/PlayerLoaderResponse.java b/src/org/apollo/io/player/PlayerLoaderResponse.java index 6f6bc2b6..2e5f2811 100644 --- a/src/org/apollo/io/player/PlayerLoaderResponse.java +++ b/src/org/apollo/io/player/PlayerLoaderResponse.java @@ -33,8 +33,7 @@ public final class PlayerLoaderResponse { * {@link LoginConstants#STATUS_RECONNECTION_OK}. */ public PlayerLoaderResponse(int status) { - Preconditions.checkArgument(status != LoginConstants.STATUS_OK && status != LoginConstants.STATUS_RECONNECTION_OK, - "Player required for this status code."); + Preconditions.checkArgument(status != LoginConstants.STATUS_OK && status != LoginConstants.STATUS_RECONNECTION_OK, "Player required for this status code."); this.status = status; player = Optional.empty(); } @@ -48,8 +47,7 @@ public final class PlayerLoaderResponse { * @throws NullPointerException If the specified player is null. */ public PlayerLoaderResponse(int status, Player player) { - Preconditions.checkArgument(status == LoginConstants.STATUS_OK || status == LoginConstants.STATUS_RECONNECTION_OK, - "Player not required for this status code."); + Preconditions.checkArgument(status == LoginConstants.STATUS_OK || status == LoginConstants.STATUS_RECONNECTION_OK, "Player not required for this status code."); this.status = status; this.player = Optional.of(player); } diff --git a/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java b/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java index 2f507f4f..a7030687 100644 --- a/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java +++ b/src/org/apollo/net/release/r377/PrivateChatMessageDecoder.java @@ -32,7 +32,7 @@ public final class PrivateChatMessageDecoder extends MessageDecoder