ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2920 from open-osrs/api-version

Browse Source 
client: Seperate system and api version
This commit is contained in:
Tyler Bochard
2021-02-19 13:42:42 -05:00
committed by GitHub
parent e15886c4e1 6523f7299b
commit 71a7725e31
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java
View File

@@ -10,6 +10,7 @@ public class OpenOSRS
public static final File OPENOSRS_DIR = new File(System.getProperty("user.home"), ".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 File EXTERNALPLUGIN_DIR = new File(OPENOSRS_DIR, "plugins");
public static final String SYSTEM_VERSION; public static final String SYSTEM_VERSION;
public static final String SYSTEM_API_VERSION;
public static String uuid = UUID.randomUUID().toString(); public static String uuid = UUID.randomUUID().toString();
@@ -25,6 +26,7 @@ public class OpenOSRS
e.printStackTrace(); e.printStackTrace();
} }
SYSTEM_VERSION = properties.getProperty("oprs.version", "0.0.0"); SYSTEM_VERSION = properties.getProperty("oprs.version", "0.0.0");
SYSTEM_API_VERSION = properties.getProperty("oprs.api.version");
} }
public static void preload() public static void preload()

4
runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java
View File

@@ -34,7 +34,7 @@ import com.google.inject.Injector;
import com.google.inject.Key; import com.google.inject.Key;
import com.google.inject.Module; import com.google.inject.Module;
import static com.openosrs.client.OpenOSRS.EXTERNALPLUGIN_DIR; 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.config.OpenOSRSConfig;
import com.openosrs.client.events.OPRSPluginChanged; import com.openosrs.client.events.OPRSPluginChanged;
import com.openosrs.client.events.OPRSRepositoryChanged; import com.openosrs.client.events.OPRSRepositoryChanged;
@@ -143,7 +143,7 @@ public class OPRSExternalPluginManager
private void initPluginManager() private void initPluginManager()
{ {
externalPluginManager = new OPRSExternalPf4jPluginManager(this); externalPluginManager = new OPRSExternalPf4jPluginManager(this);
externalPluginManager.setSystemVersion(SYSTEM_VERSION); externalPluginManager.setSystemVersion(SYSTEM_API_VERSION);
} }
public boolean doesGhRepoExist(String owner, String name) public boolean doesGhRepoExist(String owner, String name)

1
runelite-client/src/main/resources/openosrs.properties
View File

@@ -1 +1,2 @@
oprs.api.version=1.0.0
oprs.version=@open.osrs.version@ oprs.version=@open.osrs.version@