From 67f4cf10bb04e87f02f8e6eaf383b26d1c95ad10 Mon Sep 17 00:00:00 2001 From: TheRealNull Date: Wed, 23 Dec 2020 11:58:48 -0500 Subject: [PATCH] injector: don't use hard-coded versions in main --- injector/injector.gradle.kts | 3 ++- injector/src/main/java/com/openosrs/injector/Injector.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts index 672d0aa4e7..79e4cfc2c0 100644 --- a/injector/injector.gradle.kts +++ b/injector/injector.gradle.kts @@ -1,3 +1,4 @@ +import ProjectVersions.openosrsVersion import ProjectVersions.rsversion group = "com.openosrs" @@ -29,7 +30,7 @@ dependencies { tasks.register("inject") { main = "com.openosrs.injector.Injector" classpath = sourceSets["main"].runtimeClasspath - args(vanillaDep.singleFile) + args(vanillaDep.singleFile, openosrsVersion) } tasks { diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index a77d694dd2..57615de54d 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -53,8 +53,8 @@ public class Injector extends InjectData implements InjectTaskHandler args = new String[] { args[0], - "../runescape-client/build/libs/runescape-client-3.5.4.jar", - "../runelite-mixins/build/libs/runelite-mixins-3.5.4.jar", + "../runescape-client/build/libs/runescape-client-" + args[1] + ".jar", + "../runelite-mixins/build/libs/runelite-mixins-" + args[1] + ".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());