diff --git a/build.gradle.kts b/build.gradle.kts index 20fb97a251..74c9e1bbd8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,6 @@ buildscript { dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.1.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0") - classpath("com.openosrs:openosrs-injector:1.0.2") } } diff --git a/buildSrc/src/main/kotlin/BootstrapPlugin.kt b/buildSrc/src/main/kotlin/BootstrapPlugin.kt index 33509f96e5..27cd666f45 100644 --- a/buildSrc/src/main/kotlin/BootstrapPlugin.kt +++ b/buildSrc/src/main/kotlin/BootstrapPlugin.kt @@ -14,7 +14,7 @@ class BootstrapPlugin : Plugin { bootstrapDependencies(project(":runelite-api")) bootstrapDependencies(project(":runescape-api")) bootstrapDependencies(project(":http-api")) - bootstrapDependencies(project(":injected-client")) + bootstrapDependencies(project(":injector")) bootstrapDependencies(project(":runelite-client")) } @@ -31,7 +31,7 @@ class BootstrapPlugin : Plugin { dependsOn(project(":runelite-api").tasks["publish"]) dependsOn(project(":runescape-api").tasks["publish"]) dependsOn(project(":http-api").tasks["publish"]) - dependsOn(project(":injected-client").tasks["publish"]) + dependsOn(project(":injector").tasks["publish"]) doLast { copy { @@ -41,7 +41,7 @@ class BootstrapPlugin : Plugin { copy { from( "${buildDir}/repo/.", - "${parent?.projectDir}/injected-client/build/repo/.", + "${parent?.projectDir}/injector/build/repo/.", "${parent?.projectDir}/runelite-api/build/repo/.", "${parent?.projectDir}/http-api/build/repo/.", "${parent?.projectDir}/runescape-api/build/repo/." diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 14e30f7416..1f3fdbc528 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts deleted file mode 100644 index fd5ea8f010..0000000000 --- a/injected-client/injected-client.gradle.kts +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2019 ThatGamerBlue - * Copyright (c) 2019 Owain van Brakel - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -apply() - -description = "Injected Client" - -plugins { - id("com.openosrs.injector") -} - -val vanillaDep by configurations.creating -val rsapiDep by configurations.creating -val rsclientDep by configurations.creating -val mixinsDep by configurations.creating -val combined by configurations.creating { - extendsFrom(rsapiDep, rsclientDep, mixinsDep, vanillaDep) - isCanBeResolved = true - isCanBeConsumed = false -} - -configurations { - all { - isTransitive = false - } -} - -dependencies { - vanillaDep(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) - rsapiDep(project(":runescape-api")) - rsclientDep(project(":runescape-client")) - mixinsDep(project(":runelite-mixins")) -} - -injector { - mixins.set(mixinsDep.singleFile) - rsapi.set(rsapiDep.singleFile) - rsclient.set(rsclientDep.singleFile) - vanilla.set(vanillaDep.singleFile) -} - -// keep the sourcesets etc but remove useless tasks -tasks { - inject { - dependsOn(combined) - } - classes { - enabled = false - } - compileJava { - enabled = false - } - jar { - enabled = false - } - processResources { - enabled = false - } -} diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts new file mode 100644 index 0000000000..c583b5b59e --- /dev/null +++ b/injector/injector.gradle.kts @@ -0,0 +1,44 @@ +import ProjectVersions.rsversion + +group = "com.openosrs" +version = 1.0 + +repositories { + mavenCentral() + mavenLocal() + maven { + url = uri("https://repo.runelite.net") + url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master") + url = uri("https://repo.openosrs.com/repository/maven") + } +} + +plugins { + java +} + +dependencies { + implementation(gradleApi()) + annotationProcessor("org.projectlombok:lombok:1.18.12") + compileOnly("org.projectlombok:lombok:1.18.12") + + implementation("org.ow2.asm:asm:8.0.1") + implementation("org.ow2.asm:asm-util:8.0.1") + implementation("org.jetbrains:annotations:19.0.0") + implementation("com.google.guava:guava:29.0-jre") + implementation(project(":deobfuscator")) + implementation(project(":runescape-api")) + implementation(project(":runescape-client")) + implementation(project(":runelite-mixins")) +} + +tasks.register("inject") { + main = "com.openosrs.injector.Injector" + classpath = sourceSets["main"].runtimeClasspath +} + +tasks { + build { + finalizedBy("inject") + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java b/injector/src/main/java/com/openosrs/injector/InjectException.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java rename to injector/src/main/java/com/openosrs/injector/InjectException.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java b/injector/src/main/java/com/openosrs/injector/InjectUtil.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java rename to injector/src/main/java/com/openosrs/injector/InjectUtil.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java b/injector/src/main/java/com/openosrs/injector/Injector.java similarity index 76% rename from openosrs-injector/src/main/java/com/openosrs/injector/Injection.java rename to injector/src/main/java/com/openosrs/injector/Injector.java index bf004f8b89..20cae0034a 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -11,7 +11,6 @@ import com.openosrs.injector.injection.InjectData; import com.openosrs.injector.injection.InjectTaskHandler; import com.openosrs.injector.injectors.CreateAnnotations; import com.openosrs.injector.injectors.InjectConstruct; -import com.openosrs.injector.injectors.Injector; import com.openosrs.injector.injectors.InterfaceInjector; import com.openosrs.injector.injectors.MixinInjector; import com.openosrs.injector.injectors.RSApiInjector; @@ -28,15 +27,14 @@ import com.openosrs.injector.transformers.SourceChanger; import java.io.File; import java.io.IOException; import net.runelite.deob.util.JarUtil; -import org.gradle.api.file.FileTree; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; -public class Injection extends InjectData implements InjectTaskHandler +public class Injector extends InjectData implements InjectTaskHandler { - private static final Logger log = Logging.getLogger(Injection.class); + private static final Logger log = Logging.getLogger(Injector.class); - public Injection(File vanilla, File rsclient, File mixins, FileTree rsapi) throws IOException + public Injector(File vanilla, File rsclient, File mixins, File[] rsapi) throws IOException { super( JarUtil.loadJar(vanilla), @@ -44,6 +42,28 @@ public class Injection extends InjectData implements InjectTaskHandler JarUtil.loadJar(mixins), new RSApi(rsapi) ); + inject(); + save(new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.jar")); + } + + public static void main(String[] args) + { + try + { + args = new String[] + { + "./vanilla.jar", + "../runescape-client/build/libs/runescape-client-3.5.4.jar", + "../runelite-mixins/build/libs/runelite-mixins-3.5.4.jar", + "../runescape-api/build/classes/java/main/net/runelite/rs/api/" + }; + new Injector(new File(args[0]), new File(args[1]), new File(args[2]), new File(args[3]).listFiles()); + } + catch (Exception e) + { + e.printStackTrace(); + } + } public void inject() @@ -93,7 +113,7 @@ public class Injection extends InjectData implements InjectTaskHandler JarUtil.saveJar(this.getVanilla(), outputJar); } - private void inject(Injector injector) + private void inject(com.openosrs.injector.injectors.Injector injector) { final String name = injector.getName(); @@ -132,7 +152,7 @@ public class Injection extends InjectData implements InjectTaskHandler log.lifecycle("{} {}", name, transformer.getCompletionMsg()); } - public void runChildInjector(Injector injector) + public void runChildInjector(com.openosrs.injector.injectors.Injector injector) { inject(injector); } diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java b/injector/src/main/java/com/openosrs/injector/InjectorValidator.java similarity index 96% rename from openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java rename to injector/src/main/java/com/openosrs/injector/InjectorValidator.java index d97aca000c..1e3bc6b739 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java +++ b/injector/src/main/java/com/openosrs/injector/InjectorValidator.java @@ -69,7 +69,7 @@ public class InjectorValidator implements Validator if (clazz.findMethodDeep(apiMethod.getName(), apiMethod.getSignature()) == null) { - log.warn("[WARN] Class {} implements interface {} but doesn't implement {}", + log.error("[WARN] Class {} implements interface {} but doesn't implement {}", clazz.getPoolClass(), apiClass.getClazz(), apiMethod.getMethod()); ++missing; } diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/Validator.java b/injector/src/main/java/com/openosrs/injector/Validator.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/Validator.java rename to injector/src/main/java/com/openosrs/injector/Validator.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java b/injector/src/main/java/com/openosrs/injector/injection/InjectData.java similarity index 98% rename from openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java rename to injector/src/main/java/com/openosrs/injector/injection/InjectData.java index bac8b3e2f6..28c763aec0 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java +++ b/injector/src/main/java/com/openosrs/injector/injection/InjectData.java @@ -23,7 +23,7 @@ import net.runelite.asm.Type; import net.runelite.asm.signature.Signature; /** - * Abstract class meant as the interface of {@link com.openosrs.injector.Injection injection} for injectors + * Abstract class meant as the interface of {@link com.openosrs.injector.Injector injection} for injectors */ public abstract class InjectData { @@ -96,6 +96,7 @@ public abstract class InjectData */ public ClassFile toVanilla(ClassFile deobClass) { + return toVanilla.get(deobClass); } diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java b/injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java rename to injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java rename to injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java b/injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java rename to injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java rename to injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java rename to injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java b/injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java rename to injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java b/injector/src/main/java/com/openosrs/injector/injectors/Injector.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java rename to injector/src/main/java/com/openosrs/injector/injectors/Injector.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java similarity index 93% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java rename to injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java index ea861ad437..5e12bd4c00 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java +++ b/injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java @@ -43,7 +43,7 @@ public class InterfaceInjector extends AbstractInjector final String fullName = API_BASE + impls; if (!inject.getRsApi().hasClass(fullName)) { - log.debug("[DEBUG] Class {} implements nonexistent interface {}, skipping interface injection", + log.error("[DEBUG] Class {} implements nonexistent interface {}, skipping interface injection", deobCf.getName(), fullName ); @@ -52,6 +52,7 @@ public class InterfaceInjector extends AbstractInjector } final Interfaces interfaces = vanillaCf.getInterfaces(); + System.out.println(fullName); interfaces.addInterface(new Class(fullName)); implemented++; diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java rename to injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java b/injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java rename to injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java b/injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java rename to injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java rename to injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java rename to injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java b/injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java rename to injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java similarity index 98% rename from openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java rename to injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java index 3e9bbae3c9..76848ca46b 100644 --- a/openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java +++ b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java @@ -40,7 +40,7 @@ public class RSApi implements Iterable private ImmutableMap map; - public RSApi(FileTree classes) + public RSApi(File[] classes) { for (File file : classes) { diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java rename to injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java rename to injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java b/injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java rename to injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java b/injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java similarity index 100% rename from openosrs-injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java rename to injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java diff --git a/openosrs-injector/.gitignore b/openosrs-injector/.gitignore deleted file mode 100644 index 883f2555e2..0000000000 --- a/openosrs-injector/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build/ -/.gradle/ -/.idea/ diff --git a/openosrs-injector/LICENSE b/openosrs-injector/LICENSE deleted file mode 100644 index f288702d2f..0000000000 --- a/openosrs-injector/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/openosrs-injector/gradle/wrapper/gradle-wrapper.jar b/openosrs-injector/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 62d4c05355..0000000000 Binary files a/openosrs-injector/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/openosrs-injector/gradle/wrapper/gradle-wrapper.properties b/openosrs-injector/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 622ab64a3c..0000000000 --- a/openosrs-injector/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/openosrs-injector/gradlew b/openosrs-injector/gradlew deleted file mode 100644 index fbd7c51583..0000000000 --- a/openosrs-injector/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/openosrs-injector/gradlew.bat b/openosrs-injector/gradlew.bat deleted file mode 100644 index 5093609d51..0000000000 --- a/openosrs-injector/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/openosrs-injector/jitpack.yml b/openosrs-injector/jitpack.yml deleted file mode 100644 index 848b36414a..0000000000 --- a/openosrs-injector/jitpack.yml +++ /dev/null @@ -1,6 +0,0 @@ -# JitPack publishing yml - used for CI and externals -jdk: - - openjdk11 -install: - - chmod a+x ./gradlew - - ./gradlew clean build publishToMavenLocal -x test --console=plain diff --git a/openosrs-injector/openosrs-injector.gradle.kts b/openosrs-injector/openosrs-injector.gradle.kts deleted file mode 100644 index 050d9e0d0d..0000000000 --- a/openosrs-injector/openosrs-injector.gradle.kts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ - -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - id("java-gradle-plugin") - kotlin("jvm") version "1.3.72" - `maven-publish` - id("se.patrikerdes.use-latest-versions") -} - -group = "com.openosrs" -version = "1.0.2" - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://repo.runelite.net") - url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master") - url = uri("https://repo.openosrs.com/repository/maven") - } -} - -dependencies { - annotationProcessor("org.projectlombok:lombok:1.18.12") - compileOnly("org.projectlombok:lombok:1.18.12") - - implementation("org.ow2.asm:asm:8.0.1") - implementation("org.ow2.asm:asm-util:8.0.1") - implementation("org.jetbrains:annotations:19.0.0") - implementation("com.google.guava:guava:29.0-jre") - implementation(project(":deobfuscator")) - - testCompileOnly(project(":injection-annotations")) - testImplementation("junit:junit:4.13") -} - -gradlePlugin { - plugins { - create("injectorPlugin") { - id = "com.openosrs.injector" - implementationClass = "com.openosrs.injector.InjectPlugin" - } - } -} - -configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = "1.8" -} - -val compileTestKotlin: KotlinCompile by tasks -compileTestKotlin.kotlinOptions { - jvmTarget = "1.8" -} - -val sourcesJar by tasks.registering(Jar::class) { - archiveClassifier.set("sources") - from(sourceSets.main.get().allSource) -} - -publishing { - repositories { - mavenLocal() - } -} diff --git a/openosrs-injector/src/main/kotlin/com/openosrs/injector/Inject.kt b/openosrs-injector/src/main/kotlin/com/openosrs/injector/Inject.kt deleted file mode 100644 index 82b6c132bd..0000000000 --- a/openosrs-injector/src/main/kotlin/com/openosrs/injector/Inject.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector - -import com.openosrs.injector.injection.InjectTaskHandler -import org.gradle.api.DefaultTask -import org.gradle.api.file.RegularFileProperty -import org.gradle.api.tasks.CacheableTask -import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction - -@CacheableTask -abstract class Inject : DefaultTask() { - @get:Nested - abstract val extension: InjectExtension - - @get:OutputFile - abstract val output: RegularFileProperty - - @TaskAction - fun inject() { - val vanilla = extension.vanilla.get().asFile - val rsclient = extension.rsclient.get().asFile - val mixins = extension.mixins.get().asFile - val rsapi = project.zipTree(extension.rsapi) - - val injector: InjectTaskHandler = Injection(vanilla, rsclient, mixins, rsapi) - - injector.inject() - - injector.save(output.get().asFile) - } -} \ No newline at end of file diff --git a/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectExtension.kt b/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectExtension.kt deleted file mode 100644 index efbb9b74ac..0000000000 --- a/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectExtension.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector - -import org.gradle.api.file.RegularFileProperty -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.PathSensitive -import org.gradle.api.tasks.PathSensitivity - -interface InjectExtension { - @get:[InputFile PathSensitive(PathSensitivity.NONE)] - val vanilla: RegularFileProperty - - @get:[InputFile PathSensitive(PathSensitivity.NONE)] - val rsclient: RegularFileProperty - - @get:[InputFile PathSensitive(PathSensitivity.NONE)] - val mixins: RegularFileProperty - - @get:[InputFile PathSensitive(PathSensitivity.NONE)] - val rsapi: RegularFileProperty -} - diff --git a/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectPlugin.kt b/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectPlugin.kt deleted file mode 100644 index 803ec5fdb8..0000000000 --- a/openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectPlugin.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector - -import org.gradle.api.Plugin -import org.gradle.api.Project - -class InjectPlugin : Plugin { - override fun apply(project: Project) { - with(project) { - val task = tasks.create("inject", Inject::class.java) - task.output.convention { file("$buildDir/libs/$name-$version.jar") } - - artifacts { - it.add("runtimeElements", task.output) - } - - tasks.getByName("assemble") { - it.finalizedBy("inject") - } - - extensions.add(InjectExtension::class.java, "injector", task.extension) - } - } -} \ No newline at end of file diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/TestInjection.java b/openosrs-injector/src/test/java/com/openosrs/injector/TestInjection.java deleted file mode 100644 index 14631cb59d..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/TestInjection.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector; - -import com.openosrs.injector.injection.InjectData; -import com.openosrs.injector.injectors.Injector; -import com.openosrs.injector.rsapi.RSApi; -import net.runelite.asm.ClassGroup; - -public class TestInjection extends InjectData -{ - public TestInjection(ClassGroup vanilla, ClassGroup deobfuscated, ClassGroup mixins, RSApi rsApi) - { - super(vanilla, deobfuscated, mixins, rsApi); - } - - @Override - public void runChildInjector(Injector injector) throws InjectException - { - injector.inject(); - } -} diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/injectors/MixinInjectorTest.java b/openosrs-injector/src/test/java/com/openosrs/injector/injectors/MixinInjectorTest.java deleted file mode 100644 index fa8b3fd556..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/injectors/MixinInjectorTest.java +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.openosrs.injector.injectors; - -import com.google.common.io.ByteStreams; -import com.openosrs.injector.TestInjection; -import com.openosrs.injector.rsapi.RSApi; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import javax.inject.Provider; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import static net.runelite.asm.Type.INT; -import net.runelite.asm.attributes.code.Instruction; -import net.runelite.asm.attributes.code.instructions.GetStatic; -import net.runelite.asm.attributes.code.instructions.IMul; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.attributes.code.instructions.LDC; -import net.runelite.asm.signature.Signature; -import net.runelite.asm.visitors.ClassFileVisitor; -import net.runelite.deob.util.JarUtil; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import org.junit.Test; -import org.objectweb.asm.ClassReader; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; - -@ObfuscatedName("com/openosrs/injector/injectors/VanillaTarget") -class DeobTarget -{ - @ObfuscatedName("ob_foo4") - @ObfuscatedGetter(intValue = 1157381415) - static int foo4; - - @ObfuscatedName("ob_foo3") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "123" - ) - private void foo3() - { - // De-obfuscated foo3 - System.out.println("foo3"); - } -} - -class VanillaTarget -{ - static int ob_foo4; - - private void ob_foo3(int garbageValue) - { - // Obfuscated foo3 - if (garbageValue != 123) - { - return; - } - System.out.println("foo3"); - } -} - -abstract class Source -{ - @net.runelite.api.mixins.Inject - private static int foo; - @Shadow("foo4") - private static int foo4; - - @net.runelite.api.mixins.Inject - private void foo2() - { - } - - @Copy("foo3") - @Replace("foo3") - private void copy$foo3() - { - System.out.println("replaced"); - System.out.println(foo4); - copy$foo3(); - } -} - -// Test shadowing the "foo" field injected by Source -abstract class Source2 -{ - @Shadow("foo") - private static int foo; - - @net.runelite.api.mixins.Inject - private void foo5() - { - System.out.println(foo); - } -} - -public class MixinInjectorTest -{ - @Test - public void testInject() throws Exception - { - InputStream deobIn = getClass().getResourceAsStream("DeobTarget.class"); - ClassFile deobTarget = JarUtil.loadClass(ByteStreams.toByteArray(deobIn)); - - ClassGroup deob = new ClassGroup(); - deob.addClass(deobTarget); - - InputStream vanillaIn = getClass().getResourceAsStream("VanillaTarget.class"); - ClassFile vanillaTarget = JarUtil.loadClass(ByteStreams.toByteArray(vanillaIn)); - - ClassGroup vanilla = new ClassGroup(); - vanilla.addClass(vanillaTarget); - - Map, List> mixinClasses = new HashMap<>(); - mixinClasses.put(() -> loadClass(Source.class), Collections.singletonList(vanillaTarget)); - mixinClasses.put(() -> loadClass(Source2.class), Collections.singletonList(vanillaTarget)); - - TestInjection inject = new TestInjection(vanilla, deob, new ClassGroup(), new RSApi()); - new MixinInjector(inject).inject(mixinClasses); - - // Check if "foo" has been injected - Field foo = vanillaTarget.findField("foo"); - assertNotNull(foo); - assertEquals(INT, foo.getType()); - assertEquals(ACC_PUBLIC | ACC_STATIC, foo.getAccessFlags()); - - // Check if "foo2()V" has been injected - Method foo2 = vanillaTarget.findMethod("foo2"); - assertNotNull(foo2); - assertEquals(new Signature("()V"), foo2.getDescriptor()); - assertEquals(ACC_PUBLIC, foo2.getAccessFlags()); - - // Check if "ob_foo3(I)V" was copied - Method foo3 = vanillaTarget.findMethod("copy$foo3"); - assertNotNull(foo3); - assertEquals(new Signature("(I)V"), foo3.getDescriptor()); - assertEquals(ACC_PUBLIC, foo3.getAccessFlags()); - - // Check if "ob_foo3(I)V" was replaced - Method ob_foo3 = vanillaTarget.findMethod("ob_foo3"); - assertNotNull(ob_foo3); - assertEquals(new Signature("(I)V"), ob_foo3.getDescriptor()); - assertEquals(ob_foo3 - .getCode() - .getInstructions() - .getInstructions() - .stream() - .filter(i -> i instanceof LDC && ((LDC) i).getConstant().equals("replaced")) - .count(), 1); - // Check that the "foo4" field access in the new code body was mapped correctly - assertEquals(ob_foo3 - .getCode() - .getInstructions() - .getInstructions() - .stream() - .filter(i -> - { - if (!(i instanceof GetStatic)) - { - return false; - } - - net.runelite.asm.pool.Field field = ((GetStatic) i).getField(); - - if (!field.getClazz().getName().equals("com/openosrs/injector/injectors/VanillaTarget")) - { - return false; - } - - if (!field.getName().equals("ob_foo4")) - { - return false; - } - - return true; - }) - .count(), 1); - - assert getStaticHasGetter(ob_foo3, "ob_foo4"); - // Check that the "foo3()" call in the new code body was mapped to the copy - assertEquals(ob_foo3 - .getCode() - .getInstructions() - .getInstructions() - .stream() - .filter(i -> - { - if (!(i instanceof InvokeVirtual)) - { - return false; - } - - net.runelite.asm.pool.Method method = ((InvokeVirtual) i).getMethod(); - - if (!method.getClazz().getName().equals("com/openosrs/injector/injectors/VanillaTarget")) - { - return false; - } - - if (!method.getName().equals("copy$foo3")) - { - return false; - } - - return true; - }) - .count(), 1); - - // Check if "foo5()V" was injected - Method foo5 = vanillaTarget.findMethod("foo5"); - assertNotNull(foo5); - assertEquals(new Signature("()V"), foo5.getDescriptor()); - assertEquals(ACC_PUBLIC, foo5.getAccessFlags()); - // Check that the shadow "foo" field access was mapped correctly - assertEquals(foo5 - .getCode() - .getInstructions() - .getInstructions() - .stream() - .filter(i -> - { - if (!(i instanceof GetStatic)) - { - return false; - } - - net.runelite.asm.pool.Field field = ((GetStatic) i).getField(); - - if (!field.getClazz().getName().equals("com/openosrs/injector/injectors/VanillaTarget")) - { - return false; - } - - if (!field.getName().equals("foo")) - { - return false; - } - - return true; - }) - .count(), 1); - } - - private boolean getStaticHasGetter(Method ob_foo3, String gottenField) - { - ListIterator it = ob_foo3.getCode().getInstructions().listIterator(); - Instruction i; - while (it.hasNext() && - !((i = it.next()) instanceof GetStatic && - ((GetStatic) i).getField().getName().equals(gottenField))) - { - ; - } - - return - (i = it.next()) instanceof LDC && - ((LDC) i).getConstantAsInt() == 1157381415 && - it.next() instanceof IMul; - } - - private static ClassFile loadClass(Class clazz) - { - try (InputStream is = clazz.getClassLoader().getResourceAsStream(clazz.getName().replace('.', '/') + ".class")) - { - ClassReader reader = new ClassReader(is); - ClassFileVisitor cv = new ClassFileVisitor(); - - reader.accept(cv, 0); - - return cv.getClassFile(); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } -} diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/injectors/raw/DrawMenuTest.java b/openosrs-injector/src/test/java/com/openosrs/injector/injectors/raw/DrawMenuTest.java deleted file mode 100644 index 402939575e..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/injectors/raw/DrawMenuTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2019, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector.injectors.raw; - -import com.google.common.io.ByteStreams; -import com.openosrs.injector.TestInjection; -import com.openosrs.injector.injection.InjectData; -import com.openosrs.injector.rsapi.RSApi; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.deob.util.JarUtil; -import org.junit.Test; - -public class DrawMenuTest -{ - @Test - public void test160() throws Exception - { - // 160 has both drawMenu and drawTopLeftText inlined - ClassFile deobClient = JarUtil.loadClass(ByteStreams.toByteArray(getClass().getResourceAsStream("/drawafterwidgets/Client_deob160.class"))); - ClassFile obClient = JarUtil.loadClass(ByteStreams.toByteArray(getClass().getResourceAsStream("/drawafterwidgets/Client_ob160.class"))); - - ClassGroup van = new ClassGroup(); - van.addClass(obClient); - ClassGroup deob = new ClassGroup(); - deob.addClass(deobClient); - - InjectData inject = new TestInjection(van, deob, new ClassGroup(), new RSApi()); - - new DrawMenu(inject).inject(); - } - - @Test - public void test180() throws Exception - { - // 180 has only drawMenu inlined - ClassFile deobClient = JarUtil.loadClass(ByteStreams.toByteArray(getClass().getResourceAsStream("/drawafterwidgets/Client_deob180.class"))); - ClassFile obClient = JarUtil.loadClass(ByteStreams.toByteArray(getClass().getResourceAsStream("/drawafterwidgets/Client_ob180.class"))); - - ClassGroup van = new ClassGroup(); - van.addClass(obClient); - ClassGroup deob = new ClassGroup(); - deob.addClass(deobClient); - - InjectData inject = new TestInjection(van, deob, new ClassGroup(), new RSApi()); - - new DrawMenu(inject).inject(); - } -} diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/SourceChangerTest.java b/openosrs-injector/src/test/java/com/openosrs/injector/transformers/SourceChangerTest.java deleted file mode 100644 index dee0cbdec5..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/SourceChangerTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2020, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector.transformers; - -import com.openosrs.injector.InjectException; -import com.openosrs.injector.injection.InjectData; -import com.openosrs.injector.injectors.Injector; -import com.openosrs.injector.transformers.srcchangeclasses.NewName; -import com.openosrs.injector.transformers.srcchangeclasses.OldName; -import java.lang.invoke.MethodHandles; -import java.util.function.BiConsumer; -import net.runelite.asm.ClassFile; -import net.runelite.asm.ClassGroup; -import net.runelite.asm.objectwebasm.NonloadingClassWriter; -import net.runelite.asm.visitors.ClassFileVisitor; -import org.junit.Ignore; -import org.junit.Test; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; - -public class SourceChangerTest -{ - private static final String PACKAGE = "com.openosrs.injector.transformers.srcchangeclasses."; - - @Test - @Ignore // Ignored because it's not really testing anything atm, but it works! - public void test() throws Exception - { - final ClassFileVisitor deob = new ClassFileVisitor(), vann = new ClassFileVisitor(); - new ClassReader(PACKAGE + "NewName").accept(deob, ClassReader.SKIP_FRAMES); - new ClassReader(PACKAGE + "OldName").accept(vann, ClassReader.SKIP_FRAMES); - - new SourceChanger( - new InjectData(new ClassGroup(), new ClassGroup(), null, null) - { - public void runChildInjector(Injector injector) throws InjectException - { - } - - @Override - public void forEachPair(BiConsumer consumer) - { - consumer.accept(deob.getClassFile(), vann.getClassFile()); - } - }).transformImpl(); - - final ClassGroup group = new ClassGroup(); - group.addClass(vann.getClassFile()); - - final ClassWriter cw = new NonloadingClassWriter(group, 0); - vann.getClassFile().accept(cw); - - OldName obj = (OldName) MethodHandles.privateLookupIn( - NewName.class, - MethodHandles.lookup()) - .defineClass(cw.toByteArray()) - .getDeclaredConstructor() - .newInstance(); - - obj.obfMethodName(); - } -} diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/NewName.java b/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/NewName.java deleted file mode 100644 index 7578ed7812..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/NewName.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2020, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector.transformers.srcchangeclasses; - -public class NewName -{ - public void deobMethodName() - { - // do something interesting - } -} diff --git a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/OldName.java b/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/OldName.java deleted file mode 100644 index b8adde516c..0000000000 --- a/openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/OldName.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2020, Lucas - * All rights reserved. - * - * This code is licensed under GPL3, see the complete license in - * the LICENSE file in the root directory of this source tree. - */ -package com.openosrs.injector.transformers.srcchangeclasses; - -public class OldName -{ - public void obfMethodName() - { - new RuntimeException().printStackTrace(); - } -} diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob160.class b/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob160.class deleted file mode 100644 index f0248c3985..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob160.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob180.class b/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob180.class deleted file mode 100644 index a2fc0dfbee..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Client_deob180.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob160.class b/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob160.class deleted file mode 100644 index 2058173233..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob160.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob180.class b/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob180.class deleted file mode 100644 index 913f307f74..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Client_ob180.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob160.class b/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob160.class deleted file mode 100644 index 5cfe67d121..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob160.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob180.class b/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob180.class deleted file mode 100644 index 0f2cbce685..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob180.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob160.class b/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob160.class deleted file mode 100644 index b29703e7ce..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob160.class and /dev/null differ diff --git a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob180.class b/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob180.class deleted file mode 100644 index 0ef73dbecc..0000000000 Binary files a/openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob180.class and /dev/null differ diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index b7e4b59f80..3f47b98642 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -85,7 +85,6 @@ dependencies { implementation(group = "net.runelite.jogl", name = "jogl-all", version = "2.4.0-rc-20200429") runtimeOnly(group = "org.pushing-pixels", name = "radiance-trident", version = "2.5.1") - runtimeOnly(project(":injected-client")) runtimeOnly(project(":runescape-api")) runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429", classifier = "natives-linux-amd64") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429", classifier = "natives-windows-amd64") @@ -127,6 +126,7 @@ tasks { } processResources { + dependsOn(":injector:build") finalizedBy("filterResources") } diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index b82a5f285a..ac3ba5507c 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -73,6 +73,7 @@ import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import org.apache.commons.io.FileUtils; @Slf4j @SuppressWarnings("deprecation") @@ -137,7 +138,12 @@ public class ClientLoader implements Supplier File jarFile = updateCheckMode == AUTO ? PATCHED_CACHE : VANILLA_CACHE; // create the classloader for the jar while we hold the lock, and eagerly load and link all classes // in the jar. Otherwise the jar can change on disk and can break future classloads. - classLoader = createJarClassLoader(new File("./injected-client/build/libs/injected-client-3.5.4.jar")); + File oprsInjected = new File(System.getProperty("user.home") + "/.openosrs/cache/injected-client.jar"); + InputStream initialStream = RuneLite.class.getResourceAsStream("injected-client.jar"); + if (oprsInjected.length() != RuneLite.class.getResource("injected-client.jar").getFile().length()) + FileUtils.copyInputStreamToFile(initialStream, oprsInjected); + + classLoader = createJarClassLoader(oprsInjected); } SplashScreen.stage(.465, "Starting", "Starting Old School RuneScape"); diff --git a/settings.gradle.kts b/settings.gradle.kts index 40e52014a1..bdb8d05f71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,20 +35,18 @@ gradleEnterprise { termsOfServiceAgree = System.getenv("SCAN_TOS_ACCEPTED")?: "no" } } - -include(":http-api") include(":cache") -include(":runelite-api") -include(":runescape-api") -include(":runescape-client") include(":deobfuscator") -include(":runelite-script-assembler-plugin") +include(":http-api") +include(":injection-annotations") +include(":injector") +include(":runelite-api") include(":runelite-client") include(":runelite-mixins") -include(":injected-client") -include(":injection-annotations") +include(":runelite-script-assembler-plugin") +include(":runescape-api") +include(":runescape-client") include(":wiki-scraper") -include(":openosrs-injector") for (project in rootProject.children) { project.apply {