2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-18 12:30:21 -07:00
Code Issues Projects Releases Packages Wiki Activity

Renamed some misc methods

Browse source
This commit is contained in:
Pazaz 2022-06-27 15:37:18 -04:00
parent cd68c3d0f9
commit 9e79315172
13 changed files with 242 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/main/java/rt4/HardReferenceNode.java
View file

@ -8,22 +8,22 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class HardReferenceNode extends ReferenceNode { public final class HardReferenceNode extends ReferenceNode {
@OriginalMember(owner = "client!he", name = "X", descriptor = "Ljava/lang/Object;") @OriginalMember(owner = "client!he", name = "X", descriptor = "Ljava/lang/Object;")
private final Object anObject3; private final Object referent;
@OriginalMember(owner = "client!he", name = "<init>", descriptor = "(Ljava/lang/Object;)V") @OriginalMember(owner = "client!he", name = "<init>", descriptor = "(Ljava/lang/Object;)V")
public HardReferenceNode(@OriginalArg(0) Object arg0) { public HardReferenceNode(@OriginalArg(0) Object arg0) {
this.anObject3 = arg0; this.referent = arg0;
} }
@OriginalMember(owner = "client!he", name = "a", descriptor = "(Z)Ljava/lang/Object;") @OriginalMember(owner = "client!he", name = "a", descriptor = "(Z)Ljava/lang/Object;")
@Override @Override
public final Object method3618() { public final Object get() {
return this.anObject3; return this.referent;
} }
@OriginalMember(owner = "client!he", name = "e", descriptor = "(I)Z") @OriginalMember(owner = "client!he", name = "e", descriptor = "(I)Z")
@Override @Override
public final boolean method3619() { public final boolean isSoft() {
return false; return false;
} }
} }

34
client/src/main/java/rt4/Map.java
View file

@ -9,19 +9,19 @@ import org.openrs2.deob.annotation.Pc;
public final class Map extends SecondaryNode { public final class Map extends SecondaryNode {
@OriginalMember(owner = "client!bn", name = "K", descriptor = "I") @OriginalMember(owner = "client!bn", name = "K", descriptor = "I")
public int anInt758 = 0; public int displayMinZ = 0;
@OriginalMember(owner = "client!bn", name = "L", descriptor = "I") @OriginalMember(owner = "client!bn", name = "L", descriptor = "I")
public int anInt759 = -1; public int anInt759 = -1;
@OriginalMember(owner = "client!bn", name = "S", descriptor = "I") @OriginalMember(owner = "client!bn", name = "S", descriptor = "I")
public int anInt763 = 12800; public int displayMinX = 12800;
@OriginalMember(owner = "client!bn", name = "Z", descriptor = "I") @OriginalMember(owner = "client!bn", name = "Z", descriptor = "I")
public int anInt770 = 0; public int displayMaxZ = 0;
@OriginalMember(owner = "client!bn", name = "cb", descriptor = "I") @OriginalMember(owner = "client!bn", name = "cb", descriptor = "I")
public int anInt771 = 12800; public int displayMaxX = 12800;
@OriginalMember(owner = "client!bn", name = "P", descriptor = "Z") @OriginalMember(owner = "client!bn", name = "P", descriptor = "Z")
public boolean aBoolean50 = true; public boolean aBoolean50 = true;
@ -72,7 +72,7 @@ public final class Map extends SecondaryNode {
@OriginalMember(owner = "client!bn", name = "a", descriptor = "(IBI)Z") @OriginalMember(owner = "client!bn", name = "a", descriptor = "(IBI)Z")
public final boolean method664(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public final boolean method664(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
if (this.anInt763 > arg1 || arg1 > this.anInt770 || arg0 < this.anInt771 || arg0 > this.anInt758) { if (this.displayMinX > arg1 || arg1 > this.displayMaxZ || arg0 < this.displayMaxX || arg0 > this.displayMinZ) {
return false; return false;
} }
for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.head(); local33 != null; local33 = (MapChunk) this.chunks.next()) { for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.head(); local33 != null; local33 = (MapChunk) this.chunks.next()) {
@ -85,22 +85,22 @@ public final class Map extends SecondaryNode {
@OriginalMember(owner = "client!bn", name = "f", descriptor = "(B)V") @OriginalMember(owner = "client!bn", name = "f", descriptor = "(B)V")
public final void computeBounds() { public final void computeBounds() {
this.anInt771 = 12800; this.displayMaxX = 12800;
this.anInt770 = 0; this.displayMaxZ = 0;
this.anInt758 = 0; this.displayMinZ = 0;
this.anInt763 = 12800; this.displayMinX = 12800;
for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.head(); local29 != null; local29 = (MapChunk) this.chunks.next()) { for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.head(); local29 != null; local29 = (MapChunk) this.chunks.next()) {
if (local29.anInt3522 < this.anInt771) { if (local29.anInt3522 < this.displayMaxX) {
this.anInt771 = local29.anInt3522; this.displayMaxX = local29.anInt3522;
} }
if (local29.anInt3520 < this.anInt763) { if (local29.anInt3520 < this.displayMinX) {
this.anInt763 = local29.anInt3520; this.displayMinX = local29.anInt3520;
} }
if (local29.anInt3523 > this.anInt770) { if (local29.anInt3523 > this.displayMaxZ) {
this.anInt770 = local29.anInt3523; this.displayMaxZ = local29.anInt3523;
} }
if (this.anInt758 < local29.anInt3524) { if (this.displayMinZ < local29.anInt3524) {
this.anInt758 = local29.anInt3524; this.displayMinZ = local29.anInt3524;
} }
} }
} }

4
client/src/main/java/rt4/ReferenceNode.java
View file

@ -11,8 +11,8 @@ public abstract class ReferenceNode extends SecondaryNode {
} }
@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Z)Ljava/lang/Object;") @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Z)Ljava/lang/Object;")
public abstract Object method3618(); public abstract Object get();
@OriginalMember(owner = "client!gf", name = "e", descriptor = "(I)Z") @OriginalMember(owner = "client!gf", name = "e", descriptor = "(I)Z")
public abstract boolean method3619(); public abstract boolean isSoft();
} }

