diff --git a/Client/src/org/runite/Client.java b/Client/src/org/runite/Client.java index 77a08a1b3..44df73b55 100644 --- a/Client/src/org/runite/Client.java +++ b/Client/src/org/runite/Client.java @@ -1,5 +1,7 @@ package org.runite; +import org.crandor.game.node.entity.player.link.ConfigurationManager; +import org.crandor.net.packet.out.Config; import org.runite.jagex.GameShell; /** @@ -18,13 +20,20 @@ public class Client { /** * The game settings. */ - public static GameSetting SETTINGS = new GameSetting("2009Scape", "34.74.91.45", 1, "live", false, false); + public static GameSetting SETTINGS = new GameSetting("2009Scape", "34.68.75.237", 1, "live", false, false); /** * The main method. - * @param args the arguments casted on runtime. + r @param args the arguments casted on runtime. + r_game + */ public static void main(String[]args) { + 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 + for (int i = 0; i < args.length; i++) { String[] cmd = args[i].split("="); switch (cmd[0]) { diff --git a/Client/src/org/runite/Configurations.java b/Client/src/org/runite/Configurations.java index 3525d00d3..c1f79ec70 100644 --- a/Client/src/org/runite/Configurations.java +++ b/Client/src/org/runite/Configurations.java @@ -27,8 +27,8 @@ public final class Configurations { /** * If the client is local. */ - public static final boolean LOCAL_MS = true; - public static final boolean LOCAL_SERVER = true; + public static boolean LOCAL_MS = true; + public static boolean LOCAL_SERVER = true; /** * Packaging. @@ -63,8 +63,8 @@ public final class Configurations { /** * The MS IP. */ - public static final String MS_IP = (Configurations.LOCAL_MS ? "127.0.0.1" : "frostblades.org"); - + public static String MS_IP = Configurations.LOCAL_MS ? "127.0.0.1" : "34.68.75.237"; + /** * The operation system name. */ diff --git a/Client/src/org/runite/GameLaunch.java b/Client/src/org/runite/GameLaunch.java index 43f5e6b85..dba35a584 100644 --- a/Client/src/org/runite/GameLaunch.java +++ b/Client/src/org/runite/GameLaunch.java @@ -12,7 +12,12 @@ public class GameLaunch { /** * The game settings. */ - public static GameSetting SETTINGS = new GameSetting("2009Scape", Configurations.LOCAL_SERVER ? "127.0.0.1" : "frostblades.org", 1, "live", false, false); + /* + + 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); /** * The main method. diff --git a/Client/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF b/Client/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d7812e5ab --- /dev/null +++ b/Client/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/Client/src/META-INF/MANIFEST.MF b/Client/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF similarity index 95% rename from Client/src/META-INF/MANIFEST.MF rename to Client/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF index c2c137eb9..683bd2ea1 100644 --- a/Client/src/META-INF/MANIFEST.MF +++ b/Client/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Main-Class: org.runite.GameLaunch - +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch + diff --git a/Client/src/org/runite/jagex/Class121.java b/Client/src/org/runite/jagex/Class121.java index b771902d8..ae5ae2edd 100644 --- a/Client/src/org/runite/jagex/Class121.java +++ b/Client/src/org/runite/jagex/Class121.java @@ -161,7 +161,7 @@ final class Class121 { } var2 = Class3_Sub15.aClass89_2429.readByte(var0 ^ 29984); - System.out.println(var2); + //System.out.println(var2); //Not sure what this was debugging if(WorldListEntry.aClass155_2627 != null) { WorldListEntry.aClass155_2627.method2159(55); } diff --git a/Client/src/org/runite/jagex/Class3_Sub13_Sub23.java b/Client/src/org/runite/jagex/Class3_Sub13_Sub23.java index 4b601be61..2eccdc706 100644 --- a/Client/src/org/runite/jagex/Class3_Sub13_Sub23.java +++ b/Client/src/org/runite/jagex/Class3_Sub13_Sub23.java @@ -70,7 +70,7 @@ static RSString aClass94_3282 = aClass94_3286; } else { RSByteBuffer buffer = new RSByteBuffer(buf); int opcode = buffer.getByte((byte)-67); - System.out.println(opcode); + //System.out.println(opcode); if(1 != opcode) { return false; } else { diff --git a/Client/src/org/runite/jagex/Class53.java b/Client/src/org/runite/jagex/Class53.java index 7b1f91198..02d5c6e95 100644 --- a/Client/src/org/runite/jagex/Class53.java +++ b/Client/src/org/runite/jagex/Class53.java @@ -152,7 +152,7 @@ final class Class53 { var5.activity = buffer.getGJString2(98); var5.address = buffer.getGJString2(79); GameLaunch.SETTINGS.setWorld(worldId); - System.out.println(GameLaunch.SETTINGS.getWorld()); + //System.out.println(GameLaunch.SETTINGS.getWorld()); } Class3_Sub28_Sub7.updateStamp = buffer.getInt(); Class30.loadedWorldList = true; diff --git a/Client/src/org/runite/jagex/Client.java b/Client/src/org/runite/jagex/Client.java index e1a435f03..cc355f447 100644 --- a/Client/src/org/runite/jagex/Client.java +++ b/Client/src/org/runite/jagex/Client.java @@ -390,7 +390,7 @@ public final class Client extends GameShell { Class3_Sub28_Sub19.anInt3773 = 40000 + ObjectDefinition.worldId; } else if(Class44.anInt718 == 2) { RuntimeException_Sub1.worldListHost = "127.0.0.1"; - System.out.println("port = " + Class53.anInt867); + System.out.println("Setting worldListHost to 127.0.0.1, port = " + Class53.anInt867); Class53.anInt867 = ObjectDefinition.worldId + '\uc350'; Class3_Sub28_Sub19.anInt3773 = ObjectDefinition.worldId + '\u9c40'; } diff --git a/Client/src/org/runite/jagex/ClientLoader.java b/Client/src/org/runite/jagex/ClientLoader.java index 12c69da09..faaae5d9a 100644 --- a/Client/src/org/runite/jagex/ClientLoader.java +++ b/Client/src/org/runite/jagex/ClientLoader.java @@ -88,7 +88,7 @@ public class ClientLoader extends Applet { public void launch() { try { ClientLoader.world = "" + GameLaunch.SETTINGS.getWorld(); - System.out.println(GameLaunch.SETTINGS.getWorld()); + //System.out.println(GameLaunch.SETTINGS.getWorld()); this.frame = new JFrame(GameLaunch.SETTINGS.getName()); this.frame.setLayout(new BorderLayout()); this.frame.setBackground(Color.BLACK); diff --git a/Client/src/org/runite/jagex/GameShell.java b/Client/src/org/runite/jagex/GameShell.java index 6406c2c51..cf75caa1b 100644 --- a/Client/src/org/runite/jagex/GameShell.java +++ b/Client/src/org/runite/jagex/GameShell.java @@ -20,7 +20,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene /** * The game settings. */ - public static GameSetting SETTINGS = new GameSetting(GameLaunch.SETTINGS.getName(), Configurations.LOCAL_MS ? "127.0.0.1" : "frostblades.org", 1, "live", false, false); + public static GameSetting SETTINGS = new GameSetting(GameLaunch.SETTINGS.getName(), Configurations.LOCAL_MS ? "127.0.0.1" : "34.68.75.237"/*"34.68.75.237"*/, 1, "live", false, false); private boolean aBoolean1 = false; diff --git a/Client/src/org/runite/jagex/Signlink.java b/Client/src/org/runite/jagex/Signlink.java index b189f3aaa..084a2f18a 100644 --- a/Client/src/org/runite/jagex/Signlink.java +++ b/Client/src/org/runite/jagex/Signlink.java @@ -153,6 +153,7 @@ public class Signlink implements Runnable { } public final Class64 method1441(byte var1, String address, int port) { + //System.out.println("var1: " + var1 + ", add: " + address + ":" + port); return var1 != 8?null:this.method1435(1, 0, address, port, -17); } diff --git a/CompiledServer/production/09Scape/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/META-INF/MANIFEST.MF index c2c137eb9..d7812e5ab 100644 --- a/CompiledServer/production/09Scape/META-INF/MANIFEST.MF +++ b/CompiledServer/production/09Scape/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Main-Class: org.runite.GameLaunch - +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/CompiledServer/production/09Scape/METAs/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/METAs/META-INF/MANIFEST.MF new file mode 100644 index 000000000..683bd2ea1 --- /dev/null +++ b/CompiledServer/production/09Scape/METAs/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch + diff --git a/CompiledServer/production/09Scape/org/runite/Configurations.class b/CompiledServer/production/09Scape/org/runite/Configurations.class index a5d4cb197..3ec8e9704 100644 Binary files a/CompiledServer/production/09Scape/org/runite/Configurations.class and b/CompiledServer/production/09Scape/org/runite/Configurations.class differ diff --git a/CompiledServer/production/09Scape/org/runite/GameLaunch.class b/CompiledServer/production/09Scape/org/runite/GameLaunch.class index 362461337..324456c13 100644 Binary files a/CompiledServer/production/09Scape/org/runite/GameLaunch.class and b/CompiledServer/production/09Scape/org/runite/GameLaunch.class differ diff --git a/CompiledServer/production/09Scape/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d7812e5ab --- /dev/null +++ b/CompiledServer/production/09Scape/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/CompiledServer/production/09Scape/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF new file mode 100644 index 000000000..683bd2ea1 --- /dev/null +++ b/CompiledServer/production/09Scape/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch + diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class121.class b/CompiledServer/production/09Scape/org/runite/jagex/Class121.class index 435afc87c..566dbbb6b 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class121.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class121.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub23.class b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub23.class index 3fb9acf97..95e2a9052 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub23.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub23.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class53.class b/CompiledServer/production/09Scape/org/runite/jagex/Class53.class index 09a2625db..b6aa43e3c 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class53.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class53.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Client.class b/CompiledServer/production/09Scape/org/runite/jagex/Client.class index 0ef0bfd12..27e806241 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Client.class and b/CompiledServer/production/09Scape/org/runite/jagex/Client.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/ClientLoader.class b/CompiledServer/production/09Scape/org/runite/jagex/ClientLoader.class index 879a66e7e..916c462eb 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/ClientLoader.class and b/CompiledServer/production/09Scape/org/runite/jagex/ClientLoader.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/GameShell.class b/CompiledServer/production/09Scape/org/runite/jagex/GameShell.class index fd014b953..44c3660ab 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/GameShell.class and b/CompiledServer/production/09Scape/org/runite/jagex/GameShell.class differ diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Signlink.class b/CompiledServer/production/09Scape/org/runite/jagex/Signlink.class index cbdef7553..8a7c23989 100644 Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Signlink.class and b/CompiledServer/production/09Scape/org/runite/jagex/Signlink.class differ diff --git a/CompiledServer/production/09Scape/src/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/src/META-INF/MANIFEST.MF index c2c137eb9..d7812e5ab 100644 --- a/CompiledServer/production/09Scape/src/META-INF/MANIFEST.MF +++ b/CompiledServer/production/09Scape/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Main-Class: org.runite.GameLaunch - +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/CompiledServer/production/09Scape/src/METAs/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/src/METAs/META-INF/MANIFEST.MF new file mode 100644 index 000000000..683bd2ea1 --- /dev/null +++ b/CompiledServer/production/09Scape/src/METAs/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch + diff --git a/CompiledServer/production/09Scape/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d7812e5ab --- /dev/null +++ b/CompiledServer/production/09Scape/src/org/runite/METAs/liveserver-jar/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/CompiledServer/production/09Scape/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF b/CompiledServer/production/09Scape/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF new file mode 100644 index 000000000..683bd2ea1 --- /dev/null +++ b/CompiledServer/production/09Scape/src/org/runite/METAs/localhost-jar/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch + diff --git a/Server/src/META-INF/MANIFEST.MF b/Server/src/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d7812e5ab --- /dev/null +++ b/Server/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.Client + diff --git a/Server/src/METAs/META-INF/MANIFEST.MF b/Server/src/METAs/META-INF/MANIFEST.MF new file mode 100644 index 000000000..683bd2ea1 --- /dev/null +++ b/Server/src/METAs/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.runite.GameLaunch +