diff --git a/client/src/main/java/rt4/AreaSound.java b/client/src/main/java/rt4/AreaSound.java index 57710fb..59d6dbe 100644 --- a/client/src/main/java/rt4/AreaSound.java +++ b/client/src/main/java/rt4/AreaSound.java @@ -73,11 +73,11 @@ public final class AreaSound extends Node { this.radius = 0; this.minInterval = 0; } else { - this.maxInterval = locType.anInt4414; - this.sound = locType.sound; - this.minInterval = locType.anInt4419; - this.radius = locType.soundRadius * 128; - this.sounds = locType.anIntArray381; + this.maxInterval = locType.bgsoundmax; + this.sound = locType.bgsound; + this.minInterval = locType.bgsoundmin; + this.radius = locType.bgsoundrange * 128; + this.sounds = locType.bgsounds; } } else if (this.npc != null) { @Pc(92) int sound = Npc.getSound(this.npc); diff --git a/client/src/main/java/rt4/AreaSoundManager.java b/client/src/main/java/rt4/AreaSoundManager.java index e38be55..ddc82e3 100644 --- a/client/src/main/java/rt4/AreaSoundManager.java +++ b/client/src/main/java/rt4/AreaSoundManager.java @@ -34,12 +34,12 @@ public class AreaSoundManager { sound.minXFine = x * 128; sound.level = level; if (loc != null) { - sound.sounds = loc.anIntArray381; - sound.radius = loc.soundRadius * 128; - sound.maxInterval = loc.anInt4414; + sound.sounds = loc.bgsounds; + sound.radius = loc.bgsoundrange * 128; + sound.maxInterval = loc.bgsoundmax; sound.locType = loc; - sound.sound = loc.sound; - sound.minInterval = loc.anInt4419; + sound.sound = loc.bgsound; + sound.minInterval = loc.bgsoundmin; @Pc(57) int local57 = loc.width; @Pc(60) int local60 = loc.length; if (arg2 == 1 || arg2 == 3) { diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java index 0bd859d..07153ed 100644 --- a/client/src/main/java/rt4/LocType.java +++ b/client/src/main/java/rt4/LocType.java @@ -8,6 +8,7 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!pb") public final class LocType { + // Loc Shapes public static final int WALL_STRAIGHT = 0; public static final int WALL_DIAGONALCORNER = 1; public static final int WALL_L = 2; @@ -61,7 +62,7 @@ public final class LocType { private short[] recol_d; @OriginalMember(owner = "client!pb", name = "P", descriptor = "[B") - private byte[] aByteArray63; + public byte[] aByteArray63; @OriginalMember(owner = "client!pb", name = "X", descriptor = "[I") private int[] models; @@ -73,7 +74,7 @@ public final class LocType { public int id; @OriginalMember(owner = "client!pb", name = "wb", descriptor = "[I") - public int[] anIntArray381; + public int[] bgsounds; @OriginalMember(owner = "client!pb", name = "e", descriptor = "I") public int width = 1; @@ -102,10 +103,10 @@ public final class LocType { public int cursor1Op = -1; @OriginalMember(owner = "client!pb", name = "R", descriptor = "I") - public int anInt4414 = 0; + public int bgsoundmax = 0; @OriginalMember(owner = "client!pb", name = "S", descriptor = "I") - public int mapSceneId = -1; + public int mapscene = -1; @OriginalMember(owner = "client!pb", name = "G", descriptor = "B") private byte hillskew = 0; @@ -117,10 +118,10 @@ public final class LocType { public int cursor1 = -1; @OriginalMember(owner = "client!pb", name = "w", descriptor = "I") - private int translateX = 0; + private int xoff = 0; @OriginalMember(owner = "client!pb", name = "W", descriptor = "I") - public int anInt4419 = 0; + public int bgsoundmin = 0; @OriginalMember(owner = "client!pb", name = "h", descriptor = "I") public int mapfunction = -1; @@ -132,28 +133,28 @@ public final class LocType { public int cursor2Op = -1; @OriginalMember(owner = "client!pb", name = "A", descriptor = "S") - private short aShort26 = -1; + public short aShort26 = -1; @OriginalMember(owner = "client!pb", name = "g", descriptor = "I") - private int resizeZ = 128; + private int resizez = 128; @OriginalMember(owner = "client!pb", name = "z", descriptor = "[Lclient!na;") public JagString[] ops = new JagString[5]; @OriginalMember(owner = "client!pb", name = "d", descriptor = "I") - private int resizeX = 128; + private int resizex = 128; @OriginalMember(owner = "client!pb", name = "s", descriptor = "Z") public boolean aBoolean209 = true; @OriginalMember(owner = "client!pb", name = "o", descriptor = "I") - private int resizeY = 128; + private int resizey = 128; @OriginalMember(owner = "client!pb", name = "y", descriptor = "Z") public boolean breakroutefinding = false; @OriginalMember(owner = "client!pb", name = "kb", descriptor = "I") - public int interactive = -1; + public int interactable = -1; @OriginalMember(owner = "client!pb", name = "lb", descriptor = "Z") public boolean aBoolean216 = false; @@ -168,13 +169,13 @@ public final class LocType { public int cursor2 = -1; @OriginalMember(owner = "client!pb", name = "pb", descriptor = "I") - public int blockSides = 0; + public int blocksides = 0; @OriginalMember(owner = "client!pb", name = "m", descriptor = "Z") public boolean blockrange = true; @OriginalMember(owner = "client!pb", name = "qb", descriptor = "I") - private int translateZ = 0; + private int zoff = 0; @OriginalMember(owner = "client!pb", name = "c", descriptor = "I") public int mapSceneAngleOffset = 0; @@ -186,10 +187,10 @@ public final class LocType { public boolean mapSceneRotated = false; @OriginalMember(owner = "client!pb", name = "N", descriptor = "I") - private int translateY = 0; + private int yoff = 0; @OriginalMember(owner = "client!pb", name = "k", descriptor = "I") - public int soundRadius = 0; + public int bgsoundrange = 0; @OriginalMember(owner = "client!pb", name = "p", descriptor = "I") private int contrast = 0; @@ -201,7 +202,7 @@ public final class LocType { public boolean aBoolean213 = false; @OriginalMember(owner = "client!pb", name = "O", descriptor = "I") - public int sound = -1; + public int bgsound = -1; @OriginalMember(owner = "client!pb", name = "ub", descriptor = "I") public int blockwalk = 2; @@ -222,29 +223,29 @@ public final class LocType { public boolean occlude = false; @OriginalMember(owner = "client!pb", name = "a", descriptor = "(II)Z") - public final boolean isReady(@OriginalArg(1) int arg0) { + public boolean isReady(@OriginalArg(1) int shape) { if (this.shapes != null) { - for (@Pc(18) int local18 = 0; local18 < this.shapes.length; local18++) { - if (arg0 == this.shapes[local18]) { - return LocTypeList.modelsArchive.isFileReady(0, this.models[local18] & 0xFFFF); + for (@Pc(18) int i = 0; i < this.shapes.length; i++) { + if (shape == this.shapes[i]) { + return LocTypeList.modelsArchive.isFileReady(0, this.models[i] & 0xFFFF); } } return true; } else if (this.models == null) { return true; - } else if (arg0 == 10) { - @Pc(71) boolean local71 = true; - for (@Pc(73) int local73 = 0; local73 < this.models.length; local73++) { - local71 &= LocTypeList.modelsArchive.isFileReady(0, this.models[local73] & 0xFFFF); + } else if (shape == LocType.CENTREPIECE_STRAIGHT) { + @Pc(71) boolean ready = true; + for (@Pc(73) int i = 0; i < this.models.length; i++) { + ready &= LocTypeList.modelsArchive.isFileReady(0, this.models[i] & 0xFFFF); } - return local71; + return ready; } else { return true; } } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;") - public final LocType getMultiLoc() { + public LocType getMultiLoc() { @Pc(26) int local26 = -1; if (this.multiLocVarbit != -1) { local26 = VarpDomain.getVarbit(this.multiLocVarbit); @@ -260,7 +261,7 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(III)Lclient!gb;") - private RawModel method3418(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + private RawModel getRawModel(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(7) RawModel local7 = null; @Pc(10) boolean local10 = this.mirror; if (arg1 == 2 && arg0 > 3) { @@ -327,9 +328,9 @@ public final class LocType { } } @Pc(211) boolean local211; - local211 = this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128; + local211 = this.resizex != 128 || this.resizey != 128 || this.resizez != 128; @Pc(230) boolean local230; - local230 = this.translateX != 0 || this.translateY != 0 || this.translateZ != 0; + local230 = this.xoff != 0 || this.yoff != 0 || this.zoff != 0; @Pc(265) RawModel local265 = new RawModel(local7, arg0 == 0 && !local211 && !local230, this.recol_s == null, this.retex_d == null, true); if (arg1 == 4 && arg0 > 3) { local265.method1682(); @@ -359,24 +360,24 @@ public final class LocType { } } if (local211) { - local265.resize(this.resizeX, this.resizeY, this.resizeZ); + local265.resize(this.resizex, this.resizey, this.resizez); } if (local230) { - local265.translate(this.translateX, this.translateY, this.translateZ); + local265.translate(this.xoff, this.yoff, this.zoff); } return local265; } @OriginalMember(owner = "client!pb", name = "c", descriptor = "(I)V") - public final void postDecode() { - if (this.interactive == -1) { - this.interactive = 0; - if (this.models != null && (this.shapes == null || this.shapes[0] == 10)) { - this.interactive = 1; + public void postDecode() { + if (this.interactable == -1) { + this.interactable = 0; + if (this.models != null && (this.shapes == null || this.shapes[0] == LocType.CENTREPIECE_STRAIGHT)) { + this.interactable = 1; } - for (@Pc(30) int local30 = 0; local30 < 5; local30++) { - if (this.ops[local30] != null) { - this.interactive = 1; + for (@Pc(30) int i = 0; i < 5; i++) { + if (this.ops[i] != null) { + this.interactable = 1; break; } } @@ -387,14 +388,14 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "d", descriptor = "(I)Z") - public final boolean hasAreaSound() { + public boolean hasAreaSound() { if (this.multiLocs == null) { - return this.sound != -1 || this.anIntArray381 != null; + return this.bgsound != -1 || this.bgsounds != null; } - for (@Pc(44) int local44 = 0; local44 < this.multiLocs.length; local44++) { - if (this.multiLocs[local44] != -1) { - @Pc(70) LocType local70 = LocTypeList.get(this.multiLocs[local44]); - if (local70.sound != -1 || local70.anIntArray381 != null) { + for (@Pc(44) int i = 0; i < this.multiLocs.length; i++) { + if (this.multiLocs[i] != -1) { + @Pc(70) LocType type = LocTypeList.get(this.multiLocs[i]); + if (type.bgsound != -1 || type.bgsounds != null) { return true; } } @@ -403,23 +404,23 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(IIB)I") - public final int getParam(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + public int getParam(@OriginalArg(0) int defaultValue, @OriginalArg(1) int key) { if (this.params == null) { - return arg0; + return defaultValue; } else { - @Pc(21) IntNode local21 = (IntNode) this.params.get(arg1); - return local21 == null ? arg0 : local21.value; + @Pc(21) IntNode value = (IntNode) this.params.get(key); + return value == null ? defaultValue : value.value; } } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(ILclient!wa;)V") - public final void decode(@OriginalArg(1) Buffer arg0) { + public void decode(@OriginalArg(1) Buffer buffer) { while (true) { - @Pc(9) int local9 = arg0.g1(); - if (local9 == 0) { + @Pc(9) int opcode = buffer.g1(); + if (opcode == 0) { return; } - this.decode(arg0, local9); + this.decode(buffer, opcode); } } @@ -466,7 +467,7 @@ public final class LocType { } else if (opcode == 18) { this.blockrange = false; } else if (opcode == 19) { - this.interactive = buffer.g1(); + this.interactable = buffer.g1(); } else if (opcode == 21) { this.hillskew = 1; } else if (opcode == 22) { // sharelight @@ -508,6 +509,7 @@ public final class LocType { this.retex_s[len] = (short) buffer.g2(); } } else if (opcode == 42) { + // recolor-related count = buffer.g1(); this.aByteArray63 = new byte[count]; for (len = 0; len < count; len++) { @@ -520,19 +522,19 @@ public final class LocType { } else if (opcode == 64) { this.active = false; } else if (opcode == 65) { - this.resizeX = buffer.g2(); + this.resizex = buffer.g2(); } else if (opcode == 66) { - this.resizeY = buffer.g2(); + this.resizey = buffer.g2(); } else if (opcode == 67) { - this.resizeZ = buffer.g2(); + this.resizez = buffer.g2(); } else if (opcode == 69) { - this.blockSides = buffer.g1(); - } else if (opcode == 70) { // xoff - this.translateX = buffer.g2b(); - } else if (opcode == 71) { // yoff - this.translateY = buffer.g2b(); - } else if (opcode == 72) { // zoff - this.translateZ = buffer.g2b(); + this.blocksides = buffer.g1(); + } else if (opcode == 70) { + this.xoff = buffer.g2b(); + } else if (opcode == 71) { + this.yoff = buffer.g2b(); + } else if (opcode == 72) { + this.zoff = buffer.g2b(); } else if (opcode == 73) { this.forcedecor = true; } else if (opcode == 74) { @@ -557,24 +559,25 @@ public final class LocType { } len = buffer.g1(); this.multiLocs = new int[len + 2]; - for (@Pc(790) int local790 = 0; local790 <= len; local790++) { - this.multiLocs[local790] = buffer.g2(); - if (this.multiLocs[local790] == 65535) { - this.multiLocs[local790] = -1; + for (@Pc(790) int i = 0; i <= len; i++) { + this.multiLocs[i] = buffer.g2(); + if (this.multiLocs[i] == 65535) { + this.multiLocs[i] = -1; } } this.multiLocs[len + 1] = count; } else if (opcode == 78) { - this.sound = buffer.g2(); - this.soundRadius = buffer.g1(); + this.bgsound = buffer.g2(); + this.bgsoundrange = buffer.g1(); } else if (opcode == 79) { - this.anInt4419 = buffer.g2(); - this.anInt4414 = buffer.g2(); - this.soundRadius = buffer.g1(); + this.bgsoundmin = buffer.g2(); // interval + this.bgsoundmax = buffer.g2(); // interval + this.bgsoundrange = buffer.g1(); + count = buffer.g1(); - this.anIntArray381 = new int[count]; + this.bgsounds = new int[count]; for (len = 0; len < count; len++) { - this.anIntArray381[len] = buffer.g2(); + this.bgsounds[len] = buffer.g2(); } } else if (opcode == 81) { this.hillskew = 2; @@ -611,7 +614,7 @@ public final class LocType { } else if (opcode == 101) { this.mapSceneAngleOffset = buffer.g1(); } else if (opcode == 102) { - this.mapSceneId = buffer.g2(); + this.mapscene = buffer.g2(); } else if (opcode == 249) { count = buffer.g1(); if (this.params == null) { @@ -619,33 +622,33 @@ public final class LocType { this.params = new HashTable(len); } for (len = 0; len < count; len++) { - @Pc(576) boolean local576 = buffer.g1() == 1; - @Pc(580) int local580 = buffer.g3(); - @Pc(589) Node local589; - if (local576) { - local589 = new StringNode(buffer.gjstr()); + @Pc(576) boolean isString = buffer.g1() == 1; + @Pc(580) int key = buffer.g3(); + @Pc(589) Node value; + if (isString) { + value = new StringNode(buffer.gjstr()); } else { - local589 = new IntNode(buffer.g4()); + value = new IntNode(buffer.g4()); } - this.params.put(local589, local580); + this.params.put(value, key); } } } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(Z)Z") - public final boolean isReady() { + public boolean isReady() { if (this.models == null) { return true; } - @Pc(13) boolean local13 = true; - for (@Pc(15) int local15 = 0; local15 < this.models.length; local15++) { - local13 &= LocTypeList.modelsArchive.isFileReady(0, this.models[local15] & 0xFFFF); + @Pc(13) boolean ready = true; + for (@Pc(15) int i = 0; i < this.models.length; i++) { + ready &= LocTypeList.modelsArchive.isFileReady(0, this.models[i] & 0xFFFF); } - return local13; + return ready; } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(IZZI)Lclient!td;") - private GlModel method3427(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2) { + private GlModel getGlModel(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2) { @Pc(10) int local10 = this.ambient + 64; @Pc(17) int local17 = this.contrast * 5 + 768; @Pc(79) GlModel local79; @@ -717,8 +720,8 @@ public final class LocType { if (arg2 == 2 && arg0 > 3) { local236 = !local236; } - @Pc(264) boolean local264 = this.resizeY == 128 && this.translateY == 0; - @Pc(294) boolean local294 = arg0 == 0 && this.resizeX == 128 && this.resizeZ == 128 && this.translateX == 0 && this.translateZ == 0 && !local236; + @Pc(264) boolean local264 = this.resizey == 128 && this.yoff == 0; + @Pc(294) boolean local294 = arg0 == 0 && this.resizex == 128 && this.resizez == 128 && this.xoff == 0 && this.zoff == 0 && !local236; @Pc(351) GlModel local351 = local79.method4117(local294, local264, this.recol_s == null, local79.method4094() == local10, arg0 == 0 && !local236, true, local17 == local79.method4115(), !local236, this.retex_d == null); if (local236) { local351.method4122(); @@ -745,11 +748,11 @@ public final class LocType { local351.method4107(this.retex_d[local177], this.retex_s[local177]); } } - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - local351.resize(this.resizeX, this.resizeY, this.resizeZ); + if (this.resizex != 128 || this.resizey != 128 || this.resizez != 128) { + local351.resize(this.resizex, this.resizey, this.resizez); } - if (this.translateX != 0 || this.translateY != 0 || this.translateZ != 0) { - local351.translate(this.translateX, this.translateY, this.translateZ); + if (this.xoff != 0 || this.yoff != 0 || this.zoff != 0) { + local351.translate(this.xoff, this.yoff, this.zoff); } if (local10 != local351.method4094()) { local351.method4105(local10); @@ -761,7 +764,7 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(II[[III[[IZLclient!ek;BZI)Lclient!sm;") - public final Loc_Class139 method3428(@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(6) boolean arg6, @OriginalArg(7) SoftwareIndexedSprite arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) { + public Loc_Class139 method3428(@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(6) boolean arg6, @OriginalArg(7) SoftwareIndexedSprite arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) { @Pc(29) long local29; if (GlRenderer.enabled) { if (this.shapes == null) { @@ -773,7 +776,7 @@ public final class LocType { @Pc(235) GlModel local235; @Pc(265) SoftwareIndexedSprite local265; if (local225 == null) { - local235 = this.method3427(arg0, false, arg3); + local235 = this.getGlModel(arg0, false, arg3); if (local235 == null) { aClass139_1.aClass8_10 = null; aClass139_1.aClass36_Sub1_3 = null; @@ -800,7 +803,7 @@ public final class LocType { if (this.hillskew != 0) { local330.method4110(this.hillskew, this.aShort26, local235, arg2, arg5, arg1, arg4, arg9); } - local330.method4111(this.interactive == 0 && !this.aBoolean214, true, true, this.interactive == 0, true, false); + local330.method4111(this.interactable == 0 && !this.aBoolean214, true, true, this.interactable == 0, true, false); aClass139_1.aClass8_10 = local330; local330.aBoolean259 = local298; aClass139_1.aClass36_Sub1_3 = local265; @@ -820,7 +823,7 @@ public final class LocType { } @Pc(60) Entity local60 = (Entity) LocTypeList.aClass99_14.get(local29); if (local60 == null) { - @Pc(69) RawModel local69 = this.method3418(arg0, arg3); + @Pc(69) RawModel local69 = this.getRawModel(arg0, arg3); if (local69 == null) { aClass139_1.aClass8_10 = null; return aClass139_1; @@ -854,7 +857,7 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;") - public final Loc_Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SoftwareIndexedSprite arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) { + public Loc_Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SoftwareIndexedSprite arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) { @Pc(30) long local30; if (!GlRenderer.enabled) { if (this.shapes == null) { @@ -864,7 +867,7 @@ public final class LocType { } @Pc(195) SoftwareModel local195 = (SoftwareModel) LocTypeList.aClass99_36.get(local30); if (local195 == null) { - @Pc(204) RawModel local204 = this.method3418(arg5, arg11); + @Pc(204) RawModel local204 = this.getRawModel(arg5, arg11); if (local204 == null) { return null; } @@ -899,7 +902,7 @@ public final class LocType { } @Pc(46) GlModel local46 = (GlModel) LocTypeList.aClass99_36.get(local30); if (local46 == null) { - local46 = this.method3427(arg5, true, arg11); + local46 = this.getGlModel(arg5, true, arg11); if (local46 == null) { return null; } @@ -936,12 +939,12 @@ public final class LocType { } @OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!na;II)Lclient!na;") - public final JagString method3430(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) { + public JagString getParam(@OriginalArg(0) JagString defaultValue, @OriginalArg(2) int key) { if (this.params == null) { - return arg0; + return defaultValue; } else { - @Pc(26) StringNode local26 = (StringNode) this.params.get(arg1); - return local26 == null ? arg0 : local26.value; + @Pc(26) StringNode value = (StringNode) this.params.get(key); + return value == null ? defaultValue : value.value; } } } diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java index 53934de..4cb158a 100644 --- a/client/src/main/java/rt4/LoginManager.java +++ b/client/src/main/java/rt4/LoginManager.java @@ -1179,7 +1179,7 @@ public class LoginManager { } while (local72 >= 103); } while (local68 >= 103); local95 = LocTypeList.get(local17); - } while (local78 == 22 && !Preferences.showGroundDecorations && local95.interactive == 0 && local95.blockwalk != 1 && !local95.forcedecor); + } while (local78 == 22 && !Preferences.showGroundDecorations && local95.interactable == 0 && local95.blockwalk != 1 && !local95.forcedecor); local39 = true; if (!local95.isReady()) { local15 = false; diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java index 80a6e97..a29ea60 100644 --- a/client/src/main/java/rt4/MiniMap.java +++ b/client/src/main/java/rt4/MiniMap.java @@ -477,7 +477,7 @@ public class MiniMap { @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z") public static boolean renderScenery(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) { - @Pc(10) MsiType msiType = MsiTypeList.get(arg1.mapSceneId); + @Pc(10) MsiType msiType = MsiTypeList.get(arg1.mapscene); if (msiType.spriteId == -1) { return true; } @@ -542,7 +542,7 @@ public class MiniMap { local35 = (int) local14 >> 14 & 0x1F; local42 = Integer.MAX_VALUE & (int) (local14 >>> 32); local46 = LocTypeList.get(local42); - if (local46.mapSceneId == -1) { + if (local46.mapscene == -1) { local65 = arg1; if (local14 > 0L) { local65 = arg3; @@ -616,7 +616,7 @@ public class MiniMap { local35 = (int) local14 >> 14 & 0x1F; local42 = (int) (local14 >>> 32) & Integer.MAX_VALUE; local46 = LocTypeList.get(local42); - if (local46.mapSceneId == -1) { + if (local46.mapscene == -1) { if (local35 == 9) { local65 = 15658734; if (local14 > 0L) { @@ -645,7 +645,7 @@ public class MiniMap { local28 = (int) local14 >> 20 & 0x3; local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE; @Pc(586) LocType local586 = LocTypeList.get(local35); - return local586.mapSceneId == -1 || renderScenery(arg0, local586, arg2, local28); + return local586.mapscene == -1 || renderScenery(arg0, local586, arg2, local28); } return true; } diff --git a/client/src/main/java/rt4/PathFinder.java b/client/src/main/java/rt4/PathFinder.java index 5c1f681..3bb53b9 100644 --- a/client/src/main/java/rt4/PathFinder.java +++ b/client/src/main/java/rt4/PathFinder.java @@ -637,7 +637,7 @@ public class PathFinder { local59 = local46.width; local62 = local46.length; } - @Pc(73) int local73 = local46.blockSides; + @Pc(73) int local73 = local46.blocksides; if (angle != 0) { local73 = (local73 << angle & 0xF) + (local73 >> 4 - angle); } diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java index ee6de3b..9ebe4e9 100644 --- a/client/src/main/java/rt4/SceneGraph.java +++ b/client/src/main/java/rt4/SceneGraph.java @@ -2454,7 +2454,7 @@ public class SceneGraph { heightmap = tileHeights[currentPlane + 1]; } - if (loc.interactive == 0 || highmem) { + if (loc.interactable == 0 || highmem) { bitset |= Long.MIN_VALUE; } @@ -2480,7 +2480,7 @@ public class SceneGraph { @Pc(1950) Loc_Class139 local1950; if (locType == LocType.GROUNDDECOR) { - if (Preferences.showGroundDecorations || loc.interactive != 0 || loc.blockwalk == 1 || loc.forcedecor) { + if (Preferences.showGroundDecorations || loc.interactable != 0 || loc.blockwalk == 1 || loc.forcedecor) { if (loc.anim == -1 && loc.multiLocs == null && !loc.aBoolean214) { local403 = loc.method3428(orientation, local165, currentHeightmap, LocType.GROUNDDECOR, averageY, heightmap, lowmem, null, local330, local173); if (GlRenderer.enabled && local330) { diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index 8ad4fd0..6de398c 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -5588,7 +5588,7 @@ public final class ScriptRunner { int1 = intStack[isp]; local5294 = ParamTypeList.get(int3); if (local5294.isString()) { - stringStack[ssp++] = LocTypeList.get(int1).method3430(local5294.defaultString, int3); + stringStack[ssp++] = LocTypeList.get(int1).getParam(local5294.defaultString, int3); } else { intStack[isp++] = LocTypeList.get(int1).getParam(local5294.defaultInt, int3); }