diff --git a/Client/src/org/runite/Client.java b/Client/src/org/runite/Client.java index acaa1a1d1..99de69ca3 100644 --- a/Client/src/org/runite/Client.java +++ b/Client/src/org/runite/Client.java @@ -15,7 +15,7 @@ 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"; + public static final String PUBLIC_IP_ADDRESS = "104.154.219.240"; /** * The game settings. diff --git a/Client/src/org/runite/Configurations.java b/Client/src/org/runite/Configurations.java index c1f79ec70..b4b359c5d 100644 --- a/Client/src/org/runite/Configurations.java +++ b/Client/src/org/runite/Configurations.java @@ -63,7 +63,7 @@ public final class Configurations { /** * The MS IP. */ - public static String MS_IP = Configurations.LOCAL_MS ? "127.0.0.1" : "34.68.75.237"; + public static String MS_IP = Configurations.LOCAL_MS ? "127.0.0.1" : Client.PUBLIC_IP_ADDRESS; /** * The operation system name. diff --git a/Client/src/org/runite/jagex/Client.java b/Client/src/org/runite/jagex/Client.java index f06a4c050..59d8d0b2d 100644 --- a/Client/src/org/runite/jagex/Client.java +++ b/Client/src/org/runite/jagex/Client.java @@ -382,6 +382,7 @@ public final class Client extends GameShell { CS2Script.anInt2451 = ObjectDefinition.worldId; Class3_Sub28_Sub7.method564(Class38.aClass87_665, 0); System.out.println("port = " + Class53.anInt867); + System.out.println("Here: Config.MSIP = " + Configurations.MS_IP); if(Class44.anInt718 != 0) { if(Class44.anInt718 == 1) { RuntimeException_Sub1.worldListHost = this.getCodeBase().getHost(); diff --git a/CompiledServer/Guides/LinuxCompileClientGuide.md b/CompiledServer/Guides/LinuxCompileClientGuide.md index 00c7f9379..3f5a5210d 100644 --- a/CompiledServer/Guides/LinuxCompileClientGuide.md +++ b/CompiledServer/Guides/LinuxCompileClientGuide.md @@ -1,5 +1,5 @@ -From the production/Client/ directory, run: -jar cfm Client.jar org/runite/Manifest.txt org/runite/*.class org/runite/jagex/* +From the production/RS-2009/ directory, run: +jar cfm Client.jar Manifest.txt org/runite/*.class org/runite/jagex/* (Note: This was only tested on Linux.) Test with diff --git a/CompiledServer/production/09Scape/.gitignore b/CompiledServer/production/09Scape/.gitignore deleted file mode 100644 index c1f302317..000000000 --- a/CompiledServer/production/09Scape/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -bin/** -out/** -data/logs/** -data/profile/** -.idea/** -/bin -.DS_Store** -.project** -/out/ -*.iml -*.eml -*.userlibraries diff --git a/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl.dll b/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl.dll deleted file mode 100644 index 990986f19..000000000 Binary files a/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl.dll and /dev/null differ diff --git a/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl_awt.dll b/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl_awt.dll deleted file mode 100644 index d247b4a0b..000000000 Binary files a/CompiledServer/production/09Scape/.keldagrim_530/runescape/jogl_awt.dll and /dev/null differ diff --git a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d17b6724d..000000000 --- a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.ui.prefs b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index c2d899803..000000000 --- a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_LineWrap -formatter_settings_version=12 -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=