OSRS Integration

game/src/main/java/org/apollo/Server.java

@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 /**
@@ -48,6 +49,8 @@ public final class Server {
 	 * @param args The command-line arguments passed to the application.
 	 */
 	public static void main(String[] args) {
+		Arrays.stream(LogManager.getLogManager().getLogger("").getHandlers()).forEach(h -> h.setLevel(Level.ALL));
+
 		Stopwatch stopwatch = Stopwatch.createStarted();
 
 		try {

game/src/main/java/org/apollo/game/message/handler/WalkMessageHandler.java

@@ -25,18 +25,11 @@ public WalkMessageHandler(World world) {
 	@Override
 	public void handle(Player player, WalkMessage message) {
 		WalkingQueue queue = player.getWalkingQueue();
+		queue.setRunning(message.isRunning() || player.isRunning());
 
-		Position[] steps = message.getSteps();
-		for (int index = 0; index < steps.length; index++) {
-			Position step = steps[index];
-			if (index == 0) {
-				queue.addFirstStep(step);
-			} else {
-				queue.addStep(step);
-			}
-		}
+		player.teleport(new Position(message.getX(), message.getY(), player.getPosition().getHeight()));
+		//queue.addFirstStep(new Position(message.getX(), message.getY(), player.getPosition().getHeight()));
 
-		queue.setRunning(message.isRunning() || player.isRunning());
 		player.getInterfaceSet().close();
 
 		if (queue.size() > 0) {

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

@@ -1,119 +1,19 @@
 package org.apollo.game.message.impl;
 
-import org.apollo.game.model.Position;
-import org.apollo.game.sync.seg.SynchronizationSegment;
+import org.apollo.game.model.entity.PlayerUpdateInfo;
+import org.apollo.net.codec.game.GamePacketBuilder;
 import org.apollo.net.message.Message;
 
-import java.util.List;
-
-/**
- * A {@link Message} sent to the client to synchronize players.
- *
- * @author Graham
- */
 public final class PlayerSynchronizationMessage extends Message {
 
-	/**
-	 * The Position in the last known region.
-	 */
-	private final Position lastKnownRegion;
-
-	/**
-	 * The number of local players.
-	 */
-	private final int localPlayers;
-
-	/**
-	 * The player's position.
-	 */
-	private final Position position;
-
-	/**
-	 * A flag indicating if the region has changed.
-	 */
-	private final boolean regionChanged;
-
-	/**
-	 * The current player's synchronization segment.
-	 */
-	private final SynchronizationSegment segment;
-
-	/**
-	 * A list of segments.
-	 */
-	private final List<SynchronizationSegment> segments;
-
-	/**
-	 * Creates the player synchronization message.
-	 *
-	 * @param lastKnownRegion The last known region.
-	 * @param position The player's current position.
-	 * @param regionChanged A flag indicating if the region 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, SynchronizationSegment segment, int localPlayers, List<SynchronizationSegment> segments) {
-		this.lastKnownRegion = lastKnownRegion;
-		this.position = position;
-		this.regionChanged = regionChanged;
-		this.segment = segment;
-		this.localPlayers = localPlayers;
-		this.segments = segments;
-	}
-
-	/**
-	 * Gets the last known region.
-	 *
-	 * @return The last known region.
-	 */
-	public Position getLastKnownRegion() {
-		return lastKnownRegion;
-	}
-
-	/**
-	 * Gets the number of local players.
-	 *
-	 * @return The number of local players.
-	 */
-	public int getLocalPlayers() {
-		return localPlayers;
-	}
-
-	/**
-	 * Gets the player's position.
-	 *
-	 * @return The player's position.
-	 */
-	public Position getPosition() {
-		return position;
-	}
 
-	/**
-	 * Gets the current player's segment.
-	 *
-	 * @return The current player's segment.
-	 */
-	public SynchronizationSegment getSegment() {
-		return segment;
-	}
+	private final GamePacketBuilder info;
 
-	/**
-	 * Gets the synchronization segments.
-	 *
-	 * @return The segments.
-	 */
-	public List<SynchronizationSegment> getSegments() {
-		return segments;
+	public PlayerSynchronizationMessage(GamePacketBuilder info) {
+		this.info = info;
 	}
 
-	/**
-	 * Checks if the region has changed.
-	 *
-	 * @return {@code true} if so, {@code false} if not.
-	 */
-	public boolean hasRegionChanged() {
-		return regionChanged;
+	public GamePacketBuilder getInfo() {
+		return info;
 	}
-
 }

game/src/main/java/org/apollo/game/message/impl/PublicChatMessage.java

@@ -9,6 +9,10 @@
  */
 public final class PublicChatMessage extends ChatMessage {
 
+	public enum PublicChatType {
+		NONE, QUICKCHAT, CLANCHAT
+	}
+
 	/**
 	 * The text color.
 	 */
@@ -19,18 +23,25 @@ public final class PublicChatMessage extends ChatMessage {
 	 */
 	private final int effects;
 
+	/**
+	 * The type of public chat.
+	 */
+	private final PublicChatType type;
+
 	/**
 	 * Creates a new chat message.
 	 *
-	 * @param message The message.
+	 * @param message           The message.
 	 * @param compressedMessage The compressed message.
-	 * @param color The text color.
-	 * @param effects The text effects.
+	 * @param color             The text color.
+	 * @param effects           The text effects.
+	 * @param type              The chat type.
 	 */
-	public PublicChatMessage(String message, byte[] compressedMessage, int color, int effects) {
+	public PublicChatMessage(String message, byte[] compressedMessage, int color, int effects, PublicChatType type) {
 		super(message, compressedMessage);
 		this.color = color;
 		this.effects = effects;
+		this.type = type;
 	}
 
 	/**
@@ -51,4 +62,12 @@ public int getTextEffects() {
 		return effects;
 	}
 
+	/**
+	 * Gets the chat type.
+	 *
+	 * @return the type of public chat.
+	 */
+	public PublicChatType getType() {
+		return type;
+	}
 }

game/src/main/java/org/apollo/game/message/impl/decode/WalkMessage.java

@@ -19,27 +19,38 @@ public final class WalkMessage extends Message {
 	/**
 	 * The steps.
 	 */
-	private final Position[] steps;
+	private int x, y;
 
 	/**
 	 * Creates the message.
 	 *
-	 * @param steps The steps array.
+	 * @param x   The absolute x-axis position.
+	 * @param y   The absolute y-axis position.
 	 * @param run The run flag.
 	 */
-	public WalkMessage(Position[] steps, boolean run) {
-		Preconditions.checkArgument(steps.length >= 0, "Number of steps cannot be negative.");
-		this.steps = steps;
+	public WalkMessage(int x, int y, boolean run) {
+		this.x = x;
+		this.y = y;
 		this.run = run;
 	}
 
+
+	/**
+	 * Gets x.
+	 *
+	 * @return the x
+	 */
+	public int getX() {
+		return x;
+	}
+
 	/**
-	 * Gets the steps array.
+	 * Gets y.
 	 *
-	 * @return An array of steps.
+	 * @return the y
 	 */
-	public Position[] getSteps() {
-		return steps;
+	public int getY() {
+		return y;
 	}
 
 	/**

game/src/main/java/org/apollo/game/message/impl/encode/RebuildNormalMessage.java

@@ -2,6 +2,9 @@
 
 import org.apollo.cache.map.XteaRepository;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.MobRepository;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.PlayerUpdateInfo;
 import org.apollo.net.message.Message;
 
 /**
@@ -21,10 +24,20 @@ public final class RebuildNormalMessage extends Message {
 	 */
 	private final int index;
 
+	/**
+	 * The update information of the player.
+	 */
+	private PlayerUpdateInfo info;
+
 	/**
 	 * The repository containing xteas.
 	 */
-	private final XteaRepository repository;
+	private final XteaRepository xteaRepository;
+
+	/**
+	 * The repository containing players.
+	 */
+	private final MobRepository<Player> playerRepository;
 
 	/**
 	 * If the player has a last known region.
@@ -35,13 +48,15 @@ public final class RebuildNormalMessage extends Message {
 	 * Creates the region changed message.
 	 *
 	 * @param position           The position of the region.
-	 * @param repository         the repository
+	 * @param xteaRepository         the repository
 	 * @param hasLastKnownRegion if the player has been in a region.
 	 */
-	public RebuildNormalMessage(Position position, int index, XteaRepository repository, boolean hasLastKnownRegion) {
+	public RebuildNormalMessage(Position position, int index, PlayerUpdateInfo info, MobRepository<Player> playerRepository, XteaRepository xteaRepository, boolean hasLastKnownRegion) {
 		this.position = position;
 		this.index = index;
-		this.repository = repository;
+		this.info = info;
+		this.xteaRepository = xteaRepository;
+		this.playerRepository = playerRepository;
 		this.hasLastKnownRegion = hasLastKnownRegion;
 	}
 
@@ -64,13 +79,17 @@ public int getIndex() {
 		return index;
 	}
 
+	public PlayerUpdateInfo getInfo() {
+		return info;
+	}
+
 	/**
 	 * Gets repository.
 	 *
 	 * @return the repository
 	 */
-	public XteaRepository getRepository() {
-		return repository;
+	public XteaRepository getXteaRepository() {
+		return xteaRepository;
 	}
 
 	/**
@@ -81,4 +100,8 @@ public XteaRepository getRepository() {
 	public boolean isHasLastKnownRegion() {
 		return hasLastKnownRegion;
 	}
+
+	public MobRepository<Player> getPlayerRepository() {
+		return playerRepository;
+	}
 }

game/src/main/java/org/apollo/game/model/Position.java

@@ -239,4 +239,8 @@ public String toString() {
 		return MoreObjects.toStringHelper(this).add("x", getX()).add("y", getY()).add("height", getHeight())
 				.add("map", getRegionCoordinates()).toString();
 	}
+
+    public int get18BitHash() {
+    	return (getY() >> 13) + ((getX() >> 13) << 8) + (getHeight() << 16);
+	}
 }

game/src/main/java/org/apollo/game/model/World.java

@@ -300,7 +300,7 @@ public void register(Player player) {
 		playerRepository.add(player);
 		players.put(NameUtil.encodeBase37(username), player);
 
-		logger.finest("Registered player: " + player + " [count=" + playerRepository.size() + "]");
+		System.out.println("Registered player: " + player + " [count=" + playerRepository.size() + "]");
 	}
 
 	/**
@@ -360,7 +360,7 @@ public void unregister(final Player player) {
 		region.removeEntity(player);
 
 		playerRepository.remove(player);
-		logger.finest("Unregistered player: " + player + " [count=" + playerRepository.size() + "]");
+		System.out.println("Unregistered player: " + player + " [count=" + playerRepository.size() + "]");
 	}
 
 	/**

game/src/main/java/org/apollo/game/model/WorldConstants.java

@@ -15,7 +15,7 @@ public final class WorldConstants {
 	/**
 	 * The maximum number of players.
 	 */
-	public static final int MAXIMUM_PLAYERS = 2000;
+	public static final int MAXIMUM_PLAYERS = 2048;
 
 	/**
 	 * Default private constructor to prevent instantiation by other classes.