Rename compress<x>Resources to compress<x>Natives

bzip2
Graham 5 years ago
parent 575632413a
commit 4ff64c95e5
  1. 4
      bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
  2. 4
      bundler/src/main/java/dev/openrs2/bundler/Resource.kt
  3. 4
      bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.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" }

@ -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")
)

@ -19,8 +19,8 @@ import org.objectweb.asm.tree.TypeInsnNode
class ResourceTransformer(
private val resources: List<Resource>? = null,
private val glResources: List<List<Resource>> = Resource.compressGlResources(),
private val miscResources: List<Resource> = Resource.compressMiscResources()
private val glResources: List<List<Resource>> = Resource.compressGlNatives(),
private val miscResources: List<Resource> = Resource.compressMiscNatives()
) : Transformer() {
private var glBlocks = 0
private var miscBlocks = 0

Loading…
Cancel
Save