diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts index c583b5b59e..672d0aa4e7 100644 --- a/injector/injector.gradle.kts +++ b/injector/injector.gradle.kts @@ -3,21 +3,15 @@ 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") - } -} +val vanillaDep: Configuration by configurations.creating plugins { java } dependencies { + vanillaDep(group = "net.runelite.rs", name = "vanilla", version = rsversion.toString()) + implementation(gradleApi()) annotationProcessor("org.projectlombok:lombok:1.18.12") compileOnly("org.projectlombok:lombok:1.18.12") @@ -35,6 +29,7 @@ dependencies { tasks.register("inject") { main = "com.openosrs.injector.Injector" classpath = sourceSets["main"].runtimeClasspath + args(vanillaDep.singleFile) } tasks { @@ -42,3 +37,4 @@ tasks { finalizedBy("inject") } } + diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index 20cae0034a..a77d694dd2 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -52,7 +52,7 @@ public class Injector extends InjectData implements InjectTaskHandler { args = new String[] { - "./vanilla.jar", + args[0], "../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/" diff --git a/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java index 76848ca46b..103e1619ad 100644 --- a/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java +++ b/injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java @@ -21,7 +21,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import net.runelite.asm.Type; import net.runelite.asm.pool.Class; -import org.gradle.api.file.FileTree; import org.jetbrains.annotations.NotNull; import org.objectweb.asm.ClassReader;