From 72a0642db3e07ddb39a8ac370c2816b0fac7a13c Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 7 Jun 2020 15:01:36 +0100 Subject: [PATCH] Rename Js5Library{Reader,Writer} to PackClassLibrary{Reader,Writer} JS5 seems to refer to many things, so I'm intending to name Jagex's custom class file format "packclass" instead of "js5". My reasoning is that the tool for unpacking it is called unpackclass. If you use the same logic behind naming the Pack200 packer unpack200, then "packclass" is a reasonable name for Jagex's class file format. Signed-off-by: Graham --- .../io/{Js5LibraryReader.kt => PackClassLibraryReader.kt} | 2 +- .../io/{Js5LibraryWriter.kt => PackClassLibraryWriter.kt} | 2 +- bundler/src/main/java/dev/openrs2/bundler/Bundler.kt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename asm/src/main/java/dev/openrs2/asm/io/{Js5LibraryReader.kt => PackClassLibraryReader.kt} (81%) rename asm/src/main/java/dev/openrs2/asm/io/{Js5LibraryWriter.kt => PackClassLibraryWriter.kt} (84%) diff --git a/asm/src/main/java/dev/openrs2/asm/io/Js5LibraryReader.kt b/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt similarity index 81% rename from asm/src/main/java/dev/openrs2/asm/io/Js5LibraryReader.kt rename to asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt index a2b337f35b..94d8bb7d53 100644 --- a/asm/src/main/java/dev/openrs2/asm/io/Js5LibraryReader.kt +++ b/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryReader.kt @@ -3,7 +3,7 @@ package dev.openrs2.asm.io import dev.openrs2.asm.classpath.Library import java.io.InputStream -object Js5LibraryReader : LibraryReader { +object PackClassLibraryReader : LibraryReader { override fun read(input: InputStream): Library { // TODO(gpe): implement return Library() diff --git a/asm/src/main/java/dev/openrs2/asm/io/Js5LibraryWriter.kt b/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt similarity index 84% rename from asm/src/main/java/dev/openrs2/asm/io/Js5LibraryWriter.kt rename to asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt index bea7a99a37..0879e8d948 100644 --- a/asm/src/main/java/dev/openrs2/asm/io/Js5LibraryWriter.kt +++ b/asm/src/main/java/dev/openrs2/asm/io/PackClassLibraryWriter.kt @@ -4,7 +4,7 @@ import dev.openrs2.asm.classpath.ClassPath import dev.openrs2.asm.classpath.Library import java.io.OutputStream -object Js5LibraryWriter : LibraryWriter { +object PackClassLibraryWriter : LibraryWriter { override fun write(output: OutputStream, classPath: ClassPath, library: Library) { // TODO(gpe): implement } diff --git a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt index d25a913ec0..30fa9ddb2d 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt @@ -5,10 +5,10 @@ import dev.openrs2.asm.classpath.ClassPath import dev.openrs2.asm.classpath.Library import dev.openrs2.asm.io.JarLibraryReader import dev.openrs2.asm.io.JarLibraryWriter -import dev.openrs2.asm.io.Js5LibraryWriter import dev.openrs2.asm.io.ManifestJarLibraryWriter import dev.openrs2.asm.io.Pack200LibraryReader import dev.openrs2.asm.io.Pack200LibraryWriter +import dev.openrs2.asm.io.PackClassLibraryWriter import dev.openrs2.asm.io.SignedJarLibraryWriter import dev.openrs2.asm.transform.Transformer import dev.openrs2.bundler.transform.ResourceTransformer @@ -85,19 +85,19 @@ class Bundler @Inject constructor( "runescape.pack200", "main_file_cache.dat0", classPath, client, Pack200LibraryWriter ) val clientJs5 = Resource.compressLibrary( - "runescape.js5", "main_file_cache.dat1", classPath, client, Js5LibraryWriter + "runescape.js5", "main_file_cache.dat1", classPath, client, PackClassLibraryWriter ) val glClientPack = Resource.compressLibrary( "runescape_gl.pack200", "main_file_cache.dat3", glClassPath, glClient, Pack200LibraryWriter ) val glClientJs5 = Resource.compressLibrary( - "runescape_gl.js5", "main_file_cache.dat4", glClassPath, glClient, Js5LibraryWriter + "runescape_gl.js5", "main_file_cache.dat4", glClassPath, glClient, PackClassLibraryWriter ) val glPack = Resource.compressLibrary( "jaggl.pack200", "main_file_cache.dat5", glClassPath, gl, Pack200LibraryWriter ) val glJs5 = Resource.compressLibrary( - "jaggl.js5", "main_file_cache.dat6", glClassPath, gl, Js5LibraryWriter + "jaggl.js5", "main_file_cache.dat6", glClassPath, gl, PackClassLibraryWriter ) val glNatives = Resource.compressGlNatives()