Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Added new JS5 file server (launcher no longer has to handle cache downloading) - PLEASE SET YOUR CACHE LOCATION IN file-server.properties

Browse source 
Updated client to connect to the new file server
This commit is contained in:
Woah 2021-03-26 21:58:25 -04:00
parent 355580800c
commit 15fb1a5d3f
15 changed files with 482 additions and 2979 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Client/config.json
View file

@ -3,6 +3,7 @@
"ip_management" : "localhost",
"server_port": 43594,
"wl_port": 5555,
"js5_port": 43593,
"world": 1,
"customization": {

1907
Client/hs_err_pid19398.log
View file

File diff suppressed because it is too large Load diff

1070
Client/hs_err_pid6995.log
View file

File diff suppressed because it is too large Load diff

7
Client/src/main/java/org/runite/client/Client.java
View file

@ -1315,6 +1315,7 @@ public final class Client extends GameShell {
if (Class58.aJs5Worker_917.errors > Class163_Sub2_Sub1.anInt4026) {
anInt3068 = 5 * 50 * (Class58.aJs5Worker_917.errors + -1);
//Port swap
if (Class162.anInt2036 == Class140_Sub6.accRegistryPort) {
Class140_Sub6.accRegistryPort = currentPort;
} else {
@ -1357,12 +1358,16 @@ public final class Client extends GameShell {
} else {
try {
if (PacketParser.anInt80 == 0) {
Class17.aClass64_413 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort);
System.out.println("Trying " + GameConfig.Companion.getJS5_SERVER_PORT());
Class17.aClass64_413 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.Companion.getJS5_SERVER_PORT());
++PacketParser.anInt80;
}
if (PacketParser.anInt80 == 1) {
/* If the connection is null we reset the JS5 port to the backup server JS5 for compatibility reasons */
if (2 == Objects.requireNonNull(Class17.aClass64_413).anInt978) {
GameConfig.Companion.setJS5_SERVER_PORT(GameConfig.SERVER_PORT + ObjectDefinition.paramWorldID);
this.method46(1000);
return;
}

3
Client/src/main/kotlin/org/rs09/client/GameLaunch.kt
View file

@ -29,6 +29,9 @@ object GameLaunch {
} catch (e: Exception){
GameConfig.IP_ADDRESS = "play.2009scape.org"
GameConfig.IP_MANAGEMENT = "play.2009scape.org"
GameConfig.JS5_SERVER_PORT = 43593
GameConfig.SERVER_PORT = 43594
GameConfig.WL_PORT = 5555
GameConfig.RCM_STYLE_PRESET = "classic"
GameConfig.RCM_TITLE = "<col=5d5447>Choose Option</col>"
GameConfig.HOLIDAYS_ENABLED = true

3
Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt
View file

@ -99,6 +99,8 @@ class GameConfig {
@JvmField
var IP_MANAGEMENT = "localhost"
var JS5_SERVER_PORT = 43593
@JvmField
var SERVER_PORT = 43594
@ -155,6 +157,7 @@ class GameConfig {
if(data.containsKey("ip_management")) IP_MANAGEMENT = data["ip_management"].toString() else IP_MANAGEMENT = IP_ADDRESS
if(data.containsKey("wl_port")) WL_PORT = data["wl_port"].toString().toInt()
if(data.containsKey("server_port")) SERVER_PORT = data["server_port"].toString().toInt()
if(data.containsKey("js5_port")) JS5_SERVER_PORT = data["js5_port"].toString().toInt()
if(data.containsKey("world")) WORLD = data["world"].toString().toInt()
//Parse customization options