4
client/src/main/java/rt4/ScriptRunner.java
View file

@ -4322,8 +4322,8 @@ public final class ScriptRunner {
intStack[isp++] = 0; intStack[isp++] = 0;
intStack[isp++] = 0; intStack[isp++] = 0;
} else { } else {
intStack[isp++] = local7293.anInt770 - local7293.anInt763; intStack[isp++] = local7293.displayMaxZ - local7293.displayMinX;
intStack[isp++] = local7293.anInt758 - local7293.anInt771; intStack[isp++] = local7293.displayMinZ - local7293.displayMaxX;
} }
continue; continue;
} }

12
client/src/main/java/rt4/SoftLruHashTable.java
View file

@ -71,7 +71,7 @@ public final class SoftLruHashTable {
public final int method3100() { public final int method3100() {
@Pc(10) int local10 = 0; @Pc(10) int local10 = 0;
for (@Pc(16) ReferenceNode local16 = (ReferenceNode) this.aClass16_8.head(); local16 != null; local16 = (ReferenceNode) this.aClass16_8.next()) { for (@Pc(16) ReferenceNode local16 = (ReferenceNode) this.aClass16_8.head(); local16 != null; local16 = (ReferenceNode) this.aClass16_8.next()) {
if (!local16.method3619()) { if (!local16.isSoft()) {
local10++; local10++;
} }
} }
@ -84,8 +84,8 @@ public final class SoftLruHashTable {
return; return;
} }
for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.aClass16_8.head(); local9 != null; local9 = (ReferenceNode) this.aClass16_8.next()) { for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.aClass16_8.head(); local9 != null; local9 = (ReferenceNode) this.aClass16_8.next()) {
if (local9.method3619()) { if (local9.isSoft()) {
if (local9.method3618() == null) { if (local9.get() == null) {
local9.unlink(); local9.unlink();
local9.unlinkSecondary(); local9.unlinkSecondary();
this.anInt3966++; this.anInt3966++;
@ -103,7 +103,7 @@ public final class SoftLruHashTable {
@OriginalMember(owner = "client!n", name = "b", descriptor = "(B)V") @OriginalMember(owner = "client!n", name = "b", descriptor = "(B)V")
public final void method3103() { public final void method3103() {
for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.aClass16_8.head(); local7 != null; local7 = (ReferenceNode) this.aClass16_8.next()) { for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.aClass16_8.head(); local7 != null; local7 = (ReferenceNode) this.aClass16_8.next()) {
if (local7.method3619()) { if (local7.isSoft()) {
local7.unlink(); local7.unlink();
local7.unlinkSecondary(); local7.unlinkSecondary();
this.anInt3966++; this.anInt3966++;
@ -124,14 +124,14 @@ public final class SoftLruHashTable {
if (local12 == null) { if (local12 == null) {
return null; return null;
} }
@Pc(27) Object local27 = local12.method3618(); @Pc(27) Object local27 = local12.get();
if (local27 == null) { if (local27 == null) {
local12.unlink(); local12.unlink();
local12.unlinkSecondary(); local12.unlinkSecondary();
this.anInt3966++; this.anInt3966++;
return null; return null;
} }
if (local12.method3619()) { if (local12.isSoft()) {
@Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27); @Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27);
this.aClass133_18.put(local53, local12.key); this.aClass133_18.put(local53, local12.key);
this.aClass16_8.addTail(local53); this.aClass16_8.addTail(local53);

10
client/src/main/java/rt4/SoftReferenceNode.java
View file

@ -9,22 +9,22 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class SoftReferenceNode extends ReferenceNode { public final class SoftReferenceNode extends ReferenceNode {
@OriginalMember(owner = "client!qd", name = "U", descriptor = "Ljava/lang/ref/SoftReference;") @OriginalMember(owner = "client!qd", name = "U", descriptor = "Ljava/lang/ref/SoftReference;")
private final SoftReference aSoftReference1; private final SoftReference reference;
@OriginalMember(owner = "client!qd", name = "<init>", descriptor = "(Ljava/lang/Object;)V") @OriginalMember(owner = "client!qd", name = "<init>", descriptor = "(Ljava/lang/Object;)V")
public SoftReferenceNode(@OriginalArg(0) Object arg0) { public SoftReferenceNode(@OriginalArg(0) Object arg0) {
this.aSoftReference1 = new SoftReference(arg0); this.reference = new SoftReference(arg0);
} }
@OriginalMember(owner = "client!qd", name = "a", descriptor = "(Z)Ljava/lang/Object;") @OriginalMember(owner = "client!qd", name = "a", descriptor = "(Z)Ljava/lang/Object;")
@Override @Override
public final Object method3618() { public final Object get() {
return this.aSoftReference1.get(); return this.reference.get();
} }
@OriginalMember(owner = "client!qd", name = "e", descriptor = "(I)Z") @OriginalMember(owner = "client!qd", name = "e", descriptor = "(I)Z")
@Override @Override
public final boolean method3619() { public final boolean isSoft() {
return true; return true;
} }
} }

2
client/src/main/java/rt4/SoftReferenceNodeFactory.java
View file

@ -10,6 +10,6 @@ public final class SoftReferenceNodeFactory extends ReferenceNodeFactory {
@OriginalMember(owner = "client!db", name = "a", descriptor = "(Lclient!gf;I)Lclient!gf;") @OriginalMember(owner = "client!db", name = "a", descriptor = "(Lclient!gf;I)Lclient!gf;")
@Override @Override
public final ReferenceNode create(@OriginalArg(0) ReferenceNode arg0) { public final ReferenceNode create(@OriginalArg(0) ReferenceNode arg0) {
return new SoftReferenceNode(arg0.method3618()); return new SoftReferenceNode(arg0.get());
} }
} }

65
client/src/main/java/rt4/Static232.java
View file

@ -1,75 +1,10 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static232 { public final class Static232 {
@OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;") @OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_97 = new LinkedList(); public static final LinkedList aClass69_97 = new LinkedList();
@OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) {
@Pc(9) int local9 = arg2 - arg4;
@Pc(11) int local11 = -1;
if (WorldMap.anInt1864 > 0) {
if (Static1.anInt2428 <= 10) {
local11 = Static1.anInt2428 * 5;
} else {
local11 = 50 - (Static1.anInt2428 - 10) * 5;
}
}
@Pc(39) int local39 = arg1 - arg6;
@Pc(43) int local43 = 983040 / arg5;
@Pc(47) int local47 = 983040 / arg3;
for (@Pc(50) int local50 = -local43; local50 < local9 + local43; local50++) {
@Pc(65) int local65 = local50 * arg5 >> 16;
@Pc(75) int local75 = arg5 * (local50 + 1) >> 16;
@Pc(80) int local80 = local75 - local65;
if (local80 > 0) {
@Pc(91) int local91 = arg4 + local50 >> 6;
local65 += arg0;
if (local91 >= 0 && local91 <= WorldMap.underlayColors.length - 1) {
@Pc(116) int[][] local116 = WorldMap.underlayColors[local91];
for (@Pc(119) int local119 = -local47; local119 < local39 + local47; local119++) {
@Pc(136) int local136 = arg3 * (local119 + 1) >> 16;
@Pc(144) int local144 = local119 * arg3 >> 16;
@Pc(149) int local149 = local136 - local144;
if (local149 > 0) {
local144 += arg7;
@Pc(163) int local163 = arg6 + local119 >> 6;
if (local163 >= 0 && local163 <= local116.length - 1 && local116[local163] != null) {
@Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6);
@Pc(209) int local209 = local116[local163][local203];
if (local209 != 0) {
@Pc(222) LocType local222 = LocTypeList.get(local209 - 1);
if (!MapList.aBooleanArray130[local222.mapElement]) {
if (local11 != -1 && local222.mapElement == Static9.anInt172) {
@Pc(243) MapElement local243 = new MapElement();
local243.anInt4307 = local65;
local243.anInt4314 = local144;
local243.id = local222.mapElement;
aClass69_97.addTail(local243);
} else {
MapList.sprites[local222.mapElement].render(local65 - 7, local144 + -7);
}
}
}
}
}
}
}
}
}
for (@Pc(285) MapElement local285 = (MapElement) aClass69_97.head(); local285 != null; local285 = (MapElement) aClass69_97.next()) {
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 9, local11);
MapList.sprites[local285.id].render(local285.anInt4307 - 7, local285.anInt4314 + -7);
}
aClass69_97.clear();
}
} }

96
client/src/main/java/rt4/Static269.java
View file

@ -1,96 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static269 {
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(IIIII)V")
public static void method2225(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (WorldMap.loadPercentage < 100) {
WorldMap.method3413();
}
if (GlRenderer.enabled) {
GlRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
} else {
SoftwareRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
}
@Pc(50) int local50;
@Pc(61) int local61;
if (WorldMap.loadPercentage < 100) {
local50 = arg0 + arg3 / 2;
local61 = arg2 / 2 + arg1 - 18 - 20;
if (GlRenderer.enabled) {
GlRaster.method1186(arg0, arg1, arg3, arg2, 0);
GlRaster.method1179(local50 - 152, local61, 304, 34, 9179409);
GlRaster.method1179(local50 - 151, local61 + 1, 302, 32, 0);
GlRaster.method1186(local50 - 150, local61 + 2, WorldMap.loadPercentage * 3, 30, 9179409);
GlRaster.method1186(local50 + WorldMap.loadPercentage * 3 - 150, local61 - -2, 300 - WorldMap.loadPercentage * 3, 30, 0);
} else {
SoftwareRaster.fillRect(arg0, arg1, arg3, arg2, 0);
SoftwareRaster.drawRect(local50 - 152, local61, 304, 34, 9179409);
SoftwareRaster.drawRect(local50 - 151, local61 + 1, 302, 32, 0);
SoftwareRaster.fillRect(local50 - 150, local61 + 2, WorldMap.loadPercentage * 3, 30, 9179409);
SoftwareRaster.fillRect(WorldMap.loadPercentage * 3 + local50 - 150, local61 - -2, 300 - WorldMap.loadPercentage * 3, 30, 0);
}
Fonts.b12Full.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1);
return;
}
WorldMap.anInt1176 = (int) ((float) (arg2 * 2) / WorldMap.zoom);
Static1.anInt2882 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom);
@Pc(211) int local211 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom);
local50 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom);
Static1.anInt2884 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom);
@Pc(236) int local236 = WorldMap.anInt919 + (int) ((float) arg2 / WorldMap.zoom);
local61 = (int) ((float) arg3 / WorldMap.zoom) + WorldMap.anInt435;
WorldMap.anInt2387 = (int) ((float) (arg3 * 2) / WorldMap.zoom);
if (GlRenderer.enabled) {
if (WorldMap.aClass3_Sub2_Sub1_Sub1_2 == null || WorldMap.aClass3_Sub2_Sub1_Sub1_2.width != arg3 || WorldMap.aClass3_Sub2_Sub1_Sub1_2.height != arg2) {
WorldMap.aClass3_Sub2_Sub1_Sub1_2 = null;
WorldMap.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2);
}
SoftwareRaster.setSize(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg3, arg2);
WorldMap.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211);
method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2);
GlRaster.method1178(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg0, arg1, arg3, arg2);
SoftwareRaster.pixels = null;
} else {
WorldMap.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211);
method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);
Static38.method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1);
}
if (WorldMap.anInt1864 > 0) {
Static1.anInt2428--;
if (Static1.anInt2428 == 0) {
Static1.anInt2428 = 20;
WorldMap.anInt1864--;
}
}
if (Cheat.displayFps) {
@Pc(405) int local405 = arg1 + arg2 - 8;
@Pc(412) int local412 = arg0 + arg3 - 5;
Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_FPS, JagString.parseInt((int)GameShell.framesPerSecond)}), local412, local405, 16776960, -1);
@Pc(434) Runtime runtime = Runtime.getRuntime();
@Pc(443) int memory = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L);
@Pc(445) int color = 16776960;
@Pc(446) int local446 = local405 - 15;
if (memory > 95) {
color = 16711680;
}
Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_MEMORY, JagString.parseInt(memory), Cheat.DEBUG_MEMORY_UNIT}), local412, local446, color, -1);
local405 = local446 - 15;
}
}
@OriginalMember(owner = "client!dl", name = "a", descriptor = "(IIIIIIIII)V")
public static void method1195(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(13) int local13 = arg2 - arg6;
@Pc(17) int local17 = arg3 - arg7;
@Pc(26) int local26 = (arg0 - arg1 << 16) / local13;
@Pc(35) int local35 = (arg4 - arg5 << 16) / local17;
Static232.method3991(arg1, arg3, arg2, local35, arg6, local26, arg7, arg5);
}
}

