diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt index ce19299deb..2d7f862ee9 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt @@ -12,7 +12,6 @@ import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.FieldInsnNode import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.MethodNode -import kotlin.streams.asSequence class BufferSizeTransformer : Transformer() { private var buffer: MemberRef? = null @@ -63,7 +62,7 @@ class BufferSizeTransformer : Transformer() { private val NEW_BUFFER_MATCHER = InsnMatcher.compile("NEW DUP (SIPUSH | LDC) INVOKESPECIAL PUTSTATIC") private fun findBuffer(method: MethodNode): MemberRef? { - return GPP1_POS_MATCHER.match(method).asSequence().filter { + return GPP1_POS_MATCHER.match(method).filter { val ldc = it[0] as LdcInsnNode ldc.cst == "gpp1 pos:" }.map { diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt b/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt index 75b13282ef..eb028b15fa 100644 --- a/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt +++ b/decompiler/src/main/java/dev/openrs2/decompiler/DecompilerIo.kt @@ -1,6 +1,5 @@ package dev.openrs2.decompiler -import com.google.common.io.ByteStreams import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider import org.jetbrains.java.decompiler.main.extern.IResultSaver import java.io.Closeable @@ -22,7 +21,7 @@ class DecompilerIo(private val destination: (String) -> Path) : IBytecodeProvide } jar.getInputStream(jar.getJarEntry(internalPath)).use { - return ByteStreams.toByteArray(it) + return it.readBytes() } } diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt index 835ac27091..ddcbd178ff 100644 --- a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt +++ b/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt @@ -13,7 +13,6 @@ import org.objectweb.asm.tree.InsnNode import org.objectweb.asm.tree.MethodInsnNode import org.objectweb.asm.tree.MethodNode import org.objectweb.asm.tree.VarInsnNode -import kotlin.streams.asSequence class BitwiseOpTransformer : Transformer() { private val methodOps = mutableMapOf() @@ -38,7 +37,7 @@ class BitwiseOpTransformer : Transformer() { continue } - val match = BITWISE_OP_MATCHER.match(method).asSequence().firstOrNull() ?: continue + val match = BITWISE_OP_MATCHER.match(method).firstOrNull() ?: continue val iload0 = match[0] as VarInsnNode val iload1 = match[1] as VarInsnNode