From 53b7e9bd2e961210b1b3eceb5b9ca61468679074 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Fri, 3 Jan 2020 04:57:03 +0100 Subject: [PATCH] idk: Move annotations to do with injection to a seperate module for improved modularity (#2181) * Move annotations to do with injection to a seperate module for improved modularity * Remove redundant config in build script, add (c) --- .../injection-annotations.gradle.kts | 26 +++++++++++++++++++ .../java/net/runelite/api/mixins/Copy.java | 0 .../net/runelite/api/mixins/FieldHook.java | 2 +- .../java/net/runelite/api/mixins/Inject.java | 0 .../net/runelite/api/mixins/MethodHook.java | 0 .../java/net/runelite/api/mixins/Mixin.java | 0 .../java/net/runelite/api/mixins/Mixins.java | 0 .../java/net/runelite/api/mixins/Replace.java | 0 .../java/net/runelite/api/mixins/Shadow.java | 0 .../java/net/runelite/mapping/Construct.java | 0 .../java/net/runelite/mapping/Export.java | 0 .../java/net/runelite/mapping/Implements.java | 0 .../java/net/runelite/mapping/Import.java | 0 .../runelite/mapping/ObfuscatedGetter.java | 0 .../net/runelite/mapping/ObfuscatedName.java | 0 .../runelite/mapping/ObfuscatedSignature.java | 0 runelite-mixins/runelite-mixins.gradle.kts | 1 + runescape-api/runescape-api.gradle.kts | 1 + runescape-client/runescape-client.gradle.kts | 2 +- settings.gradle.kts | 2 +- 20 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 injection-annotations/injection-annotations.gradle.kts rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Copy.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/FieldHook.java (99%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Inject.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/MethodHook.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Mixin.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Mixins.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Replace.java (100%) rename {runelite-mixins => injection-annotations}/src/main/java/net/runelite/api/mixins/Shadow.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/Construct.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/Export.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/Implements.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/Import.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/ObfuscatedGetter.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/ObfuscatedName.java (100%) rename {runescape-api => injection-annotations}/src/main/java/net/runelite/mapping/ObfuscatedSignature.java (100%) diff --git a/injection-annotations/injection-annotations.gradle.kts b/injection-annotations/injection-annotations.gradle.kts new file mode 100644 index 0000000000..dbb8cfd522 --- /dev/null +++ b/injection-annotations/injection-annotations.gradle.kts @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2020, Lucas + * 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. + */ +description = "Injection/Mapping annotations" +version = "1.0" \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Copy.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Copy.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java b/injection-annotations/src/main/java/net/runelite/api/mixins/FieldHook.java similarity index 99% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/FieldHook.java index 84a0db08f0..d582f39849 100644 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java +++ b/injection-annotations/src/main/java/net/runelite/api/mixins/FieldHook.java @@ -38,4 +38,4 @@ public @interface FieldHook String value(); boolean before() default false; -} +} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Inject.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Inject.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java b/injection-annotations/src/main/java/net/runelite/api/mixins/MethodHook.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/MethodHook.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Mixin.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Mixin.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Mixins.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Mixins.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Replace.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Replace.java diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java b/injection-annotations/src/main/java/net/runelite/api/mixins/Shadow.java similarity index 100% rename from runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java rename to injection-annotations/src/main/java/net/runelite/api/mixins/Shadow.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/Construct.java b/injection-annotations/src/main/java/net/runelite/mapping/Construct.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/Construct.java rename to injection-annotations/src/main/java/net/runelite/mapping/Construct.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/Export.java b/injection-annotations/src/main/java/net/runelite/mapping/Export.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/Export.java rename to injection-annotations/src/main/java/net/runelite/mapping/Export.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/Implements.java b/injection-annotations/src/main/java/net/runelite/mapping/Implements.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/Implements.java rename to injection-annotations/src/main/java/net/runelite/mapping/Implements.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/Import.java b/injection-annotations/src/main/java/net/runelite/mapping/Import.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/Import.java rename to injection-annotations/src/main/java/net/runelite/mapping/Import.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java b/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedGetter.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/ObfuscatedGetter.java rename to injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedGetter.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedName.java b/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedName.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/ObfuscatedName.java rename to injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedName.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java b/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java similarity index 100% rename from runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java rename to injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java diff --git a/runelite-mixins/runelite-mixins.gradle.kts b/runelite-mixins/runelite-mixins.gradle.kts index 1a07f77286..e3c4c8d12c 100644 --- a/runelite-mixins/runelite-mixins.gradle.kts +++ b/runelite-mixins/runelite-mixins.gradle.kts @@ -29,6 +29,7 @@ dependencies { compileOnly(Libraries.guava) compileOnly(Libraries.javaxInject) compileOnly(Libraries.slf4jApi) + compileOnly(project(":injection-annotations")) compileOnly(project(":runescape-api")) } diff --git a/runescape-api/runescape-api.gradle.kts b/runescape-api/runescape-api.gradle.kts index 2d9532a92e..84b22d8049 100644 --- a/runescape-api/runescape-api.gradle.kts +++ b/runescape-api/runescape-api.gradle.kts @@ -28,4 +28,5 @@ description = "RuneScape API" dependencies { api(project(":runelite-api")) + api(project(":injection-annotations")) } diff --git a/runescape-client/runescape-client.gradle.kts b/runescape-client/runescape-client.gradle.kts index ccafd1e9c6..5086235694 100644 --- a/runescape-client/runescape-client.gradle.kts +++ b/runescape-client/runescape-client.gradle.kts @@ -27,7 +27,7 @@ group = "com.openosrs.rs" description = "RuneScape Client" dependencies { - implementation(project(":runescape-api")) + implementation(project(":injection-annotations")) testImplementation(Libraries.junit) testImplementation(Libraries.slf4jApi) diff --git a/settings.gradle.kts b/settings.gradle.kts index 2a63faa852..efde4679b5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -43,6 +43,7 @@ include(":runelite-script-assembler-plugin") include(":runelite-client") include(":runelite-mixins") include(":injected-client") +include("injection-annotations") include(":runelite-plugin-archetype") include(":http-service") include(":http-service-openosrs") @@ -57,4 +58,3 @@ for (project in rootProject.children) { require(buildFile.isFile) { "Project '${project.path} must have a $buildFile build script" } } } -