OSRS Integration

net/src/main/java/org/apollo/net/update/resource/WorldListResourceProvider.java

@@ -1,7 +1,5 @@
 package org.apollo.net.update.resource;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import org.apollo.util.BufferUtil;
 
 import java.io.IOException;
@@ -19,25 +17,33 @@ public boolean accept(String path) throws IOException {
 
 	@Override
 	public Optional<ByteBuffer> get(String path) throws IOException {
-		final var buf = Unpooled.buffer();
 		final var world = createWorld();
+		final var buf = ByteBuffer.allocate(Integer.BYTES + world.remaining());
 
-		buf.writeInt(world.readableBytes());
-		buf.writeBytes(world);
+		buf.putInt(world.remaining());
+		buf.put(world);
 
-		return Optional.of(buf.nioBuffer());
+		return Optional.of(buf.flip());
 	}
 
-	private ByteBuf createWorld() {
-		ByteBuf world = Unpooled.buffer();
-		world.writeShort(1); // number of worlds
-
-		world.writeShort(1); // world id
-		world.writeInt(0); // world settings
-		BufferUtil.writeString(world, "127.0.0.1"); // address
-		BufferUtil.writeString(world, "Converting Apollo"); // address
-		world.writeByte(0); // country
-		world.writeShort(2000);// number of players
-		return world;
+	private ByteBuffer createWorld() {
+		final var address = "127.0.0.1";//10
+		final var activity = "Converting Apollo";//18
+
+		ByteBuffer world = ByteBuffer.allocate(Short.BYTES + Integer.BYTES + address.length() + activity
+				.length() + Byte.BYTES + Byte.BYTES + Byte.BYTES + Short.BYTES);
+		world.putShort((short) 1); // world id
+		world.putInt(0); // world settings
+		BufferUtil.writeString(world, address); // address
+		BufferUtil.writeString(world, activity); // activity
+		world.put((byte) 0); // country
+		world.putShort((short) 2000);// number of players
+		world.flip();
+
+		ByteBuffer list = ByteBuffer.allocate(Short.BYTES + world.remaining());
+		list.putShort((short) 1); // number of worlds
+		list.put(world);
+
+		return list.flip();
 	}
 }

util/src/main/java/org/apollo/util/BufferUtil.java

@@ -112,6 +112,17 @@ public static void writeString(ByteBuf buffer, String str) {
 		buffer.writeByte(0);
 	}
 
+	/**
+	 * Writes a string to the specified {@link ByteBuf}
+	 * @param buffer
+	 * @param str
+	 */
+	public static void writeString(ByteBuffer buffer, String str) {
+		byte[] bytes = str.getBytes(StandardCharsets.ISO_8859_1);
+		buffer.put(bytes);
+		buffer.put((byte) 0);
+	}
+
 	/**
 	 * The terminator of a string.
 	 */