Remove all occurrences of Region.

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<SynchronizationSegment> 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;
 	}
 
 }

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;

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<Message> 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;
 	}
 
 	/**

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);
 	}
 

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();

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));
 		}
 	}
 

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

@@ -395,10 +395,10 @@ public final class PlayerSynchronizationMessageEncoder extends MessageEncoder<Pl
 			builder.putBits(1, 1);
 			builder.putBits(2, 3);
 			builder.putBits(2, position.getHeight());
-			builder.putBits(1, message.hasRegionChanged() ? 0 : 1);
+			builder.putBits(1, message.hasSectorChanged() ? 0 : 1);
 			builder.putBits(1, updateRequired ? 1 : 0);
-			builder.putBits(7, position.getLocalY(message.getLastKnownRegion()));
-			builder.putBits(7, position.getLocalX(message.getLastKnownRegion()));
+			builder.putBits(7, position.getLocalY(message.getLastKnownSector()));
+			builder.putBits(7, position.getLocalX(message.getLastKnownSector()));
 		} else if (seg.getType() == SegmentType.RUN) {
 			Direction[] directions = ((MovementSegment) seg).getDirections();
 			builder.putBits(1, 1);

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

@@ -19,7 +19,7 @@ import org.apollo.game.message.impl.OpenInterfaceSidebarMessage;
 import org.apollo.game.message.impl.PlayerSynchronizationMessage;
 import org.apollo.game.message.impl.PositionMessage;
 import org.apollo.game.message.impl.PrivacyOptionMessage;
-import org.apollo.game.message.impl.RegionChangeMessage;
+import org.apollo.game.message.impl.SectorChangeMessage;
 import org.apollo.game.message.impl.RemoveTileItemMessage;
 import org.apollo.game.message.impl.SendFriendMessage;
 import org.apollo.game.message.impl.SendObjectMessage;
@@ -161,7 +161,7 @@ public final class Release317 extends Release {
 
 		// register encoders
 		register(IdAssignmentMessage.class, new IdAssignmentMessageEncoder());
-		register(RegionChangeMessage.class, new RegionChangeMessageEncoder());
+		register(SectorChangeMessage.class, new SectorChangeMessageEncoder());
 		register(ServerChatMessage.class, new ServerMessageMessageEncoder());
 		register(PlayerSynchronizationMessage.class, new PlayerSynchronizationMessageEncoder());
 		register(OpenInterfaceMessage.class, new OpenInterfaceMessageEncoder());

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

@@ -1,6 +1,6 @@
 package org.apollo.net.release.r317;
 
-import org.apollo.game.message.impl.RegionChangeMessage;
+import org.apollo.game.message.impl.SectorChangeMessage;
 import org.apollo.net.codec.game.DataTransformation;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
@@ -8,14 +8,14 @@ import org.apollo.net.codec.game.GamePacketBuilder;
 import org.apollo.net.release.MessageEncoder;
 
 /**
- * A {@link MessageEncoder} for the {@link RegionChangeMessage}.
+ * A {@link MessageEncoder} for the {@link SectorChangeMessage}.
  * 
  * @author Graham
  */
-public final class RegionChangeMessageEncoder extends MessageEncoder<RegionChangeMessage> {
+public final class SectorChangeMessageEncoder extends MessageEncoder<SectorChangeMessage> {
 
 	@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());

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

@@ -396,10 +396,10 @@ public final class PlayerSynchronizationMessageEncoder extends MessageEncoder<Pl
 			Position pos = ((TeleportSegment) seg).getDestination();
 			builder.putBits(1, 1);
 			builder.putBits(2, 3);
-			builder.putBits(1, message.hasRegionChanged() ? 0 : 1);
+			builder.putBits(1, message.hasSectorChanged() ? 0 : 1);
 			builder.putBits(2, pos.getHeight());
-			builder.putBits(7, pos.getLocalY(message.getLastKnownRegion()));
-			builder.putBits(7, pos.getLocalX(message.getLastKnownRegion()));
+			builder.putBits(7, pos.getLocalY(message.getLastKnownSector()));
+			builder.putBits(7, pos.getLocalX(message.getLastKnownSector()));
 			builder.putBits(1, updateRequired ? 1 : 0);
 		} else if (seg.getType() == SegmentType.RUN) {
 			Direction[] directions = ((MovementSegment) seg).getDirections();

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

@@ -19,7 +19,7 @@ import org.apollo.game.message.impl.OpenInterfaceSidebarMessage;
 import org.apollo.game.message.impl.PlayerSynchronizationMessage;
 import org.apollo.game.message.impl.PositionMessage;
 import org.apollo.game.message.impl.PrivacyOptionMessage;
-import org.apollo.game.message.impl.RegionChangeMessage;
+import org.apollo.game.message.impl.SectorChangeMessage;
 import org.apollo.game.message.impl.RemoveTileItemMessage;
 import org.apollo.game.message.impl.SendFriendMessage;
 import org.apollo.game.message.impl.SendObjectMessage;
@@ -156,7 +156,7 @@ public final class Release377 extends Release {
 
 		// register encoders
 		register(IdAssignmentMessage.class, new IdAssignmentMessageEncoder());
-		register(RegionChangeMessage.class, new RegionChangeMessageEncoder());
+		register(SectorChangeMessage.class, new SectorChangeMessageEncoder());
 		register(ServerChatMessage.class, new ServerMessageMessageEncoder());
 		register(PlayerSynchronizationMessage.class, new PlayerSynchronizationMessageEncoder());
 		register(OpenInterfaceMessage.class, new OpenInterfaceMessageEncoder());

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

@@ -1,6 +1,6 @@
 package org.apollo.net.release.r377;
 
-import org.apollo.game.message.impl.RegionChangeMessage;
+import org.apollo.game.message.impl.SectorChangeMessage;
 import org.apollo.net.codec.game.DataOrder;
 import org.apollo.net.codec.game.DataTransformation;
 import org.apollo.net.codec.game.DataType;
@@ -9,14 +9,14 @@ import org.apollo.net.codec.game.GamePacketBuilder;
 import org.apollo.net.release.MessageEncoder;
 
 /**
- * A {@link MessageEncoder} for the {@link RegionChangeMessage}.
+ * A {@link MessageEncoder} for the {@link SectorChangeMessage}.
  * 
  * @author Graham
  */
-public final class RegionChangeMessageEncoder extends MessageEncoder<RegionChangeMessage> {
+public final class SectorChangeMessageEncoder extends MessageEncoder<SectorChangeMessage> {
 
 	@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());