Skip to content

Commit a333abf

Browse files
JameskmongerJameskmonger
committed
refactor: more statics moved from MovedStatics
1 parent 7bb4bda commit a333abf

15 files changed

+214
-231
lines changed

‎src/main/java/org/runejs/client/ClientScriptRunner.java‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public class ClientScriptRunner extends Node {
4141
public static InvokedScript[] invokedScripts = new InvokedScript[50];
4242
public static int invokedScriptIndex = 0;
4343
public static LinkedList clientScriptRunnerCache = new LinkedList();
44+
public static Calendar aCalendar279 = Calendar.getInstance();
45+
public static boolean[] aBooleanArray548 = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, true, false, false};
46+
public static GameInterface aGameInterface_1887;
47+
public static int[] anIntArray1847 = new int[2000];
4448
private static String[] aClass1Array2964 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
4549

4650
public int[] opcodes;
@@ -486,11 +490,11 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
486490
continue;
487491
}
488492
if(scriptOpcode == 42) {
489-
scriptIntValues[intValueIndex++] = MovedStatics.anIntArray1847[intOperands[scriptIndex]];
493+
scriptIntValues[intValueIndex++] = anIntArray1847[intOperands[scriptIndex]];
490494
continue;
491495
}
492496
if(scriptOpcode == 43) {
493-
MovedStatics.anIntArray1847[intOperands[scriptIndex]] = scriptIntValues[--intValueIndex];
497+
anIntArray1847[intOperands[scriptIndex]] = scriptIntValues[--intValueIndex];
494498
continue;
495499
}
496500
}
@@ -521,10 +525,10 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
521525
if(bool) {
522526
MovedStatics.aGameInterface_2116 = childInterface;
523527
} else {
524-
MovedStatics.aGameInterface_1887 = childInterface;
528+
aGameInterface_1887 = childInterface;
525529
}
526530
} else if(scriptOpcode == 101) {
527-
GameInterface gameInterface = !bool ? MovedStatics.aGameInterface_1887 : MovedStatics.aGameInterface_2116;
531+
GameInterface gameInterface = !bool ? aGameInterface_1887 : MovedStatics.aGameInterface_2116;
528532
GameInterface childInterface = GameInterface.getInterface(gameInterface.parentId);
529533
childInterface.children[BitUtils.bitWiseAND(gameInterface.id, 32767)] = null;
530534
} else {
@@ -540,7 +544,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
540544
gameInterface = GameInterface.getInterface(scriptIntValues[--intValueIndex]);
541545
scriptOpcode -= 1000;
542546
} else {
543-
gameInterface = bool ? MovedStatics.aGameInterface_2116 : MovedStatics.aGameInterface_1887;
547+
gameInterface = bool ? MovedStatics.aGameInterface_2116 : aGameInterface_1887;
544548
}
545549
if(scriptOpcode == 1000) {
546550
intValueIndex -= 2;
@@ -561,7 +565,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
561565
} else if(scriptOpcode >= 1100 && scriptOpcode < 1200 || scriptOpcode >= 2100 && scriptOpcode < 2200) {
562566
GameInterface gameInterface;
563567
if(scriptOpcode < 2000) {
564-
gameInterface = !bool ? MovedStatics.aGameInterface_1887 : MovedStatics.aGameInterface_2116;
568+
gameInterface = !bool ? aGameInterface_1887 : MovedStatics.aGameInterface_2116;
565569
} else {
566570
gameInterface = GameInterface.getInterface(scriptIntValues[--intValueIndex]);
567571
scriptOpcode -= 1000;
@@ -633,7 +637,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
633637
if(bool) {
634638
MovedStatics.aGameInterface_2116 = gameInterface.children[i_28_];
635639
} else {
636-
MovedStatics.aGameInterface_1887 = gameInterface.children[i_28_];
640+
aGameInterface_1887 = gameInterface.children[i_28_];
637641
}
638642
}
639643
} else if(scriptOpcode == 1401) {
@@ -649,7 +653,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
649653
if(bool) {
650654
MovedStatics.aGameInterface_2116 = gameInterface;
651655
} else {
652-
MovedStatics.aGameInterface_1887 = gameInterface;
656+
aGameInterface_1887 = gameInterface;
653657
}
654658
}
655659
} else {
@@ -668,12 +672,12 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
668672
if(bool) {
669673
MovedStatics.aGameInterface_2116 = gameInterface_35_;
670674
} else {
671-
MovedStatics.aGameInterface_1887 = gameInterface_35_;
675+
aGameInterface_1887 = gameInterface_35_;
672676
}
673677
}
674678
}
675679
} else if(scriptOpcode < 1600) {
676-
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : MovedStatics.aGameInterface_1887;
680+
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : aGameInterface_1887;
677681
if(scriptOpcode == 1500) {
678682
scriptIntValues[intValueIndex++] = gameInterface.currentX;
679683
} else if(scriptOpcode == 1501) {
@@ -746,7 +750,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
746750
int i_44_ = scriptIntValues[intValueIndex + 1];
747751
method406(0, i_44_, i_43_);
748752
} else if(scriptOpcode == 3002) {
749-
GameInterface gameInterface = !bool ? MovedStatics.aGameInterface_1887 : MovedStatics.aGameInterface_2116;
753+
GameInterface gameInterface = !bool ? aGameInterface_1887 : MovedStatics.aGameInterface_2116;
750754
if(MovedStatics.lastContinueTextWidgetId == -1) {
751755
GameInterface.method517(gameInterface.id & 0x7fff, gameInterface.parentId);
752756
MovedStatics.lastContinueTextWidgetId = gameInterface.id;
@@ -755,7 +759,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
755759
if(scriptOpcode != 3003) {
756760
break;
757761
}
758-
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : MovedStatics.aGameInterface_1887;
762+
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : aGameInterface_1887;
759763
int i_45_ = scriptIntValues[--intValueIndex];
760764
method406(0x7fff & gameInterface.id, i_45_, gameInterface.parentId);
761765
}
@@ -885,10 +889,10 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
885889
} else if(scriptOpcode == 4104) {
886890
int i_78_ = scriptIntValues[--intValueIndex];
887891
long l = 86400000L * ((long) i_78_ + 11745L);
888-
MovedStatics.aCalendar279.setTime(new Date(l));
889-
int i_79_ = MovedStatics.aCalendar279.get(Calendar.DATE);
890-
int i_80_ = MovedStatics.aCalendar279.get(Calendar.MONTH);
891-
int i_81_ = MovedStatics.aCalendar279.get(Calendar.YEAR);
892+
aCalendar279.setTime(new Date(l));
893+
int i_79_ = aCalendar279.get(Calendar.DATE);
894+
int i_80_ = aCalendar279.get(Calendar.MONTH);
895+
int i_81_ = aCalendar279.get(Calendar.YEAR);
892896
scriptStringValues[stringValueIndex++] = i_79_ + "-" + aClass1Array2964[i_80_] + "-" + i_81_;
893897
} else if(scriptOpcode == 4105) {
894898
stringValueIndex -= 2;
@@ -941,7 +945,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
941945
}
942946
}
943947
} else {
944-
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : MovedStatics.aGameInterface_1887;
948+
GameInterface gameInterface = bool ? MovedStatics.aGameInterface_2116 : aGameInterface_1887;
945949
if(scriptOpcode == 1600) {
946950
scriptIntValues[intValueIndex++] = gameInterface.scrollWidth;
947951
} else {
@@ -957,7 +961,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
957961
gameInterface = GameInterface.getInterface(scriptIntValues[--intValueIndex]);
958962
scriptOpcode -= 1000;
959963
} else {
960-
gameInterface = !bool ? MovedStatics.aGameInterface_1887 : MovedStatics.aGameInterface_2116;
964+
gameInterface = !bool ? aGameInterface_1887 : MovedStatics.aGameInterface_2116;
961965
}
962966
if(scriptOpcode >= 1300 && scriptOpcode <= 1309 || scriptOpcode >= 1314 && scriptOpcode <= 1317) {
963967
String class1 = scriptStringValues[--stringValueIndex];
@@ -1036,7 +1040,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
10361040
} else {
10371041
GameInterface gameInterface;
10381042
if(scriptOpcode < 2000) {
1039-
gameInterface = !bool ? MovedStatics.aGameInterface_1887 : MovedStatics.aGameInterface_2116;
1043+
gameInterface = !bool ? aGameInterface_1887 : MovedStatics.aGameInterface_2116;
10401044
} else {
10411045
gameInterface = GameInterface.getInterface(scriptIntValues[--intValueIndex]);
10421046
scriptOpcode -= 1000;
@@ -1068,7 +1072,7 @@ public static void runClientScripts(Object[] listeners, int arg1, int arg2, Game
10681072
if(scriptOpcode != 1203) {
10691073
break;
10701074
}
1071-
GameInterface desiredInterface = !bool ? MovedStatics.aGameInterface_2116 : MovedStatics.aGameInterface_1887;
1075+
GameInterface desiredInterface = !bool ? MovedStatics.aGameInterface_2116 : aGameInterface_1887;
10721076
gameInterface.anInt2738 = desiredInterface.id;
10731077
}
10741078
}

0 commit comments

Comments
 (0)