Updated server IP and fix workspace.xml (#45)

* Updated server IP and fix workspace.xml

* I'm stupid
This commit is contained in:
Daniel Ginovker 2019-11-09 16:44:09 -05:00 committed by GitHub
parent 5897f92478
commit 11b1521819
3 changed files with 8 additions and 3 deletions

1
.idea/.gitignore generated vendored Normal file
View file

@ -0,0 +1 @@
workspace.xml

View file

@ -15,10 +15,12 @@ NOTICE: THIS IS THE LIVESERVER CLIENT. For development purposes, use GameLaunch.
*/
public class Client {
public static final String PUBLIC_IP_ADDRESS = "35.188.69.167";
/**
* The game settings.
*/
public static GameSetting SETTINGS = new GameSetting("2009Scape", "34.68.75.237", 1, "live", false, false);
public static GameSetting SETTINGS = new GameSetting("2009Scape", PUBLIC_IP_ADDRESS, 1, "live", false, false);
/**
* The main method.
@ -30,7 +32,7 @@ public class Client {
System.out.println("Running liveserver client");
Configurations.LOCAL_SERVER = false;
Configurations.LOCAL_MS = false;
Configurations.MS_IP = Configurations.LOCAL_MS ? "127.0.0.1" : "34.68.75.237"; //Needs to be done because of order it's otherwise set
Configurations.MS_IP = Configurations.LOCAL_MS ? "127.0.0.1" : PUBLIC_IP_ADDRESS; //Needs to be done because of order it's otherwise set
for (int i = 0; i < args.length; i++) {
String[] cmd = args[i].split("=");

View file

@ -2,6 +2,8 @@ package org.runite;
import org.runite.jagex.GameShell;
import static org.runite.Client.PUBLIC_IP_ADDRESS;
/**
* Handles the launching of our Game Client.
* @author Keldagrim Development Team
@ -17,7 +19,7 @@ public class GameLaunch {
NOTICE: IF YOU'RE A DEVELOPER, THE EASIEST WAY TO CONNECT TO THE LIVESERVER IS WITH CLIENT.JAVA. THIS CLASS IS FOR LOCAL SERVER CONNECTING!
*/
public static GameSetting SETTINGS = new GameSetting("2009Scape", Configurations.LOCAL_SERVER ? "127.0.0.1" : "34.68.75.237"/*"34.68.75.237"*/, 1, "live", false, false);
public static GameSetting SETTINGS = new GameSetting("2009Scape", Configurations.LOCAL_SERVER ? "127.0.0.1" : PUBLIC_IP_ADDRESS/*"34.68.75.237"*/, 1, "live", false, false);
/**
* The main method.