42
client/src/main/java/rt4/Static70.java
View file

@ -34,46 +34,4 @@ public final class Static70 {
} }
} }
@OriginalMember(owner = "client!fi", name = "a", descriptor = "(III)V")
public static void loadOverlayColors(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
for (@Pc(11) int local11 = 0; local11 < FloTypeList.capacity; local11++) {
@Pc(18) FloType local18 = FloTypeList.method4395(local11);
if (local18 != null) {
@Pc(24) int local24 = local18.texture;
if (local24 >= 0 && !Rasteriser.textureProvider.method3236(local24)) {
local24 = -1;
}
@Pc(53) int local53;
@Pc(66) int local66;
@Pc(72) int local72;
@Pc(95) int local95;
if (local18.anInt5894 >= 0) {
local66 = local18.anInt5894;
local72 = (local66 & 0x7F) + arg0;
if (local72 < 0) {
local72 = 0;
} else if (local72 > 127) {
local72 = 127;
}
local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72;
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
} else if (local24 >= 0) {
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(Rasteriser.textureProvider.getAverageColor(local24), 96)];
} else if (local18.anInt5899 == -1) {
local53 = -1;
} else {
local66 = local18.anInt5899;
local72 = arg0 + (local66 & 0x7F);
if (local72 < 0) {
local72 = 0;
} else if (local72 > 127) {
local72 = 127;
}
local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00);
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
}
WorldMap.overlayColors[local11 + 1] = local53;
}
}
}
} }

