diff --git a/cache/pom.xml b/cache/pom.xml index 999d5a0a5c..74e2ea5128 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -59,11 +59,6 @@ com.google.code.gson gson - - io.netty - netty-buffer - 4.1.0.Final - org.antlr antlr4-runtime diff --git a/cache/src/main/java/net/runelite/cache/util/Xtea.java b/cache/src/main/java/net/runelite/cache/util/Xtea.java index c79dc5a511..d970979e50 100644 --- a/cache/src/main/java/net/runelite/cache/util/Xtea.java +++ b/cache/src/main/java/net/runelite/cache/util/Xtea.java @@ -24,8 +24,8 @@ */ package net.runelite.cache.util; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import net.runelite.cache.io.InputStream; +import net.runelite.cache.io.OutputStream; public class Xtea { @@ -42,13 +42,13 @@ public class Xtea public byte[] encrypt(byte[] data, int len) { - ByteBuf buf = Unpooled.wrappedBuffer(data, 0, len); - ByteBuf out = Unpooled.buffer(len); + InputStream in = new InputStream(data); + OutputStream out = new OutputStream(len); int numBlocks = len / 8; for (int block = 0; block < numBlocks; ++block) { - int v0 = buf.readInt(); - int v1 = buf.readInt(); + int v0 = in.readInt(); + int v1 = in.readInt(); int sum = 0; for (int i = 0; i < ROUNDS; ++i) { @@ -59,19 +59,19 @@ public class Xtea out.writeInt(v0); out.writeInt(v1); } - out.writeBytes(buf); - return out.array(); + out.writeBytes(in.getRemaining()); + return out.flip(); } public byte[] decrypt(byte[] data, int len) { - ByteBuf buf = Unpooled.wrappedBuffer(data, 0, len); - ByteBuf out = Unpooled.buffer(len); + InputStream in = new InputStream(data); + OutputStream out = new OutputStream(len); int numBlocks = len / 8; for (int block = 0; block < numBlocks; ++block) { - int v0 = buf.readInt(); - int v1 = buf.readInt(); + int v0 = in.readInt(); + int v1 = in.readInt(); int sum = GOLDEN_RATIO * ROUNDS; for (int i = 0; i < ROUNDS; ++i) { @@ -82,7 +82,7 @@ public class Xtea out.writeInt(v0); out.writeInt(v1); } - out.writeBytes(buf); - return out.array(); + out.writeBytes(in.getRemaining()); + return out.flip(); } }