From 4ff64c95e5ba777e6a1c4264dccf2fa8bd813b38 Mon Sep 17 00:00:00 2001 From: Graham Date: Tue, 14 Jan 2020 23:36:15 +0000 Subject: [PATCH] Rename compressResources to compressNatives --- bundler/src/main/java/dev/openrs2/bundler/Bundler.kt | 4 ++-- bundler/src/main/java/dev/openrs2/bundler/Resource.kt | 4 ++-- .../java/dev/openrs2/bundler/transform/ResourceTransformer.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt index b135e670..7140a8b8 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt @@ -78,8 +78,8 @@ class Bundler @Inject constructor(publicKeyTransformer: PublicKeyTransformer) { val glPack = Resource.compressPack("jaggl.pack200", "main_file_cache.dat5", gl) val glJs5 = Resource.compressJs5("jaggl.js5", "main_file_cache.dat6", gl) - val glNatives = Resource.compressGlResources() - val miscNatives = Resource.compressMiscResources() + val glNatives = Resource.compressGlNatives() + val miscNatives = Resource.compressMiscNatives() // update checksums in the loader logger.info { "Updating checksums" } diff --git a/bundler/src/main/java/dev/openrs2/bundler/Resource.kt b/bundler/src/main/java/dev/openrs2/bundler/Resource.kt index cd801d35..83c2589a 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/Resource.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/Resource.kt @@ -91,7 +91,7 @@ class Resource( return compress(source, destination, uncompressed) } - fun compressGlResources() = listOf( + fun compressGlNatives() = listOf( // Windows i386 listOf( compressNative("jaggl_0_0.lib", "jaggl.dll", "windows-i386/jaggl.dll") @@ -125,7 +125,7 @@ class Resource( ) ) - fun compressMiscResources() = listOf( + fun compressMiscNatives() = listOf( compressNative("jagmisc_0.lib", "jagmisc.dll", "windows-i386/jagmisc.dll"), compressNative("jagmisc_1.lib", "jagmisc.dll", "windows-amd64/jagmisc.dll") ) diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt index aa9359d2..5b80a192 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt @@ -19,8 +19,8 @@ import org.objectweb.asm.tree.TypeInsnNode class ResourceTransformer( private val resources: List? = null, - private val glResources: List> = Resource.compressGlResources(), - private val miscResources: List = Resource.compressMiscResources() + private val glResources: List> = Resource.compressGlNatives(), + private val miscResources: List = Resource.compressMiscNatives() ) : Transformer() { private var glBlocks = 0 private var miscBlocks = 0