2
client/src/main/java/rt4/Static87.java
View file

@ -271,7 +271,7 @@ public final class Static87 {
continue; continue;
} }
if (component.clientCode == 1400) { if (component.clientCode == 1400) {
Static269.method2225(local123, local114, component.height, component.width); WorldMap.method2225(local123, local114, component.height, component.width);
InterfaceList.aBooleanArray100[rectangle] = true; InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true; InterfaceList.rectangleRedraw[rectangle] = true;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {

8
client/src/main/java/rt4/StockMarketOffer.java
View file

@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class StockMarketOffer { public final class StockMarketOffer {
@OriginalMember(owner = "client!sg", name = "a", descriptor = "B") @OriginalMember(owner = "client!sg", name = "a", descriptor = "B")
private byte aByte17; private byte statusAndType;
@OriginalMember(owner = "client!sg", name = "f", descriptor = "I") @OriginalMember(owner = "client!sg", name = "f", descriptor = "I")
public int completedCount; public int completedCount;
@ -31,7 +31,7 @@ public final class StockMarketOffer {
@OriginalMember(owner = "client!sg", name = "<init>", descriptor = "(Lclient!wa;)V") @OriginalMember(owner = "client!sg", name = "<init>", descriptor = "(Lclient!wa;)V")
public StockMarketOffer(@OriginalArg(0) Buffer arg0) { public StockMarketOffer(@OriginalArg(0) Buffer arg0) {
this.aByte17 = arg0.g1b(); this.statusAndType = arg0.g1b();
this.item = arg0.g2(); this.item = arg0.g2();
this.price = arg0.g4(); this.price = arg0.g4();
this.count = arg0.g4(); this.count = arg0.g4();
@ -41,11 +41,11 @@ public final class StockMarketOffer {
@OriginalMember(owner = "client!sg", name = "a", descriptor = "(Z)I") @OriginalMember(owner = "client!sg", name = "a", descriptor = "(Z)I")
public final int getStatus() { public final int getStatus() {
return this.aByte17 & 0x7; return this.statusAndType & 0x7;
} }
@OriginalMember(owner = "client!sg", name = "b", descriptor = "(B)I") @OriginalMember(owner = "client!sg", name = "b", descriptor = "(B)I")
public final int getType() { public final int getType() {
return (this.aByte17 & 0x8) == 8 ? 1 : 0; return (this.statusAndType & 0x8) == 8 ? 1 : 0;
} }
} }

205
client/src/main/java/rt4/WorldMap.java
View file

@ -105,7 +105,7 @@ public class WorldMap {
public static int anInt1864; public static int anInt1864;
@OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V")
public static void method3413() { public static void load() {
if (currentMap == null) { if (currentMap == null) {
return; return;
} }
@ -121,10 +121,10 @@ public class WorldMap {
} }
if (loadPercentage == 10) { if (loadPercentage == 10) {
originX = currentMap.anInt763 >> 6 << 6; originX = currentMap.displayMinX >> 6 << 6;
originZ = currentMap.anInt771 >> 6 << 6; originZ = currentMap.displayMaxX >> 6 << 6;
length = (currentMap.anInt758 >> 6 << 6) + 64 - originZ; length = (currentMap.displayMinZ >> 6 << 6) + 64 - originZ;
width = (currentMap.anInt770 >> 6 << 6) + 64 - originX; width = (currentMap.displayMaxZ >> 6 << 6) + 64 - originX;
if (currentMap.defaultZoom == 37) { if (currentMap.defaultZoom == 37) {
zoom = 3.0F; zoom = 3.0F;
targetZoom = 3.0F; targetZoom = 3.0F;
@ -171,7 +171,7 @@ public class WorldMap {
@Pc(273) int local273 = SceneGraph.anInt4272 >> 1; @Pc(273) int local273 = SceneGraph.anInt4272 >> 1;
aByteArrayArrayArray10 = new byte[width][length][]; aByteArrayArrayArray10 = new byte[width][length][];
scenery = new int[width][length][]; scenery = new int[width][length][];
Static70.loadOverlayColors(local273, local249); loadOverlayColors(local273, local249);
loadPercentage = 20; loadPercentage = 20;
} else if (loadPercentage == 20) { } else if (loadPercentage == 20) {
readUnderlay(new Buffer(MapList.archive.fetchFile(UNDERLAY, currentMap.group))); readUnderlay(new Buffer(MapList.archive.fetchFile(UNDERLAY, currentMap.group)));
@ -1595,4 +1595,197 @@ public class WorldMap {
method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16); method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16);
} }
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(IIIII)V")
public static void method2225(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (loadPercentage < 100) {
load();
}
if (GlRenderer.enabled) {
GlRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
} else {
SoftwareRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
}
@Pc(50) int local50;
@Pc(61) int local61;
if (loadPercentage < 100) {
local50 = arg0 + arg3 / 2;
local61 = arg2 / 2 + arg1 - 18 - 20;
if (GlRenderer.enabled) {
GlRaster.method1186(arg0, arg1, arg3, arg2, 0);
GlRaster.method1179(local50 - 152, local61, 304, 34, 9179409);
GlRaster.method1179(local50 - 151, local61 + 1, 302, 32, 0);
GlRaster.method1186(local50 - 150, local61 + 2, loadPercentage * 3, 30, 9179409);
GlRaster.method1186(local50 + loadPercentage * 3 - 150, local61 - -2, 300 - loadPercentage * 3, 30, 0);
} else {
SoftwareRaster.fillRect(arg0, arg1, arg3, arg2, 0);
SoftwareRaster.drawRect(local50 - 152, local61, 304, 34, 9179409);
SoftwareRaster.drawRect(local50 - 151, local61 + 1, 302, 32, 0);
SoftwareRaster.fillRect(local50 - 150, local61 + 2, loadPercentage * 3, 30, 9179409);
SoftwareRaster.fillRect(loadPercentage * 3 + local50 - 150, local61 - -2, 300 - loadPercentage * 3, 30, 0);
}
Fonts.b12Full.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1);
return;
}
anInt1176 = (int) ((float) (arg2 * 2) / zoom);
Static1.anInt2882 = anInt435 - (int) ((float) arg3 / zoom);
@Pc(211) int local211 = anInt435 - (int) ((float) arg3 / zoom);
local50 = anInt919 - (int) ((float) arg2 / zoom);
Static1.anInt2884 = anInt919 - (int) ((float) arg2 / zoom);
@Pc(236) int local236 = anInt919 + (int) ((float) arg2 / zoom);
local61 = (int) ((float) arg3 / zoom) + anInt435;
anInt2387 = (int) ((float) (arg3 * 2) / zoom);
if (GlRenderer.enabled) {
if (aClass3_Sub2_Sub1_Sub1_2 == null || aClass3_Sub2_Sub1_Sub1_2.width != arg3 || aClass3_Sub2_Sub1_Sub1_2.height != arg2) {
aClass3_Sub2_Sub1_Sub1_2 = null;
aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2);
}
SoftwareRaster.setSize(aClass3_Sub2_Sub1_Sub1_2.pixels, arg3, arg2);
method4364(arg3, 0, local61, local50, 0, local236, arg2, local211);
method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2);
GlRaster.method1178(aClass3_Sub2_Sub1_Sub1_2.pixels, arg0, arg1, arg3, arg2);
SoftwareRaster.pixels = null;
} else {
method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211);
method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);
Static38.method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1);
}
if (anInt1864 > 0) {
Static1.anInt2428--;
if (Static1.anInt2428 == 0) {
Static1.anInt2428 = 20;
anInt1864--;
}
}
if (Cheat.displayFps) {
@Pc(405) int local405 = arg1 + arg2 - 8;
@Pc(412) int local412 = arg0 + arg3 - 5;
Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_FPS, JagString.parseInt((int)GameShell.framesPerSecond)}), local412, local405, 16776960, -1);
@Pc(434) Runtime runtime = Runtime.getRuntime();
@Pc(443) int memory = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L);
@Pc(445) int color = 16776960;
@Pc(446) int local446 = local405 - 15;
if (memory > 95) {
color = 16711680;
}
Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_MEMORY, JagString.parseInt(memory), Cheat.DEBUG_MEMORY_UNIT}), local412, local446, color, -1);
local405 = local446 - 15;
}
}
@OriginalMember(owner = "client!dl", name = "a", descriptor = "(IIIIIIIII)V")
public static void method1195(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(13) int local13 = arg2 - arg6;
@Pc(17) int local17 = arg3 - arg7;
@Pc(26) int local26 = (arg0 - arg1 << 16) / local13;
@Pc(35) int local35 = (arg4 - arg5 << 16) / local17;
method3991(arg1, arg3, arg2, local35, arg6, local26, arg7, arg5);
}
@OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) {
@Pc(9) int local9 = arg2 - arg4;
@Pc(11) int local11 = -1;
if (anInt1864 > 0) {
if (Static1.anInt2428 <= 10) {
local11 = Static1.anInt2428 * 5;
} else {
local11 = 50 - (Static1.anInt2428 - 10) * 5;
}
}
@Pc(39) int local39 = arg1 - arg6;
@Pc(43) int local43 = 983040 / arg5;
@Pc(47) int local47 = 983040 / arg3;
for (@Pc(50) int local50 = -local43; local50 < local9 + local43; local50++) {
@Pc(65) int local65 = local50 * arg5 >> 16;
@Pc(75) int local75 = arg5 * (local50 + 1) >> 16;
@Pc(80) int local80 = local75 - local65;
if (local80 > 0) {
@Pc(91) int local91 = arg4 + local50 >> 6;
local65 += arg0;
if (local91 >= 0 && local91 <= underlayColors.length - 1) {
@Pc(116) int[][] local116 = underlayColors[local91];
for (@Pc(119) int local119 = -local47; local119 < local39 + local47; local119++) {
@Pc(136) int local136 = arg3 * (local119 + 1) >> 16;
@Pc(144) int local144 = local119 * arg3 >> 16;
@Pc(149) int local149 = local136 - local144;
if (local149 > 0) {
local144 += arg7;
@Pc(163) int local163 = arg6 + local119 >> 6;
if (local163 >= 0 && local163 <= local116.length - 1 && local116[local163] != null) {
@Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6);
@Pc(209) int local209 = local116[local163][local203];
if (local209 != 0) {
@Pc(222) LocType local222 = LocTypeList.get(local209 - 1);
if (!MapList.aBooleanArray130[local222.mapElement]) {
if (local11 != -1 && local222.mapElement == Static9.anInt172) {
@Pc(243) MapElement local243 = new MapElement();
local243.anInt4307 = local65;
local243.anInt4314 = local144;
local243.id = local222.mapElement;
Static232.aClass69_97.addTail(local243);
} else {
MapList.sprites[local222.mapElement].render(local65 - 7, local144 + -7);
}
}
}
}
}
}
}
}
}
for (@Pc(285) MapElement local285 = (MapElement) Static232.aClass69_97.head(); local285 != null; local285 = (MapElement) Static232.aClass69_97.next()) {
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 9, local11);
MapList.sprites[local285.id].render(local285.anInt4307 - 7, local285.anInt4314 + -7);
}
Static232.aClass69_97.clear();
}
@OriginalMember(owner = "client!fi", name = "a", descriptor = "(III)V")
public static void loadOverlayColors(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
for (@Pc(11) int local11 = 0; local11 < FloTypeList.capacity; local11++) {
@Pc(18) FloType local18 = FloTypeList.method4395(local11);
if (local18 != null) {
@Pc(24) int local24 = local18.texture;
if (local24 >= 0 && !Rasteriser.textureProvider.method3236(local24)) {
local24 = -1;
}
@Pc(53) int local53;
@Pc(66) int local66;
@Pc(72) int local72;
@Pc(95) int local95;
if (local18.anInt5894 >= 0) {
local66 = local18.anInt5894;
local72 = (local66 & 0x7F) + arg0;
if (local72 < 0) {
local72 = 0;
} else if (local72 > 127) {
local72 = 127;
}
local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72;
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
} else if (local24 >= 0) {
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(Rasteriser.textureProvider.getAverageColor(local24), 96)];
} else if (local18.anInt5899 == -1) {
local53 = -1;
} else {
local66 = local18.anInt5899;
local72 = arg0 + (local66 & 0x7F);
if (local72 < 0) {
local72 = 0;
} else if (local72 > 127) {
local72 = 127;
}
local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00);
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
}
overlayColors[local11 + 1] = local53;
}
}
}
} }