2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-11 17:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity

I wish I could exist for a single day without getting a migraine from very stupid issues.

Browse source
This commit is contained in:
ceikry 2021-08-05 20:12:40 -05:00
parent 5b3a6bcf5e
commit 9ebcbe56e2
3 changed files with 342 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1349,8 +1349,8 @@ public final class Client extends GameShell {
} else { } else {
try { try {
if (PacketParser.anInt80 == 0) { if (PacketParser.anInt80 == 0) {
System.out.println("Trying " + GameConfig.Companion.getJS5_SERVER_PORT()); System.out.println("Trying " + GameConfig.JS5_SERVER_PORT);
Class17.aClass64_413 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.Companion.getJS5_SERVER_PORT()); Class17.aClass64_413 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.JS5_SERVER_PORT);
++PacketParser.anInt80; ++PacketParser.anInt80;
} }
@ -1358,7 +1358,7 @@ public final class Client extends GameShell {
/* If the connection is null we reset the JS5 port to the backup server JS5 for compatibility reasons */ /* 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) { if (2 == Objects.requireNonNull(Class17.aClass64_413).anInt978) {
GameConfig.Companion.setJS5_SERVER_PORT(GameConfig.SERVER_PORT + ObjectDefinition.paramWorldID); GameConfig.JS5_SERVER_PORT = GameConfig.SERVER_PORT + ObjectDefinition.paramWorldID;
this.method46(1000); this.method46(1000);
return; return;
} }

10
Client/src/main/java/org/runite/client/drawcalls/ContextMenu.java
View file

@ -12,13 +12,13 @@ public final class ContextMenu {
int width = Class21.anInt3552; int width = Class21.anInt3552;
int height = Class21.anInt3537; int height = Class21.anInt3537;
int contextMenuColor = 6116423; //Context Menu RGB || 6116423 Classic || Old var5 || ColorCore.getHexColors() int contextMenuColor = 6116423; //Context Menu RGB || 6116423 Classic || Old var5 || ColorCore.getHexColors()
Toolkit.getActiveToolkit().fillRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BG_COLOR, GameConfig.RCM_BG_OPACITY); Toolkit.getActiveToolkit().fillRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BG_COLOR, GameConfig.getRCM_BG_OPACITY());
if (GameConfig.RS3_CONTEXT_STYLE) { if (GameConfig.RS3_CONTEXT_STYLE) {
Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.getRCM_TITLE_OPACITY());
Toolkit.getActiveToolkit().drawRect(1 + x, 1 + y, width + -2, height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); Toolkit.getActiveToolkit().drawRect(1 + x, 1 + y, width + -2, height, GameConfig.RCM_BORDER_COLOR, GameConfig.getRCM_BORDER_OPACITY());
} else { } else {
Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.RCM_TITLE_OPACITY); Toolkit.getActiveToolkit().fillRect(1 + x, 2 + y, width + -2, 16, GameConfig.RCM_TITLE_COLOR, GameConfig.getRCM_TITLE_OPACITY());
Toolkit.getActiveToolkit().drawRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); Toolkit.getActiveToolkit().drawRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BORDER_COLOR, GameConfig.getRCM_BORDER_OPACITY());
} }
FontType.bold.method681(RSString.parse(GameConfig.RCM_TITLE), x - -3, y + 14, contextMenuColor, -1); FontType.bold.method681(RSString.parse(GameConfig.RCM_TITLE), x - -3, y + 14, contextMenuColor, -1);

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

@ -11,9 +11,7 @@ import java.util.*
* Handles the client's config loading * Handles the client's config loading
* @author Ceikry * @author Ceikry
*/ */
class GameConfig { object GameConfig {
companion object {
/** /**
* Debug Booleans * Debug Booleans
*/ */
@ -111,6 +109,7 @@ class GameConfig {
@JvmField @JvmField
var IP_MANAGEMENT = "localhost" var IP_MANAGEMENT = "localhost"
@JvmField
var JS5_SERVER_PORT = 43593 var JS5_SERVER_PORT = 43593
@JvmField @JvmField
@ -391,5 +390,4 @@ class GameConfig {
} }
} }
} }
}
} }