Merge pull request open-osrs#3225 from open-osrs/update

project: Merge upstream
SWS-Dewsigner · Jun 23, 2022 · 77cb7ff · 77cb7ff
2 parents 9edd632 + 82fdbd8
commit 77cb7ff
Show file tree

Hide file tree

Showing 109 changed files with 3,456 additions and 8,313 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,6 +33,8 @@ buildscript {
     }
     dependencies {
         classpath("org.ajoberstar.grgit:grgit-core:4.1.0")
+        classpath("com.openosrs:script-assembler-plugin:1.0.0")
+        classpath("com.openosrs:injector-plugin:2.0.1")
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -25,9 +25,9 @@
 
 object ProjectVersions {
     const val launcherVersion = "3.0.0"
-    const val rlVersion = "1.8.24.2"
+    const val rlVersion = "1.8.24.3"
 
-    const val openosrsVersion = "4.31.1"
+    const val openosrsVersion = "4.31.2"
 
     const val rsversion = 206
     const val cacheversion = 165

diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
@@ -27,7 +27,8 @@
 	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files="RuntimeTypeAdapterFactory\.java" checks="[a-zA-Z0-9]*"/>
+	<suppress files="RuntimeTypeAdapterFactory\.java" checks=".*"/>
+	<suppress files="net[/\\]runelite[/\\]client[/\\]party[/\\]Party\.java" checks=".*"/>
 	<suppress files="[\\/]ScriptVarType[\./]" checks="[a-zA-Z0-9]*"/>
 	<suppress files="[\\/]RoomType[\./]" checks="[a-zA-Z0-9]*"/>
 	<suppress files="[\\/]LayoutSolver[\./]" checks="[a-zA-Z0-9]*"/>

diff --git a/...ava/com/openosrs/injector/OutputMode.java → injected-client/injected-client.gradle.kts b/...ava/com/openosrs/injector/OutputMode.java → injected-client/injected-client.gradle.kts
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, ThatGamerBlue <[email protected]>
+ * Copyright (c) 2022, Owain van Brakel <https://github.com/Owain94>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,60 @@
  * (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;
 
-public enum OutputMode
-{
-	FILES,
-	JAR
+apply<FernflowerPlugin>()
+
+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
+    }
+}