From 61af5025c0213677db6247773295114ff1edeb3d Mon Sep 17 00:00:00 2001 From: Major- Date: Mon, 15 Sep 2014 04:04:16 +0100 Subject: [PATCH] Remove all occurrences of Region. --- .../impl/PlayerSynchronizationMessage.java | 32 +++++++------- ...eMessage.java => SectorChangeMessage.java} | 16 +++---- src/org/apollo/game/model/entity/Player.java | 44 +++++++++---------- .../sync/task/PlayerSynchronizationTask.java | 10 ++--- .../task/PostPlayerSynchronizationTask.java | 2 +- .../task/PrePlayerSynchronizationTask.java | 16 +++---- .../PlayerSynchronizationMessageEncoder.java | 6 +-- .../apollo/net/release/r317/Release317.java | 4 +- ...r.java => SectorChangeMessageEncoder.java} | 8 ++-- .../PlayerSynchronizationMessageEncoder.java | 6 +-- .../apollo/net/release/r377/Release377.java | 4 +- ...r.java => SectorChangeMessageEncoder.java} | 8 ++-- 12 files changed, 78 insertions(+), 78 deletions(-) rename src/org/apollo/game/message/impl/{RegionChangeMessage.java => SectorChangeMessage.java} (52%) rename src/org/apollo/net/release/r317/{RegionChangeMessageEncoder.java => SectorChangeMessageEncoder.java} (68%) rename src/org/apollo/net/release/r377/{RegionChangeMessageEncoder.java => SectorChangeMessageEncoder.java} (70%) diff --git a/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java b/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java index 5dbdb17d..8435f6b0 100644 --- a/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java +++ b/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java @@ -14,9 +14,9 @@ import org.apollo.game.sync.seg.SynchronizationSegment; public final class PlayerSynchronizationMessage extends Message { /** - * The last known region. + * The position in the last known sector. */ - private final Position lastKnownRegion; + private final Position lastKnownSector; /** * The number of local players. @@ -29,9 +29,9 @@ public final class PlayerSynchronizationMessage extends Message { private final Position position; /** - * A flag indicating if the region has changed. + * A flag indicating if the sector has changed. */ - private final boolean regionChanged; + private final boolean sectorChanged; /** * The current player's synchronization segment. @@ -46,30 +46,30 @@ public final class PlayerSynchronizationMessage extends Message { /** * Creates the player synchronization message. * - * @param lastKnownRegion The last known region. + * @param lastKnownSector The last known sector. * @param position The player's current position. - * @param regionChanged A flag indicating if the region has changed. + * @param sectorChanged A flag indicating if the sector has changed. * @param segment The current player's synchronization segment. * @param localPlayers The number of local players. * @param segments A list of segments. */ - public PlayerSynchronizationMessage(Position lastKnownRegion, Position position, boolean regionChanged, + public PlayerSynchronizationMessage(Position lastKnownSector, Position position, boolean sectorChanged, SynchronizationSegment segment, int localPlayers, List segments) { - this.lastKnownRegion = lastKnownRegion; + this.lastKnownSector = lastKnownSector; this.position = position; - this.regionChanged = regionChanged; + this.sectorChanged = sectorChanged; this.segment = segment; this.localPlayers = localPlayers; this.segments = segments; } /** - * Gets the last known region. + * Gets the last known sector. * - * @return The last known region. + * @return The last known sector. */ - public Position getLastKnownRegion() { - return lastKnownRegion; + public Position getLastKnownSector() { + return lastKnownSector; } /** @@ -109,12 +109,12 @@ public final class PlayerSynchronizationMessage extends Message { } /** - * Checks if the region has changed. + * Checks if the sector has changed. * * @return {@code true} if so, {@code false} if not. */ - public boolean hasRegionChanged() { - return regionChanged; + public boolean hasSectorChanged() { + return sectorChanged; } } \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/RegionChangeMessage.java b/src/org/apollo/game/message/impl/SectorChangeMessage.java similarity index 52% rename from src/org/apollo/game/message/impl/RegionChangeMessage.java rename to src/org/apollo/game/message/impl/SectorChangeMessage.java index 724ca354..aca659c5 100644 --- a/src/org/apollo/game/message/impl/RegionChangeMessage.java +++ b/src/org/apollo/game/message/impl/SectorChangeMessage.java @@ -4,30 +4,30 @@ import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * A {@link Message} sent to the client instructing it to load the specified region. + * A {@link Message} sent to the client instructing it to load the specified sector. * * @author Graham */ -public final class RegionChangeMessage extends Message { +public final class SectorChangeMessage extends Message { /** - * The position of the region to load. + * The position of the sector to load. */ private final Position position; /** - * Creates the region changed message. + * Creates the sector changed message. * - * @param position The position of the region. + * @param position The position of the sector. */ - public RegionChangeMessage(Position position) { + public SectorChangeMessage(Position position) { this.position = position; } /** - * Gets the position of the region to load. + * Gets the position of the sector to load. * - * @return The position of the region to load. + * @return The position of the sector to load. */ public Position getPosition() { return position; diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java index 903cbd63..ff4ee403 100644 --- a/src/org/apollo/game/model/entity/Player.java +++ b/src/org/apollo/game/model/entity/Player.java @@ -120,9 +120,9 @@ public final class Player extends Mob { private boolean isSkulled = false; /** - * The centre of the last region the client has loaded. + * The centre of the last sector the client has loaded. */ - private transient Position lastKnownRegion; + private transient Position lastKnownSector; /** * The membership flag. @@ -150,9 +150,9 @@ public final class Player extends Mob { private final transient Deque queuedMessages = new ArrayDeque<>(); /** - * A flag indicating if the region changed in the last cycle. + * A flag indicating if the sector changed in the last cycle. */ - private transient boolean regionChanged = false; + private transient boolean sectorChanged = false; /** * The player's run energy. @@ -381,12 +381,12 @@ public final class Player extends Mob { } /** - * Gets the last known region. + * Gets the last known sector. * - * @return The last known region, or {@code null} if the player has never known a region. + * @return The last known sector, or {@code null} if the player has never known a sector. */ - public Position getLastKnownRegion() { - return lastKnownRegion; + public Position getLastKnownSector() { + return lastKnownSector; } /** @@ -481,21 +481,21 @@ public final class Player extends Mob { } /** - * Checks if this player has ever known a region. + * Checks if this player has ever known a sector. * * @return {@code true} if so, {@code false} if not. */ - public boolean hasLastKnownRegion() { - return lastKnownRegion != null; + public boolean hasLastKnownSector() { + return lastKnownSector != null; } /** - * Checks if the region has changed. + * Checks if the sector has changed. * * @return {@code true} if so, {@code false} if not. */ - public boolean hasRegionChanged() { - return regionChanged; + public boolean hasSectorChanged() { + return sectorChanged; } /** @@ -766,12 +766,12 @@ public final class Player extends Mob { } /** - * Sets the last known region. + * Sets the last known sector. * - * @param lastKnownRegion The last known region. + * @param lastKnownSector The last known sector. */ - public void setLastKnownRegion(Position lastKnownRegion) { - this.lastKnownRegion = lastKnownRegion; + public void setLastKnownSector(Position lastKnownSector) { + this.lastKnownSector = lastKnownSector; } /** @@ -811,12 +811,12 @@ public final class Player extends Mob { } /** - * Sets the region changed flag. + * Sets the sector changed flag. * - * @param regionChanged A flag indicating if the region has changed. + * @param sectorChanged A flag indicating if the sector has changed. */ - public void setRegionChanged(boolean regionChanged) { - this.regionChanged = regionChanged; + public void setSectorChanged(boolean sectorChanged) { + this.sectorChanged = sectorChanged; } /** diff --git a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java index f3e13bca..17dae8b4 100644 --- a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java @@ -48,8 +48,8 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { @Override public void run() { - Position lastKnownRegion = player.getLastKnownRegion(); - boolean regionChanged = player.hasRegionChanged(); + Position lastKnownSector = player.getLastKnownSector(); + boolean sectorChanged = player.hasSectorChanged(); SynchronizationSegment segment; SynchronizationBlockSet blockSet = player.getBlockSet(); @@ -58,7 +58,7 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { blockSet.remove(ChatBlock.class); } - if (player.isTeleporting() || player.hasRegionChanged()) { + if (player.isTeleporting() || player.hasSectorChanged()) { segment = new TeleportSegment(blockSet, player.getPosition()); } else { segment = new MovementSegment(blockSet, player.getDirections()); @@ -107,8 +107,8 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { } } - PlayerSynchronizationMessage message = new PlayerSynchronizationMessage(lastKnownRegion, player.getPosition(), - regionChanged, segment, oldLocalPlayers, segments); + PlayerSynchronizationMessage message = new PlayerSynchronizationMessage(lastKnownSector, player.getPosition(), + sectorChanged, segment, oldLocalPlayers, segments); player.send(message); } diff --git a/src/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java index 5864311c..dddb993b 100644 --- a/src/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java @@ -26,7 +26,7 @@ public final class PostPlayerSynchronizationTask extends SynchronizationTask { @Override public void run() { player.setTeleporting(false); - player.setRegionChanged(false); + player.setSectorChanged(false); player.resetBlockSet(); if (!player.isExcessivePlayersSet()) { player.incrementViewingDistance(); diff --git a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java index 9c3ba3b7..7ec99aaf 100644 --- a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java @@ -1,6 +1,6 @@ package org.apollo.game.sync.task; -import org.apollo.game.message.impl.RegionChangeMessage; +import org.apollo.game.message.impl.SectorChangeMessage; import org.apollo.game.model.Position; import org.apollo.game.model.entity.Player; @@ -26,13 +26,13 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { } /** - * Checks if a region update is required. + * Checks if a sector update is required. * * @return {@code true} if so, {@code false} otherwise. */ - private boolean isRegionUpdateRequired() { + private boolean isSectorUpdateRequired() { Position current = player.getPosition(); - Position last = player.getLastKnownRegion(); + Position last = player.getLastKnownSector(); int deltaX = current.getLocalX(last); int deltaY = current.getLocalY(last); @@ -48,13 +48,13 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { player.resetViewingDistance(); } - if (!player.hasLastKnownRegion() || isRegionUpdateRequired()) { - player.setRegionChanged(true); + if (!player.hasLastKnownSector() || isSectorUpdateRequired()) { + player.setSectorChanged(true); Position position = player.getPosition(); - player.setLastKnownRegion(position); + player.setLastKnownSector(position); - player.send(new RegionChangeMessage(position)); + player.send(new SectorChangeMessage(position)); } } diff --git a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java index 4fa30fa4..2374cbc6 100644 --- a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java +++ b/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java @@ -395,10 +395,10 @@ public final class PlayerSynchronizationMessageEncoder extends MessageEncoder { +public final class SectorChangeMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(RegionChangeMessage message) { + public GamePacket encode(SectorChangeMessage message) { GamePacketBuilder builder = new GamePacketBuilder(73); builder.put(DataType.SHORT, DataTransformation.ADD, message.getPosition().getCentralSectorX()); builder.put(DataType.SHORT, message.getPosition().getCentralSectorY()); diff --git a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java index fd0f9b8b..eee3a263 100644 --- a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java +++ b/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java @@ -396,10 +396,10 @@ public final class PlayerSynchronizationMessageEncoder extends MessageEncoder { +public final class SectorChangeMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(RegionChangeMessage message) { + public GamePacket encode(SectorChangeMessage message) { GamePacketBuilder builder = new GamePacketBuilder(222); builder.put(DataType.SHORT, message.getPosition().getCentralSectorY()); builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getPosition().getCentralSectorX());