From 24429f25063ad4e59696f288a7612ed6ad015799 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 19 Feb 2021 15:22:21 +0100 Subject: [PATCH] client: Seperate system and api version --- .../src/main/java/com/openosrs/client/OpenOSRS.java | 2 ++ .../runelite/client/plugins/OPRSExternalPluginManager.java | 4 ++-- runelite-client/src/main/resources/openosrs.properties | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java b/runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java index 8430967ed5..00a5521144 100644 --- a/runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java +++ b/runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java @@ -10,6 +10,7 @@ public class OpenOSRS public static final File OPENOSRS_DIR = new File(System.getProperty("user.home"), ".openosrs"); public static final File EXTERNALPLUGIN_DIR = new File(OPENOSRS_DIR, "plugins"); public static final String SYSTEM_VERSION; + public static final String SYSTEM_API_VERSION; public static String uuid = UUID.randomUUID().toString(); @@ -25,6 +26,7 @@ public class OpenOSRS e.printStackTrace(); } SYSTEM_VERSION = properties.getProperty("oprs.version", "0.0.0"); + SYSTEM_API_VERSION = properties.getProperty("oprs.api.version", "1.0.0"); } public static void preload() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java index e1fc79ce71..53f46d0a09 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java @@ -34,7 +34,7 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; import static com.openosrs.client.OpenOSRS.EXTERNALPLUGIN_DIR; -import static com.openosrs.client.OpenOSRS.SYSTEM_VERSION; +import static com.openosrs.client.OpenOSRS.SYSTEM_API_VERSION; import com.openosrs.client.config.OpenOSRSConfig; import com.openosrs.client.events.OPRSPluginChanged; import com.openosrs.client.events.OPRSRepositoryChanged; @@ -143,7 +143,7 @@ public class OPRSExternalPluginManager private void initPluginManager() { externalPluginManager = new OPRSExternalPf4jPluginManager(this); - externalPluginManager.setSystemVersion(SYSTEM_VERSION); + externalPluginManager.setSystemVersion(SYSTEM_API_VERSION); } public boolean doesGhRepoExist(String owner, String name) diff --git a/runelite-client/src/main/resources/openosrs.properties b/runelite-client/src/main/resources/openosrs.properties index ad6f017739..a22fbead86 100644 --- a/runelite-client/src/main/resources/openosrs.properties +++ b/runelite-client/src/main/resources/openosrs.properties @@ -1 +1,2 @@ +oprs.api.version=1.0.0 oprs.version=@open.osrs.version@ \ No newline at end of file