Preparing merge

This commit is contained in:
verinia 2019-06-08 12:25:16 -08:00
parent e233110f1d
commit 4c55322faa
67 changed files with 3163 additions and 2387 deletions

View file

@ -1,4 +1,6 @@
package org.runite.jagex;
import org.runite.GameLaunch;
import java.io.IOException;
final class Class3_Sub13_Sub3 extends Class3_Sub13 {
@ -42,10 +44,10 @@ final class Class3_Sub13_Sub3 extends Class3_Sub13 {
}
}
if (var4.toString().contains("RuneScape")) {
var4 = RSString.createRSString(var4.toString().replace("RuneScape", "Runite"));
var4 = RSString.createRSString(var4.toString().replace("RuneScape", GameLaunch.SETTINGS.getName()));
}
if (var4.toString().contains("Jagex")) {
var4 = RSString.createRSString(var4.toString().replace("Jagex", "Runite"));
var4 = RSString.createRSString(var4.toString().replace("Jagex", GameLaunch.SETTINGS.getName()));
}
return var4;
} catch (RuntimeException var6) {

View file

@ -89,7 +89,7 @@ public class ClientLoader extends Applet {
try {
ClientLoader.world = "" + GameLaunch.SETTINGS.getWorld();
System.out.println(GameLaunch.SETTINGS.getWorld());
this.frame = new JFrame("Runite");
this.frame = new JFrame(GameLaunch.SETTINGS.getName());
this.frame.setLayout(new BorderLayout());
this.frame.setBackground(Color.BLACK);
if (!GameLaunch.SETTINGS.isSwiftKit())

View file

@ -1,6 +1,7 @@
package org.runite.jagex;
import org.runite.Configurations;
import org.runite.GameLaunch;
import org.runite.GameSetting;
import java.applet.Applet;
@ -19,7 +20,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
/**
* The game settings.
*/
public static GameSetting SETTINGS = new GameSetting("Runite", 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" : "frostblades.org", 1, "live", false, false);
private boolean aBoolean1 = false;

View file

@ -1,4 +1,6 @@
package org.runite.jagex;
import org.runite.GameLaunch;
import java.applet.Applet;
import java.awt.FontMetrics;
import java.awt.Graphics;
@ -1578,7 +1580,7 @@ final class RSString implements Interface3 {
static final RSString createRSString(String string) {
if (string != null) {
string = string.replace("RuneScape", "Runite");
string = string.replace("RuneScape", GameLaunch.SETTINGS.getName());
}
try {
byte[] var2 = string.getBytes();