mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2025-12-16 11:30:19 -07:00
Renamed part of SceneGraph
This commit is contained in:
Pazaz
parent
cf9639ea79
commit
2b59a97e7a
41 changed files with 1496 additions and 1514 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"ip_management": "localhost",
|
||||
"ip_address": "localhost",
|
||||
"ip_management": "test.2009scape.org",
|
||||
"ip_address": "test.2009scape.org",
|
||||
"world": 1,
|
||||
"server_port": 43594,
|
||||
"wl_port": 43595,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package rt4;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalClass;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
|
@ -9,11 +10,12 @@ public final class AttachLocRequest extends Node {
|
|||
|
||||
@OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;")
|
||||
public static final LinkedList queue = new LinkedList();
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "p", descriptor = "I")
|
||||
public int anInt1187;
|
||||
public int setLoops;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "r", descriptor = "I")
|
||||
public int anInt1188;
|
||||
public int x0Delta;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "t", descriptor = "I")
|
||||
public int locId;
|
||||
|
|
@ -22,25 +24,25 @@ public final class AttachLocRequest extends Node {
|
|||
public int x;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "v", descriptor = "I")
|
||||
public int anInt1191;
|
||||
public int x1Delta;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "w", descriptor = "I")
|
||||
public int entityId;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "D", descriptor = "I")
|
||||
public int anInt1197;
|
||||
public int z0Delta;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "E", descriptor = "I")
|
||||
public int shape;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "H", descriptor = "I")
|
||||
public int anInt1200;
|
||||
public int z1Delta;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "M", descriptor = "I")
|
||||
public int z;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "N", descriptor = "I")
|
||||
public int anInt1205;
|
||||
public int resetLoops;
|
||||
|
||||
@OriginalMember(owner = "client!cn", name = "O", descriptor = "I")
|
||||
public int angle;
|
||||
|
|
@ -99,26 +101,26 @@ public final class AttachLocRequest extends Node {
|
|||
} else if (layer == 2) {
|
||||
@Pc(198) Scenery scenery = SceneGraph.getScenery(Player.level, request.x, request.z);
|
||||
if (scenery != null) {
|
||||
attachment = scenery.primary;
|
||||
attachment = scenery.entity;
|
||||
}
|
||||
} else if (layer == 3) {
|
||||
@Pc(216) GroundDecor groundDecor = SceneGraph.getGroundDecor(Player.level, request.x, request.z);
|
||||
if (groundDecor != null) {
|
||||
attachment = groundDecor.primary;
|
||||
attachment = groundDecor.entity;
|
||||
}
|
||||
}
|
||||
if (attachment != null) {
|
||||
ChangeLocRequest.push(Player.level, request.z, 0, request.x, request.anInt1205 + 1, -1, layer, 0, request.anInt1187 + 1);
|
||||
entity.anInt3375 = request.anInt1205 + client.loop;
|
||||
ChangeLocRequest.push(Player.level, request.z, 0, request.x, request.resetLoops + 1, -1, layer, 0, request.setLoops + 1);
|
||||
entity.attachmentResetAt = request.resetLoops + client.loop;
|
||||
entity.attachmentZFine = length * 64 + request.z * 128;
|
||||
entity.attachmentXFine = width * 64 + request.x * 128;
|
||||
entity.attachment = attachment;
|
||||
@Pc(292) int x0Delta = request.anInt1188;
|
||||
@Pc(292) int x0Delta = request.x0Delta;
|
||||
entity.attachmentY = y;
|
||||
entity.anInt3390 = client.loop + request.anInt1187;
|
||||
@Pc(304) int x1Delta = request.anInt1191;
|
||||
@Pc(307) int z0Delta = request.anInt1197;
|
||||
@Pc(310) int z1Delta = request.anInt1200;
|
||||
entity.attachmentSetAt = client.loop + request.setLoops;
|
||||
@Pc(304) int x1Delta = request.x1Delta;
|
||||
@Pc(307) int z0Delta = request.z0Delta;
|
||||
@Pc(310) int z1Delta = request.z1Delta;
|
||||
@Pc(316) int temp;
|
||||
if (x0Delta > x1Delta) {
|
||||
temp = x0Delta;
|
||||
|
|
@ -138,4 +140,22 @@ public final class AttachLocRequest extends Node {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
|
||||
public static void push(@OriginalArg(0) int x1Delta, @OriginalArg(1) int setLoops, @OriginalArg(2) int entityId, @OriginalArg(3) int resetLoops, @OriginalArg(4) int z, @OriginalArg(5) int z1Delta, @OriginalArg(6) int angle, @OriginalArg(7) int x0Delta, @OriginalArg(8) int x, @OriginalArg(9) int shape, @OriginalArg(11) int z0Delta, @OriginalArg(12) int locId) {
|
||||
@Pc(7) AttachLocRequest req = new AttachLocRequest();
|
||||
req.angle = angle;
|
||||
req.resetLoops = resetLoops;
|
||||
req.setLoops = setLoops;
|
||||
req.z1Delta = z1Delta;
|
||||
req.entityId = entityId;
|
||||
req.x = x;
|
||||
req.z0Delta = z0Delta;
|
||||
req.z = z;
|
||||
req.locId = locId;
|
||||
req.x0Delta = x0Delta;
|
||||
req.x1Delta = x1Delta;
|
||||
req.shape = shape;
|
||||
queue.addTail(req);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ public class ClientProt {
|
|||
client.audioLoop();
|
||||
System.gc();
|
||||
ping(true);
|
||||
SceneGraph.method3535(false);
|
||||
SceneGraph.load(false);
|
||||
if (!Static230.dynamicMapRegion) {
|
||||
Static87.method1805(false);
|
||||
ping(true);
|
||||
|
|
@ -331,7 +331,7 @@ public class ClientProt {
|
|||
}
|
||||
client.method3768();
|
||||
ping(true);
|
||||
Static45.method1169(PathFinder.collisionMaps, false);
|
||||
SceneGraph.method1169(PathFinder.collisionMaps, false);
|
||||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2395();
|
||||
}
|
||||
|
|
@ -347,10 +347,10 @@ public class ClientProt {
|
|||
} else {
|
||||
Static146.method2750(SceneGraph.firstVisibleLevel);
|
||||
}
|
||||
SceneGraph.method2255();
|
||||
SceneGraph.unload();
|
||||
if (GlRenderer.enabled && hasUnderWaterMap) {
|
||||
SceneGraph.setUnderwater(true);
|
||||
SceneGraph.method3535(true);
|
||||
SceneGraph.load(true);
|
||||
if (!Static230.dynamicMapRegion) {
|
||||
Static87.method1805(true);
|
||||
ping(true);
|
||||
|
|
@ -363,9 +363,9 @@ public class ClientProt {
|
|||
}
|
||||
client.method3768();
|
||||
ping(true);
|
||||
Static45.method1169(PathFinder.collisionMaps, true);
|
||||
SceneGraph.method1169(PathFinder.collisionMaps, true);
|
||||
ping(true);
|
||||
SceneGraph.method2255();
|
||||
SceneGraph.unload();
|
||||
SceneGraph.setUnderwater(false);
|
||||
}
|
||||
if (GlRenderer.enabled) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -82,4 +82,40 @@ public class ColorUtils {
|
|||
Static251.aFloatArray28[2] = (float) (arg0 & 0xFF) / 255.0F * local74 * local11 * local7;
|
||||
return Static251.aFloatArray28;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(IZI)I")
|
||||
public static int multiplyLightnessSafe(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
|
||||
if (arg1 == -1) {
|
||||
return 12345678;
|
||||
}
|
||||
arg0 = arg0 * (arg1 & 0x7F) >> 7;
|
||||
if (arg0 < 2) {
|
||||
arg0 = 2;
|
||||
} else if (arg0 > 126) {
|
||||
arg0 = 126;
|
||||
}
|
||||
return arg0 + (arg1 & 0xFF80);
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(BII)I")
|
||||
public static int multiplyLightnessGrayscale(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
|
||||
if (arg0 == -2) {
|
||||
return 12345678;
|
||||
} else if (arg0 == -1) {
|
||||
if (arg1 < 2) {
|
||||
arg1 = 2;
|
||||
} else if (arg1 > 126) {
|
||||
arg1 = 126;
|
||||
}
|
||||
return arg1;
|
||||
} else {
|
||||
arg1 = (arg0 & 0x7F) * arg1 >> 7;
|
||||
if (arg1 < 2) {
|
||||
arg1 = 2;
|
||||
} else if (arg1 > 126) {
|
||||
arg1 = 126;
|
||||
}
|
||||
return (arg0 & 0xFF80) + arg1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ import org.openrs2.deob.annotation.OriginalMember;
|
|||
public final class GroundDecor {
|
||||
|
||||
@OriginalMember(owner = "client!bm", name = "c", descriptor = "Lclient!th;")
|
||||
public Entity primary;
|
||||
public Entity entity;
|
||||
|
||||
@OriginalMember(owner = "client!bm", name = "g", descriptor = "I")
|
||||
public int anInt732;
|
||||
public int xFine;
|
||||
|
||||
@OriginalMember(owner = "client!bm", name = "i", descriptor = "I")
|
||||
public int anInt733;
|
||||
|
|
@ -19,7 +19,7 @@ public final class GroundDecor {
|
|||
public long key;
|
||||
|
||||
@OriginalMember(owner = "client!bm", name = "o", descriptor = "I")
|
||||
public int anInt736;
|
||||
public int zFine;
|
||||
|
||||
@OriginalMember(owner = "client!bm", name = "n", descriptor = "Z")
|
||||
public boolean aBoolean49 = false;
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ public abstract class PathingEntity extends Entity {
|
|||
public int anInt3385 = 0;
|
||||
|
||||
@OriginalMember(owner = "client!fe", name = "pb", descriptor = "I")
|
||||
public int anInt3390 = 0;
|
||||
public int attachmentSetAt = 0;
|
||||
|
||||
@OriginalMember(owner = "client!fe", name = "mb", descriptor = "[B")
|
||||
public final byte[] movementQueueSpeed = new byte[10];
|
||||
|
|
@ -162,7 +162,7 @@ public abstract class PathingEntity extends Entity {
|
|||
public int chatLoops = 100;
|
||||
|
||||
@OriginalMember(owner = "client!fe", name = "V", descriptor = "I")
|
||||
public int anInt3375 = 0;
|
||||
public int attachmentResetAt = 0;
|
||||
|
||||
@OriginalMember(owner = "client!fe", name = "Y", descriptor = "I")
|
||||
public int hitpointsBarVisibleUntil = -1000;
|
||||
|
|
|
|||
|
|
@ -403,10 +403,10 @@ public final class Player extends PathingEntity {
|
|||
}
|
||||
@Pc(515) Model local515 = null;
|
||||
if (!this.aBoolean98 && this.attachment != null) {
|
||||
if (client.loop >= this.anInt3375) {
|
||||
if (client.loop >= this.attachmentResetAt) {
|
||||
this.attachment = null;
|
||||
}
|
||||
if (this.anInt3390 <= client.loop && this.anInt3375 > client.loop) {
|
||||
if (this.attachmentSetAt <= client.loop && this.attachmentResetAt > client.loop) {
|
||||
if (this.attachment instanceof Loc) {
|
||||
local515 = (Model) ((Loc) this.attachment).method1049();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ public class Protocol {
|
|||
int local247 = inboundBuffer.g2();
|
||||
int local633 = inboundBuffer.ig2badd();
|
||||
if (!GlRenderer.enabled) {
|
||||
SceneGraph.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
|
||||
AttachLocRequest.push(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
|
||||
}
|
||||
} else if (opcode == ServerProt.LOCATION_PACKET_14) {
|
||||
int local15 = inboundBuffer.g1();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,12 @@
|
|||
package rt4;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalClass;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
||||
@OriginalClass("client!pe")
|
||||
public final class Class120 {
|
||||
public final class SceneGraph_Class120 {
|
||||
|
||||
@OriginalMember(owner = "client!pe", name = "b", descriptor = "I")
|
||||
public int anInt4444;
|
||||
|
|
@ -59,4 +61,21 @@ public final class Class120 {
|
|||
|
||||
@OriginalMember(owner = "client!pe", name = "y", descriptor = "I")
|
||||
public int anInt4464;
|
||||
|
||||
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V")
|
||||
public static void method4647(@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) int arg6) {
|
||||
@Pc(3) SceneGraph_Class120 local3 = new SceneGraph_Class120();
|
||||
local3.anInt4452 = arg1 / 128;
|
||||
local3.anInt4446 = arg2 / 128;
|
||||
local3.anInt4461 = arg3 / 128;
|
||||
local3.anInt4464 = arg4 / 128;
|
||||
local3.anInt4453 = arg0;
|
||||
local3.anInt4460 = arg1;
|
||||
local3.anInt4445 = arg2;
|
||||
local3.anInt4458 = arg3;
|
||||
local3.anInt4449 = arg4;
|
||||
local3.anInt4444 = arg5;
|
||||
local3.anInt4447 = arg6;
|
||||
SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3;
|
||||
}
|
||||
}
|
||||
|
|
@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.OriginalMember;
|
|||
public final class Scenery {
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "a", descriptor = "I")
|
||||
public int anInt1696;
|
||||
public int zMin;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "c", descriptor = "Lclient!th;")
|
||||
public Entity primary;
|
||||
public Entity entity;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "e", descriptor = "I")
|
||||
public int anInt1698;
|
||||
public int zMax;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "f", descriptor = "I")
|
||||
public int anInt1699;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "h", descriptor = "I")
|
||||
public int anInt1701;
|
||||
public int xMin;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "j", descriptor = "I")
|
||||
public int anInt1703;
|
||||
|
|
@ -34,10 +34,10 @@ public final class Scenery {
|
|||
public int anInt1707;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "s", descriptor = "I")
|
||||
public int anInt1709;
|
||||
public int level;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "w", descriptor = "I")
|
||||
public int anInt1713;
|
||||
public int xMax;
|
||||
|
||||
@OriginalMember(owner = "client!ec", name = "x", descriptor = "I")
|
||||
public int anInt1714;
|
||||
|
|
|
|||
|
|
@ -24,16 +24,16 @@ public final class Static105 {
|
|||
}
|
||||
@Pc(58) Scenery local58 = new Scenery();
|
||||
local58.key = arg11;
|
||||
local58.anInt1709 = arg0;
|
||||
local58.level = arg0;
|
||||
local58.anInt1699 = arg5;
|
||||
local58.anInt1703 = arg6;
|
||||
local58.anInt1706 = arg7;
|
||||
local58.primary = arg8;
|
||||
local58.entity = arg8;
|
||||
local58.anInt1714 = arg9;
|
||||
local58.anInt1701 = arg1;
|
||||
local58.anInt1696 = arg2;
|
||||
local58.anInt1713 = arg1 + arg3 - 1;
|
||||
local58.anInt1698 = arg2 + arg4 - 1;
|
||||
local58.xMin = arg1;
|
||||
local58.zMin = arg2;
|
||||
local58.xMax = arg1 + arg3 - 1;
|
||||
local58.zMax = arg2 + arg4 - 1;
|
||||
@Pc(108) int local108;
|
||||
for (local17 = arg1; local17 < arg1 + arg3; local17++) {
|
||||
for (local108 = arg2; local108 < arg2 + arg4; local108++) {
|
||||
|
|
@ -57,8 +57,8 @@ public final class Static105 {
|
|||
}
|
||||
@Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108];
|
||||
local174.scenery[local174.sceneryLen] = local58;
|
||||
local174.anIntArray59[local174.sceneryLen] = local115;
|
||||
local174.anInt664 |= local115;
|
||||
local174.interiorFlags[local174.sceneryLen] = local115;
|
||||
local174.allInteriorFlags |= local115;
|
||||
local174.sceneryLen++;
|
||||
if (local6 && SceneGraph.anIntArrayArray11[local17][local108] != 0) {
|
||||
local8 = SceneGraph.anIntArrayArray11[local17][local108];
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public final class Static123 {
|
|||
public static void method2419() {
|
||||
SceneGraph.anInt4870 = 0;
|
||||
label194: for (@Pc(3) int local3 = 0; local3 < SceneGraph.anInt917; local3++) {
|
||||
@Pc(10) Class120 local10 = SceneGraph.aClass120Array1[local3];
|
||||
@Pc(10) SceneGraph_Class120 local10 = SceneGraph.aClass120Array1[local3];
|
||||
@Pc(14) int local14;
|
||||
if (Static8.anIntArray8 != null) {
|
||||
for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) {
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ public final class Static16 {
|
|||
@Pc(54) Tile local54 = local30[local32][local42];
|
||||
if (local54 != null) {
|
||||
@Pc(71) GlModel local71;
|
||||
if (local54.groundDecor != null && local54.groundDecor.primary instanceof GlModel) {
|
||||
local71 = (GlModel) local54.groundDecor.primary;
|
||||
if (local54.groundDecor != null && local54.groundDecor.entity instanceof GlModel) {
|
||||
local71 = (GlModel) local54.groundDecor.entity;
|
||||
if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) {
|
||||
local71.method4111(false, true, true, false, true, true);
|
||||
} else {
|
||||
|
|
@ -44,8 +44,8 @@ public final class Static16 {
|
|||
local71.method4111(true, true, true, true, true, true);
|
||||
}
|
||||
}
|
||||
if (local54.wallDecor.aClass8_2 instanceof GlModel) {
|
||||
local71 = (GlModel) local54.wallDecor.aClass8_2;
|
||||
if (local54.wallDecor.secondary instanceof GlModel) {
|
||||
local71 = (GlModel) local54.wallDecor.secondary;
|
||||
if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) {
|
||||
local71.method4111(false, true, true, false, true, true);
|
||||
} else {
|
||||
|
|
@ -62,8 +62,8 @@ public final class Static16 {
|
|||
local71.method4111(true, true, true, true, true, true);
|
||||
}
|
||||
}
|
||||
if (local54.wall.aClass8_6 instanceof GlModel) {
|
||||
local71 = (GlModel) local54.wall.aClass8_6;
|
||||
if (local54.wall.secondary instanceof GlModel) {
|
||||
local71 = (GlModel) local54.wall.secondary;
|
||||
if ((Long.MIN_VALUE & local54.wall.key) == 0L) {
|
||||
local71.method4111(false, true, true, false, true, true);
|
||||
} else {
|
||||
|
|
@ -72,8 +72,8 @@ public final class Static16 {
|
|||
}
|
||||
}
|
||||
for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) {
|
||||
if (local54.scenery[local270].primary instanceof GlModel) {
|
||||
@Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].primary;
|
||||
if (local54.scenery[local270].entity instanceof GlModel) {
|
||||
@Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].entity;
|
||||
if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) {
|
||||
local293.method4111(false, true, true, false, true, true);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -67,37 +67,6 @@ public final class Static176 {
|
|||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIIIIIIIIIIIIIIIII)V")
|
||||
public static void method3305(@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) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14, @OriginalArg(15) int arg15, @OriginalArg(16) int arg16, @OriginalArg(17) int arg17, @OriginalArg(18) int arg18, @OriginalArg(19) int arg19) {
|
||||
@Pc(12) PlainTile local12;
|
||||
@Pc(14) int local14;
|
||||
if (arg3 == 0) {
|
||||
local12 = new PlainTile(arg10, arg11, arg12, arg13, -1, arg18, false);
|
||||
for (local14 = arg0; local14 >= 0; local14--) {
|
||||
if (SceneGraph.tiles[local14][arg1][arg2] == null) {
|
||||
SceneGraph.tiles[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
|
||||
}
|
||||
}
|
||||
SceneGraph.tiles[arg0][arg1][arg2].plainTile = local12;
|
||||
} else if (arg3 == 1) {
|
||||
local12 = new PlainTile(arg14, arg15, arg16, arg17, arg5, arg19, arg6 == arg7 && arg6 == arg8 && arg6 == arg9);
|
||||
for (local14 = arg0; local14 >= 0; local14--) {
|
||||
if (SceneGraph.tiles[local14][arg1][arg2] == null) {
|
||||
SceneGraph.tiles[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
|
||||
}
|
||||
}
|
||||
SceneGraph.tiles[arg0][arg1][arg2].plainTile = local12;
|
||||
} else {
|
||||
@Pc(134) ShapedTile local134 = new ShapedTile(arg3, arg4, arg5, arg1, arg2, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19);
|
||||
for (local14 = arg0; local14 >= 0; local14--) {
|
||||
if (SceneGraph.tiles[local14][arg1][arg2] == null) {
|
||||
SceneGraph.tiles[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
|
||||
}
|
||||
}
|
||||
SceneGraph.tiles[arg0][arg1][arg2].shapedTile = local134;
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIII)V")
|
||||
public static void method3308(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
|
||||
for (@Pc(8) int local8 = arg2; local8 <= arg0; local8++) {
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ public final class Static183 {
|
|||
@OriginalMember(owner = "client!ok", name = "b", descriptor = "I")
|
||||
public static int anInt4271;
|
||||
|
||||
@OriginalMember(owner = "client!ok", name = "c", descriptor = "I")
|
||||
public static int anInt4272 = (int) (Math.random() * 33.0D) - 16;
|
||||
|
||||
@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
|
||||
public static long prevClickTime = 0L;
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ public final class Static185 {
|
|||
}
|
||||
SceneGraph.setGroundDecor(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
|
||||
if (local62.anInt4435 == 1 && arg4 != null) {
|
||||
arg4.method3057(arg7, arg8);
|
||||
arg4.flagGroundDecor(arg7, arg8);
|
||||
}
|
||||
}
|
||||
} else if (arg6 == 10 || arg6 == 11) {
|
||||
|
|
@ -198,7 +198,7 @@ public final class Static185 {
|
|||
}
|
||||
}
|
||||
if (local62.anInt4435 != 0 && arg4 != null) {
|
||||
arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
}
|
||||
if (local62.wallDecorOffsetScale != 16) {
|
||||
Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
|
||||
|
|
@ -226,7 +226,7 @@ public final class Static185 {
|
|||
}
|
||||
}
|
||||
if (local62.anInt4435 != 0 && arg4 != null) {
|
||||
arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
}
|
||||
} else {
|
||||
@Pc(1226) int local1226;
|
||||
|
|
@ -266,7 +266,7 @@ public final class Static185 {
|
|||
}
|
||||
}
|
||||
if (local62.anInt4435 != 0 && arg4 != null) {
|
||||
arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
}
|
||||
if (local62.wallDecorOffsetScale != 16) {
|
||||
Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
|
||||
|
|
@ -294,7 +294,7 @@ public final class Static185 {
|
|||
}
|
||||
}
|
||||
if (local62.anInt4435 != 0 && arg4 != null) {
|
||||
arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
|
||||
}
|
||||
} else if (arg6 == 9) {
|
||||
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
|
||||
|
|
|
|||
|
|
@ -55,38 +55,4 @@ public final class Static220 {
|
|||
Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.value, local152, local89, local91);
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")
|
||||
public static void method3801() {
|
||||
for (@Pc(1) int local1 = 0; local1 < SceneGraph.anInt3114; local1++) {
|
||||
for (@Pc(6) int local6 = 0; local6 < SceneGraph.width; local6++) {
|
||||
for (@Pc(11) int local11 = 0; local11 < SceneGraph.length; local11++) {
|
||||
@Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11];
|
||||
if (local22 != null) {
|
||||
@Pc(27) Wall local27 = local22.wall;
|
||||
if (local27 != null && local27.primary.method4543()) {
|
||||
Static69.method1544(local27.primary, local1, local6, local11, 1, 1);
|
||||
if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) {
|
||||
Static69.method1544(local27.aClass8_6, local1, local6, local11, 1, 1);
|
||||
local27.primary.method4544(local27.aClass8_6, 0, 0, 0, false);
|
||||
local27.aClass8_6 = local27.aClass8_6.createModel();
|
||||
}
|
||||
local27.primary = local27.primary.createModel();
|
||||
}
|
||||
for (@Pc(83) int local83 = 0; local83 < local22.sceneryLen; local83++) {
|
||||
@Pc(92) Scenery local92 = local22.scenery[local83];
|
||||
if (local92 != null && local92.primary.method4543()) {
|
||||
Static69.method1544(local92.primary, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1);
|
||||
local92.primary = local92.primary.createModel();
|
||||
}
|
||||
}
|
||||
@Pc(131) GroundDecor local131 = local22.groundDecor;
|
||||
if (local131 != null && local131.primary.method4543()) {
|
||||
Static264.method3574(local131.primary, local1, local6, local11);
|
||||
local131.primary = local131.primary.createModel();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public final class Static223 {
|
|||
public static void method3858() {
|
||||
for (@Pc(1) int local1 = 0; local1 < SceneGraph.sceneryLen; local1++) {
|
||||
@Pc(8) Scenery local8 = SceneGraph.scenery[local1];
|
||||
Static266.method4193(local8);
|
||||
SceneGraph.removeScenery(local8);
|
||||
SceneGraph.scenery[local1] = null;
|
||||
}
|
||||
SceneGraph.sceneryLen = 0;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ public final class Static224 {
|
|||
local30.anInt672--;
|
||||
for (@Pc(40) int local40 = 0; local40 < local30.sceneryLen; local40++) {
|
||||
@Pc(49) Scenery local49 = local30.scenery[local40];
|
||||
if ((local49.key >> 29 & 0x3L) == 2L && local49.anInt1701 == arg0 && local49.anInt1696 == arg1) {
|
||||
local49.anInt1709--;
|
||||
if ((local49.key >> 29 & 0x3L) == 2L && local49.xMin == arg0 && local49.zMin == arg1) {
|
||||
local49.level--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,28 +42,6 @@ public final class Static230 {
|
|||
PlayerAppearance.aClass99_21.clear();
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(BII)I")
|
||||
public static int method3949(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
|
||||
if (arg0 == -2) {
|
||||
return 12345678;
|
||||
} else if (arg0 == -1) {
|
||||
if (arg1 < 2) {
|
||||
arg1 = 2;
|
||||
} else if (arg1 > 126) {
|
||||
arg1 = 126;
|
||||
}
|
||||
return arg1;
|
||||
} else {
|
||||
arg1 = (arg0 & 0x7F) * arg1 >> 7;
|
||||
if (arg1 < 2) {
|
||||
arg1 = 2;
|
||||
} else if (arg1 > 126) {
|
||||
arg1 = 126;
|
||||
}
|
||||
return (arg0 & 0xFF80) + arg1;
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(IIBIII)V")
|
||||
public static void method3950(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
|
||||
if (arg0 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && TextureOp29.anInt2869 >= arg2) {
|
||||
|
|
|
|||
|
|
@ -114,25 +114,25 @@ public final class Static247 {
|
|||
}
|
||||
if (local18 <= Static167.anInt4069 && local18 > Static31.anInt987) {
|
||||
local153 = local31[local18 - 1][local21];
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.anInt664 & 0x1) == 0)) {
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x1) == 0)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (local18 >= Static167.anInt4069 && local18 < Static2.anInt15 - 1) {
|
||||
local153 = local31[local18 + 1][local21];
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.anInt664 & 0x4) == 0)) {
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x4) == 0)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (local21 <= Static193.anInt4539 && local21 > Static80.anInt4698) {
|
||||
local153 = local31[local18][local21 - 1];
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.anInt664 & 0x8) == 0)) {
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x8) == 0)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (local21 >= Static193.anInt4539 && local21 < Static215.anInt4866 - 1) {
|
||||
local153 = local31[local18][local21 + 1];
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.anInt664 & 0x2) == 0)) {
|
||||
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x2) == 0)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
@ -167,7 +167,7 @@ public final class Static247 {
|
|||
LightingManager.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
|
||||
}
|
||||
}
|
||||
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
|
||||
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null);
|
||||
}
|
||||
for (local65 = 0; local65 < local153.sceneryLen; local65++) {
|
||||
var25 = local153.scenery[local65];
|
||||
|
|
@ -175,7 +175,7 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
var25.primary.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.key, local24, null);
|
||||
var25.entity.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.key, local24, null);
|
||||
}
|
||||
}
|
||||
if (GlRenderer.enabled) {
|
||||
|
|
@ -209,7 +209,7 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local549.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.key, local24, null);
|
||||
local549.entity.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.xFine - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.zFine - Static217.anInt4903, local549.key, local24, null);
|
||||
if (GlRenderer.enabled && local549.aBoolean49) {
|
||||
GlRenderer.method4159(local33);
|
||||
}
|
||||
|
|
@ -257,13 +257,13 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local616.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
|
||||
local616.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null);
|
||||
}
|
||||
if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) {
|
||||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
|
||||
local616.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null);
|
||||
}
|
||||
}
|
||||
if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMinY())) {
|
||||
|
|
@ -296,11 +296,11 @@ public final class Static247 {
|
|||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
|
||||
} else if (local619.aClass8_2 != null) {
|
||||
} else if (local619.secondary != null) {
|
||||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local619.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
|
||||
local619.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
|
||||
}
|
||||
}
|
||||
if (GlRenderer.enabled) {
|
||||
|
|
@ -316,7 +316,7 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local1001.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.key, local24, null);
|
||||
local1001.entity.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.xFine - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.zFine - Static217.anInt4903, local1001.key, local24, null);
|
||||
if (GlRenderer.enabled && local1001.aBoolean49) {
|
||||
GlRenderer.method4159(local33);
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ public final class Static247 {
|
|||
}
|
||||
}
|
||||
}
|
||||
local894 = local8.anInt664;
|
||||
local894 = local8.allInteriorFlags;
|
||||
if (local894 != 0) {
|
||||
if (local18 < Static167.anInt4069 && (local894 & 0x4) != 0) {
|
||||
var32 = local31[local18 + 1][local21];
|
||||
|
|
@ -369,7 +369,7 @@ public final class Static247 {
|
|||
if (local8.anInt663 != 0) {
|
||||
var24 = true;
|
||||
for (var10 = 0; var10 < local8.sceneryLen; var10++) {
|
||||
if (local8.scenery[var10].anInt1707 != Static13.anInt437 && (local8.anIntArray59[var10] & local8.anInt663) == local8.anInt665) {
|
||||
if (local8.scenery[var10].anInt1707 != Static13.anInt437 && (local8.interiorFlags[var10] & local8.anInt663) == local8.anInt665) {
|
||||
var24 = false;
|
||||
break;
|
||||
}
|
||||
|
|
@ -380,8 +380,8 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
label882: {
|
||||
if ((var22.key & 0xFC000L) == 16384L) {
|
||||
local65 = var22.anInt3048 - Static149.anInt3555;
|
||||
local115 = var22.anInt3044 - Static217.anInt4903;
|
||||
local65 = var22.xFine - Static149.anInt3555;
|
||||
local115 = var22.zFine - Static217.anInt4903;
|
||||
local1332 = (int) (var22.key >> 20 & 0x3L);
|
||||
if (local1332 == 0) {
|
||||
local65 -= 64;
|
||||
|
|
@ -416,7 +416,7 @@ public final class Static247 {
|
|||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
}
|
||||
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
|
||||
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null);
|
||||
}
|
||||
local8.anInt663 = 0;
|
||||
}
|
||||
|
|
@ -431,8 +431,8 @@ public final class Static247 {
|
|||
label767: for (local65 = 0; local65 < var9; local65++) {
|
||||
var25 = local8.scenery[local65];
|
||||
if (var25.anInt1707 != Static13.anInt437) {
|
||||
for (local1332 = var25.anInt1701; local1332 <= var25.anInt1713; local1332++) {
|
||||
for (local894 = var25.anInt1696; local894 <= var25.anInt1698; local894++) {
|
||||
for (local1332 = var25.xMin; local1332 <= var25.xMax; local1332++) {
|
||||
for (local894 = var25.zMin; local894 <= var25.zMax; local894++) {
|
||||
var32 = local31[local1332][local894];
|
||||
if (var32.aBoolean45) {
|
||||
local8.aBoolean47 = true;
|
||||
|
|
@ -440,16 +440,16 @@ public final class Static247 {
|
|||
}
|
||||
if (var32.anInt663 != 0) {
|
||||
local904 = 0;
|
||||
if (local1332 > var25.anInt1701) {
|
||||
if (local1332 > var25.xMin) {
|
||||
local904++;
|
||||
}
|
||||
if (local1332 < var25.anInt1713) {
|
||||
if (local1332 < var25.xMax) {
|
||||
local904 += 4;
|
||||
}
|
||||
if (local894 > var25.anInt1696) {
|
||||
if (local894 > var25.zMin) {
|
||||
local904 += 8;
|
||||
}
|
||||
if (local894 < var25.anInt1698) {
|
||||
if (local894 < var25.zMax) {
|
||||
local904 += 2;
|
||||
}
|
||||
if ((local904 & var32.anInt663) == local8.anInt667) {
|
||||
|
|
@ -460,13 +460,13 @@ public final class Static247 {
|
|||
}
|
||||
}
|
||||
SceneGraph.aClass31Array2[var10++] = var25;
|
||||
local1332 = Static167.anInt4069 - var25.anInt1701;
|
||||
local894 = var25.anInt1713 - Static167.anInt4069;
|
||||
local1332 = Static167.anInt4069 - var25.xMin;
|
||||
local894 = var25.xMax - Static167.anInt4069;
|
||||
if (local894 > local1332) {
|
||||
local1332 = local894;
|
||||
}
|
||||
local899 = Static193.anInt4539 - var25.anInt1696;
|
||||
local904 = var25.anInt1698 - Static193.anInt4539;
|
||||
local899 = Static193.anInt4539 - var25.zMin;
|
||||
local904 = var25.zMax - Static193.anInt4539;
|
||||
if (local904 > local899) {
|
||||
var25.anInt1705 = local1332 + local904;
|
||||
} else {
|
||||
|
|
@ -499,7 +499,7 @@ public final class Static247 {
|
|||
}
|
||||
@Pc(1697) Scenery local1697 = SceneGraph.aClass31Array2[local115];
|
||||
local1697.anInt1707 = Static13.anInt437;
|
||||
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.primary.getMinY())) {
|
||||
if (!Static73.method1599(local27, local1697.xMin, local1697.xMax, local1697.zMin, local1697.zMax, local1697.entity.getMinY())) {
|
||||
if (GlRenderer.enabled) {
|
||||
if ((local1697.key & 0xFC000L) == 147456L) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
|
|
@ -518,13 +518,13 @@ public final class Static247 {
|
|||
LightingManager.method2397(local24, local18, local21 + 1, local18 - 1, local21);
|
||||
}
|
||||
} else {
|
||||
LightingManager.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698);
|
||||
LightingManager.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.xMin, local1697.zMin, local1697.xMax, local1697.zMax);
|
||||
}
|
||||
}
|
||||
local1697.primary.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.key, local24, null);
|
||||
local1697.entity.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.key, local24, null);
|
||||
}
|
||||
for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) {
|
||||
for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) {
|
||||
for (local894 = local1697.xMin; local894 <= local1697.xMax; local894++) {
|
||||
for (local899 = local1697.zMin; local899 <= local1697.zMax; local899++) {
|
||||
@Pc(1863) Tile local1863 = local31[local894][local899];
|
||||
if (local1863.anInt663 != 0) {
|
||||
Static7.aClass69_32.addTail(local1863);
|
||||
|
|
@ -609,11 +609,11 @@ public final class Static247 {
|
|||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
|
||||
} else if (local2109.aClass8_2 != null) {
|
||||
} else if (local2109.secondary != null) {
|
||||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
|
||||
}
|
||||
local2109.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
|
||||
local2109.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -623,18 +623,18 @@ public final class Static247 {
|
|||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
|
||||
}
|
||||
local2275.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
|
||||
local2275.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null);
|
||||
}
|
||||
if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) {
|
||||
if (GlRenderer.enabled) {
|
||||
LightingManager.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
|
||||
}
|
||||
local2275.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
|
||||
local2275.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@Pc(2388) Tile local2388;
|
||||
if (local24 < SceneGraph.anInt3114 - 1) {
|
||||
if (local24 < SceneGraph.levels - 1) {
|
||||
local2388 = SceneGraph.tiles[local24 + 1][local18][local21];
|
||||
if (local2388 != null && local2388.aBoolean46) {
|
||||
Static7.aClass69_32.addTail(local2388);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public final class Static248 {
|
|||
@Pc(32) int local32;
|
||||
@Pc(37) int local37;
|
||||
@Pc(183) int local183;
|
||||
for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.anInt3114; local23++) {
|
||||
for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.levels; local23++) {
|
||||
@Pc(30) Tile[][] local30 = SceneGraph.tiles[local23];
|
||||
for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) {
|
||||
for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) {
|
||||
|
|
@ -43,26 +43,26 @@ public final class Static248 {
|
|||
if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) {
|
||||
if (local46.wall != null) {
|
||||
@Pc(103) Wall local103 = local46.wall;
|
||||
local103.primary.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
|
||||
if (local103.aClass8_6 != null) {
|
||||
local103.aClass8_6.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
|
||||
local103.primary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine);
|
||||
if (local103.secondary != null) {
|
||||
local103.secondary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine);
|
||||
}
|
||||
}
|
||||
if (local46.wallDecor != null) {
|
||||
@Pc(134) WallDecor local134 = local46.wallDecor;
|
||||
local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
|
||||
if (local134.aClass8_2 != null) {
|
||||
local134.aClass8_2.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
|
||||
if (local134.secondary != null) {
|
||||
local134.secondary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
|
||||
}
|
||||
}
|
||||
if (local46.groundDecor != null) {
|
||||
@Pc(167) GroundDecor local167 = local46.groundDecor;
|
||||
local167.primary.method4545(0, local23, local167.anInt733, local167.anInt732, local167.anInt736);
|
||||
local167.entity.method4545(0, local23, local167.anInt733, local167.xFine, local167.zFine);
|
||||
}
|
||||
if (local46.scenery != null) {
|
||||
for (local183 = 0; local183 < local46.sceneryLen; local183++) {
|
||||
@Pc(192) Scenery local192 = local46.scenery[local183];
|
||||
local192.primary.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
|
||||
local192.entity.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -97,7 +97,7 @@ public final class Static248 {
|
|||
} else {
|
||||
local32 = Static235.anInt5276;
|
||||
while (true) {
|
||||
if (local32 >= SceneGraph.anInt3114) {
|
||||
if (local32 >= SceneGraph.levels) {
|
||||
LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles);
|
||||
break;
|
||||
}
|
||||
|
|
@ -125,7 +125,7 @@ public final class Static248 {
|
|||
@Pc(406) Tile[][] local406;
|
||||
@Pc(415) int local415;
|
||||
@Pc(428) int local428;
|
||||
for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
|
||||
for (local399 = Static235.anInt5276; local399 < SceneGraph.levels; local399++) {
|
||||
local406 = SceneGraph.tiles[local399];
|
||||
for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) {
|
||||
local415 = Static167.anInt4069 + local37;
|
||||
|
|
@ -172,7 +172,7 @@ public final class Static248 {
|
|||
}
|
||||
}
|
||||
}
|
||||
for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
|
||||
for (local399 = Static235.anInt5276; local399 < SceneGraph.levels; local399++) {
|
||||
local406 = SceneGraph.tiles[local399];
|
||||
for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) {
|
||||
local415 = Static167.anInt4069 + local37;
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ public final class Static253 {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) {
|
||||
if (local39.attachment == null || client.loop < local39.attachmentSetAt || local39.attachmentResetAt <= client.loop) {
|
||||
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
|
||||
Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -76,9 +76,9 @@ public final class Static254 {
|
|||
if (local395 != null && local395.sceneryLen > 0) {
|
||||
for (local227 = 0; local227 < local395.sceneryLen; local227++) {
|
||||
@Pc(418) Scenery local418 = local395.scenery[local227];
|
||||
if (local418.anInt1713 != local418.anInt1701 || local418.anInt1698 != local418.anInt1696) {
|
||||
for (local358 = local418.anInt1701; local358 <= local418.anInt1713; local358++) {
|
||||
for (@Pc(450) int local450 = local418.anInt1696; local450 <= local418.anInt1698; local450++) {
|
||||
if (local418.xMax != local418.xMin || local418.zMax != local418.zMin) {
|
||||
for (local358 = local418.xMin; local358 <= local418.xMax; local358++) {
|
||||
for (@Pc(450) int local450 = local418.zMin; local450 <= local418.zMax; local450++) {
|
||||
Static266.aByteArrayArrayArray15[local150][local358][local450] = local14;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,26 +28,26 @@ public final class Static264 {
|
|||
@Pc(12) Tile local12;
|
||||
if (arg2 < SceneGraph.width) {
|
||||
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3];
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.primary, 128, 0, 0, true);
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.entity.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.entity, 128, 0, 0, true);
|
||||
}
|
||||
}
|
||||
if (arg3 < SceneGraph.width) {
|
||||
local12 = SceneGraph.tiles[arg1][arg2][arg3 + 1];
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.primary, 0, 0, 128, true);
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.entity.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.entity, 0, 0, 128, true);
|
||||
}
|
||||
}
|
||||
if (arg2 < SceneGraph.width && arg3 < SceneGraph.length) {
|
||||
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 + 1];
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.primary, 128, 0, 128, true);
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.entity.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.entity, 128, 0, 128, true);
|
||||
}
|
||||
}
|
||||
if (arg2 < SceneGraph.width && arg3 > 0) {
|
||||
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 - 1];
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.primary, 128, 0, -128, true);
|
||||
if (local12 != null && local12.groundDecor != null && local12.groundDecor.entity.method4543()) {
|
||||
arg0.method4544(local12.groundDecor.entity, 128, 0, -128, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package rt4;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
||||
public final class Static266 {
|
||||
|
||||
|
|
@ -15,30 +13,4 @@ public final class Static266 {
|
|||
@OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;")
|
||||
public static final JagString aClass100_1010 = JagString.parse("null");
|
||||
|
||||
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ec;)V")
|
||||
public static void method4193(@OriginalArg(0) Scenery arg0) {
|
||||
for (@Pc(2) int local2 = arg0.anInt1701; local2 <= arg0.anInt1713; local2++) {
|
||||
for (@Pc(9) int local9 = arg0.anInt1696; local9 <= arg0.anInt1698; local9++) {
|
||||
@Pc(22) Tile local22 = SceneGraph.tiles[arg0.anInt1709][local2][local9];
|
||||
if (local22 != null) {
|
||||
@Pc(26) int local26;
|
||||
for (local26 = 0; local26 < local22.sceneryLen; local26++) {
|
||||
if (local22.scenery[local26] == arg0) {
|
||||
local22.sceneryLen--;
|
||||
for (@Pc(44) int local44 = local26; local44 < local22.sceneryLen; local44++) {
|
||||
local22.scenery[local44] = local22.scenery[local44 + 1];
|
||||
local22.anIntArray59[local44] = local22.anIntArray59[local44 + 1];
|
||||
}
|
||||
local22.scenery[local22.sceneryLen] = null;
|
||||
break;
|
||||
}
|
||||
}
|
||||
local22.anInt664 = 0;
|
||||
for (local26 = 0; local26 < local22.sceneryLen; local26++) {
|
||||
local22.anInt664 |= local22.anIntArray59[local26];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,18 +20,6 @@ public final class Static267 {
|
|||
@OriginalMember(owner = "client!vl", name = "l", descriptor = "I")
|
||||
public static int anInt5776 = 0;
|
||||
|
||||
@OriginalMember(owner = "client!vl", name = "a", descriptor = "(III)Lclient!bm;")
|
||||
public static GroundDecor method4526(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
|
||||
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
|
||||
if (local7 == null) {
|
||||
return null;
|
||||
} else {
|
||||
@Pc(14) GroundDecor local14 = local7.groundDecor;
|
||||
local7.groundDecor = null;
|
||||
return local14;
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!vl", name = "a", descriptor = "(I)Z")
|
||||
public static boolean isShowingVideoAd() {
|
||||
if (client.objectTag) {
|
||||
|
|
|
|||
|
|
@ -40,114 +40,114 @@ public final class Static43 {
|
|||
}
|
||||
|
||||
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V")
|
||||
public static void method1144(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap arg5) {
|
||||
@Pc(9) long local9 = 0L;
|
||||
public static void method1144(@OriginalArg(1) int z, @OriginalArg(2) int x, @OriginalArg(3) int level, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap collision) {
|
||||
@Pc(9) long key = 0L;
|
||||
if (arg3 == 0) {
|
||||
local9 = SceneGraph.getWallKey(arg2, arg1, arg0);
|
||||
key = SceneGraph.getWallKey(level, x, z);
|
||||
} else if (arg3 == 1) {
|
||||
local9 = SceneGraph.getWallDecorKey(arg2, arg1, arg0);
|
||||
key = SceneGraph.getWallDecorKey(level, x, z);
|
||||
} else if (arg3 == 2) {
|
||||
local9 = SceneGraph.getSceneryKey(arg2, arg1, arg0);
|
||||
key = SceneGraph.getSceneryKey(level, x, z);
|
||||
} else if (arg3 == 3) {
|
||||
local9 = SceneGraph.getGroundDecorKey(arg2, arg1, arg0);
|
||||
key = SceneGraph.getGroundDecorKey(level, x, z);
|
||||
}
|
||||
@Pc(57) int local57 = (int) local9 >> 14 & 0x1F;
|
||||
@Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE;
|
||||
@Pc(74) LocType local74 = LocTypeList.get(local70);
|
||||
if (local74.hasAreaSound()) {
|
||||
AreaSoundManager.remove(arg1, local74, arg0, arg2);
|
||||
@Pc(57) int shape = (int) key >> 14 & 0x1F;
|
||||
@Pc(70) int id = (int) (key >>> 32) & Integer.MAX_VALUE;
|
||||
@Pc(74) LocType type = LocTypeList.get(id);
|
||||
if (type.hasAreaSound()) {
|
||||
AreaSoundManager.remove(x, type, z, level);
|
||||
}
|
||||
@Pc(92) int local92 = (int) local9 >> 20 & 0x3;
|
||||
if (local9 == 0L) {
|
||||
@Pc(92) int angle = (int) key >> 20 & 0x3;
|
||||
if (key == 0L) {
|
||||
return;
|
||||
}
|
||||
@Pc(100) Entity local100 = null;
|
||||
@Pc(102) Entity local102 = null;
|
||||
if (arg3 == 0) {
|
||||
@Pc(110) Wall local110 = SceneGraph.removeWall(arg2, arg1, arg0);
|
||||
if (local110 != null) {
|
||||
local100 = local110.primary;
|
||||
local102 = local110.aClass8_6;
|
||||
@Pc(110) Wall wall = SceneGraph.removeWall(level, x, z);
|
||||
if (wall != null) {
|
||||
local100 = wall.primary;
|
||||
local102 = wall.secondary;
|
||||
}
|
||||
if (local74.anInt4435 != 0) {
|
||||
arg5.method3039(local92, local74.aBoolean207, arg0, local57, arg1);
|
||||
if (type.anInt4435 != 0) {
|
||||
collision.unflagWall(angle, type.aBoolean207, z, shape, x);
|
||||
}
|
||||
} else if (arg3 == 1) {
|
||||
@Pc(233) WallDecor local233 = Static75.method1633(arg2, arg1, arg0);
|
||||
if (local233 != null) {
|
||||
local100 = local233.primary;
|
||||
local102 = local233.aClass8_2;
|
||||
@Pc(233) WallDecor wallDecor = SceneGraph.removeWallDecor(level, x, z);
|
||||
if (wallDecor != null) {
|
||||
local100 = wallDecor.primary;
|
||||
local102 = wallDecor.secondary;
|
||||
}
|
||||
} else if (arg3 == 2) {
|
||||
@Pc(148) Scenery local148 = Static47.method3996(arg2, arg1, arg0);
|
||||
if (local148 != null) {
|
||||
local100 = local148.primary;
|
||||
@Pc(148) Scenery scenery = SceneGraph.removeScenery(level, x, z);
|
||||
if (scenery != null) {
|
||||
local100 = scenery.entity;
|
||||
}
|
||||
if (local74.anInt4435 != 0 && local74.width + arg1 < 104 && local74.width + arg0 < 104 && arg1 + local74.length < 104 && arg0 + local74.length < 104) {
|
||||
arg5.unflagScenery(arg1, local74.width, local74.aBoolean207, local92, local74.length, arg0);
|
||||
if (type.anInt4435 != 0 && type.width + x < 104 && type.width + z < 104 && x + type.length < 104 && z + type.length < 104) {
|
||||
collision.unflagScenery(x, type.width, type.aBoolean207, angle, type.length, z);
|
||||
}
|
||||
} else if (arg3 == 3) {
|
||||
@Pc(211) GroundDecor local211 = Static267.method4526(arg2, arg1, arg0);
|
||||
if (local211 != null) {
|
||||
local100 = local211.primary;
|
||||
@Pc(211) GroundDecor groundDecor = SceneGraph.removeGroundDecor(level, x, z);
|
||||
if (groundDecor != null) {
|
||||
local100 = groundDecor.entity;
|
||||
}
|
||||
if (local74.anInt4435 == 1) {
|
||||
arg5.method3053(arg0, arg1);
|
||||
if (type.anInt4435 == 1) {
|
||||
collision.unflagGroundDecor(z, x);
|
||||
}
|
||||
}
|
||||
if (!GlRenderer.enabled || !local74.aBoolean212) {
|
||||
if (!GlRenderer.enabled || !type.aBoolean212) {
|
||||
return;
|
||||
}
|
||||
if (local57 == 2) {
|
||||
if (shape == 2) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, 0, local92 + 4, 0, local57, arg1, arg0, arg4);
|
||||
Loc.method181(type, 0, angle + 4, 0, shape, x, z, arg4);
|
||||
}
|
||||
if (local102 instanceof Loc) {
|
||||
((Loc) local102).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, 0, local92 + 1 & 0x3, 0, local57, arg1, arg0, arg4);
|
||||
Loc.method181(type, 0, angle + 1 & 0x3, 0, shape, x, z, arg4);
|
||||
}
|
||||
} else if (local57 == 5) {
|
||||
} else if (shape == 5) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, Static238.anIntArray469[local92] * 8, local92, Static34.anIntArray80[local92] * 8, 4, arg1, arg0, arg4);
|
||||
Loc.method181(type, Static238.anIntArray469[angle] * 8, angle, Static34.anIntArray80[angle] * 8, 4, x, z, arg4);
|
||||
}
|
||||
} else if (local57 == 6) {
|
||||
} else if (shape == 6) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
|
||||
Loc.method181(type, Static64.anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
|
||||
}
|
||||
} else if (local57 == 7) {
|
||||
} else if (shape == 7) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, 0, (local92 + 2 & 0x3) + 4, 0, 4, arg1, arg0, arg4);
|
||||
Loc.method181(type, 0, (angle + 2 & 0x3) + 4, 0, 4, x, z, arg4);
|
||||
}
|
||||
} else if (local57 == 8) {
|
||||
} else if (shape == 8) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
|
||||
Loc.method181(type, Static64.anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
|
||||
}
|
||||
if (local102 instanceof Loc) {
|
||||
((Loc) local102).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, Static64.anIntArray154[local92] * 8, (local92 + 2 & 0x3) + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
|
||||
Loc.method181(type, Static64.anIntArray154[angle] * 8, (angle + 2 & 0x3) + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
|
||||
}
|
||||
} else if (local57 == 11) {
|
||||
} else if (shape == 11) {
|
||||
if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, 0, local92 + 4, 0, 10, arg1, arg0, arg4);
|
||||
Loc.method181(type, 0, angle + 4, 0, 10, x, z, arg4);
|
||||
}
|
||||
} else if (local100 instanceof Loc) {
|
||||
((Loc) local100).method1046();
|
||||
} else {
|
||||
Loc.method181(local74, 0, local92, 0, local57, arg1, arg0, arg4);
|
||||
Loc.method181(type, 0, angle, 0, shape, x, z, arg4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,504 +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 Static45 {
|
||||
|
||||
@OriginalMember(owner = "client!gm", name = "R", descriptor = "I")
|
||||
public static int anInt2293 = (int) (Math.random() * 17.0D) - 8;
|
||||
|
||||
@OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V")
|
||||
public static void method1169(@OriginalArg(0) CollisionMap[] collisionMaps, @OriginalArg(1) boolean underwater) {
|
||||
@Pc(10) int level;
|
||||
@Pc(15) int x;
|
||||
if (!underwater) {
|
||||
for (level = 0; level < 4; level++) {
|
||||
for (x = 0; x < 104; x++) {
|
||||
for (@Pc(22) int z = 0; z < 104; z++) {
|
||||
if ((SceneGraph.tileFlags[level][x][z] & 0x1) == 1) {
|
||||
@Pc(43) int transformedLevel = level;
|
||||
if ((SceneGraph.tileFlags[1][x][z] & 0x2) == 2) {
|
||||
transformedLevel = level - 1;
|
||||
}
|
||||
if (transformedLevel >= 0) {
|
||||
collisionMaps[transformedLevel].addRangeableFlag(z, x);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Static183.anInt4272 += (int) (Math.random() * 5.0D) - 2;
|
||||
if (Static183.anInt4272 < -16) {
|
||||
Static183.anInt4272 = -16;
|
||||
}
|
||||
if (Static183.anInt4272 > 16) {
|
||||
Static183.anInt4272 = 16;
|
||||
}
|
||||
anInt2293 += (int) (Math.random() * 5.0D) - 2;
|
||||
if (anInt2293 < -8) {
|
||||
anInt2293 = -8;
|
||||
}
|
||||
if (anInt2293 > 8) {
|
||||
anInt2293 = 8;
|
||||
}
|
||||
}
|
||||
@Pc(128) byte local128;
|
||||
if (underwater) {
|
||||
local128 = 1;
|
||||
} else {
|
||||
local128 = 4;
|
||||
}
|
||||
level = anInt2293 >> 2 << 10;
|
||||
@Pc(142) int[][] local142 = new int[104][104];
|
||||
@Pc(146) int[][] local146 = new int[104][104];
|
||||
x = Static183.anInt4272 >> 1;
|
||||
@Pc(152) int local152;
|
||||
@Pc(168) int local168;
|
||||
@Pc(173) int local173;
|
||||
@Pc(178) int local178;
|
||||
@Pc(194) int local194;
|
||||
@Pc(200) int local200;
|
||||
@Pc(202) int local202;
|
||||
@Pc(209) int local209;
|
||||
@Pc(349) int local349;
|
||||
@Pc(234) int local234;
|
||||
@Pc(254) int local254;
|
||||
@Pc(267) int local267;
|
||||
for (local152 = 0; local152 < local128; local152++) {
|
||||
@Pc(159) byte[][] local159 = SceneGraph.aByteArrayArrayArray9[local152];
|
||||
@Pc(273) int local273;
|
||||
@Pc(326) int local326;
|
||||
@Pc(332) int local332;
|
||||
@Pc(322) int local322;
|
||||
if (!GlRenderer.enabled) {
|
||||
local168 = (int) Math.sqrt(5100.0D);
|
||||
local173 = local168 * 768 >> 8;
|
||||
for (local178 = 1; local178 < 103; local178++) {
|
||||
for (local194 = 1; local194 < 103; local194++) {
|
||||
local209 = SceneGraph.tileHeights[local152][local194][local178 + 1] - SceneGraph.tileHeights[local152][local194][local178 - 1];
|
||||
local202 = SceneGraph.tileHeights[local152][local194 + 1][local178] - SceneGraph.tileHeights[local152][local194 - 1][local178];
|
||||
local349 = (int) Math.sqrt((double) (local202 * local202 + local209 * local209 + 65536));
|
||||
local267 = (local209 << 8) / local349;
|
||||
local254 = -65536 / local349;
|
||||
local234 = (local202 << 8) / local349;
|
||||
local273 = (local159[local194][local178] >> 1) + (local159[local194][local178 - 1] >> 2) + (local159[local194 - -1][local178] >> 3) + (local159[local194 - 1][local178] >> 2) + (local159[local194][local178 + 1] >> 3);
|
||||
local200 = (local267 * -50 + local234 * -50 + local254 * -10) / local173 + 74;
|
||||
local146[local194][local178] = local200 - local273;
|
||||
}
|
||||
}
|
||||
} else if (Preferences.highDetailLighting) {
|
||||
for (local168 = 1; local168 < 103; local168++) {
|
||||
for (local173 = 1; local173 < 103; local173++) {
|
||||
local194 = (local159[local173 + 1][local168] >> 3) + (local159[local173 - 1][local168] >> 2) + (local159[local173][local168 + -1] >> 2) + (local159[local173][local168 + 1] >> 3) + (local159[local173][local168] >> 1);
|
||||
local146[local173][local168] = 74 - local194;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
local168 = (int) FogManager.aFloatArray18[0];
|
||||
local173 = (int) FogManager.aFloatArray18[1];
|
||||
local178 = (int) FogManager.aFloatArray18[2];
|
||||
local194 = (int) Math.sqrt((double) (local173 * local173 + local168 * local168 + local178 * local178));
|
||||
local200 = local194 * 1024 >> 8;
|
||||
for (local202 = 1; local202 < 103; local202++) {
|
||||
for (local209 = 1; local209 < 103; local209++) {
|
||||
local234 = SceneGraph.tileHeights[local152][local209 + 1][local202] - SceneGraph.tileHeights[local152][local209 - 1][local202];
|
||||
local254 = SceneGraph.tileHeights[local152][local209][local202 + 1] - SceneGraph.tileHeights[local152][local209][local202 - 1];
|
||||
local267 = (int) Math.sqrt((double) (local234 * local234 + local254 * local254 + 65536));
|
||||
local273 = (local234 << 8) / local267;
|
||||
local322 = (local159[local209][local202 + 1] >> 3) + (local159[local209][local202 - 1] >> 2) + (local159[local209 - 1][local202] >> 2) + (local159[local209 + 1][local202] >> 3) + (local159[local209][local202] >> 1);
|
||||
local326 = -65536 / local267;
|
||||
local332 = (local254 << 8) / local267;
|
||||
local349 = (local178 * local332 + local168 * local273 + local326 * local173) / local200 + 96;
|
||||
local146[local209][local202] = local349 - (int) ((float) local322 * 1.7F);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (local168 = 0; local168 < 104; local168++) {
|
||||
SceneGraph.anIntArray376[local168] = 0;
|
||||
SceneGraph.anIntArray325[local168] = 0;
|
||||
SceneGraph.anIntArray568[local168] = 0;
|
||||
SceneGraph.anIntArray479[local168] = 0;
|
||||
SceneGraph.anIntArray293[local168] = 0;
|
||||
}
|
||||
for (local168 = -5; local168 < 104; local168++) {
|
||||
for (local173 = 0; local173 < 104; local173++) {
|
||||
local178 = local168 + 5;
|
||||
@Pc(729) int local729;
|
||||
if (local178 < 104) {
|
||||
local194 = SceneGraph.tileUnderlays[local152][local178][local173] & 0xFF;
|
||||
if (local194 > 0) {
|
||||
@Pc(693) FluType local693 = FluTypeList.get(local194 - 1);
|
||||
SceneGraph.anIntArray376[local173] += local693.weightedHue;
|
||||
SceneGraph.anIntArray325[local173] += local693.saturation;
|
||||
SceneGraph.anIntArray568[local173] += local693.lightness;
|
||||
SceneGraph.anIntArray479[local173] += local693.chroma;
|
||||
local729 = SceneGraph.anIntArray293[local173]++;
|
||||
}
|
||||
}
|
||||
local194 = local168 - 5;
|
||||
if (local194 >= 0) {
|
||||
local200 = SceneGraph.tileUnderlays[local152][local194][local173] & 0xFF;
|
||||
if (local200 > 0) {
|
||||
@Pc(758) FluType local758 = FluTypeList.get(local200 - 1);
|
||||
SceneGraph.anIntArray376[local173] -= local758.weightedHue;
|
||||
SceneGraph.anIntArray325[local173] -= local758.saturation;
|
||||
SceneGraph.anIntArray568[local173] -= local758.lightness;
|
||||
SceneGraph.anIntArray479[local173] -= local758.chroma;
|
||||
local729 = SceneGraph.anIntArray293[local173]--;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (local168 >= 0) {
|
||||
local173 = 0;
|
||||
local194 = 0;
|
||||
local178 = 0;
|
||||
local200 = 0;
|
||||
local202 = 0;
|
||||
for (local209 = -5; local209 < 104; local209++) {
|
||||
local349 = local209 + 5;
|
||||
if (local349 < 104) {
|
||||
local178 += SceneGraph.anIntArray325[local349];
|
||||
local202 += SceneGraph.anIntArray293[local349];
|
||||
local173 += SceneGraph.anIntArray376[local349];
|
||||
local200 += SceneGraph.anIntArray479[local349];
|
||||
local194 += SceneGraph.anIntArray568[local349];
|
||||
}
|
||||
local234 = local209 - 5;
|
||||
if (local234 >= 0) {
|
||||
local178 -= SceneGraph.anIntArray325[local234];
|
||||
local200 -= SceneGraph.anIntArray479[local234];
|
||||
local173 -= SceneGraph.anIntArray376[local234];
|
||||
local202 -= SceneGraph.anIntArray293[local234];
|
||||
local194 -= SceneGraph.anIntArray568[local234];
|
||||
}
|
||||
if (local209 >= 0 && local202 > 0) {
|
||||
local142[local168][local209] = Static54.method1309(local194 / local202, local178 / local202, local173 * 256 / local200);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (local168 = 1; local168 < 103; local168++) {
|
||||
label771: for (local173 = 1; local173 < 103; local173++) {
|
||||
if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == LoginManager.centralPlane) {
|
||||
if (SceneGraph.firstVisibleLevel > local152) {
|
||||
SceneGraph.firstVisibleLevel = local152;
|
||||
}
|
||||
local178 = SceneGraph.tileUnderlays[local152][local168][local173] & 0xFF;
|
||||
local194 = SceneGraph.tileOverlays[local152][local168][local173] & 0xFF;
|
||||
if (local178 > 0 || local194 > 0) {
|
||||
local202 = SceneGraph.tileHeights[local152][local168 + 1][local173];
|
||||
local200 = SceneGraph.tileHeights[local152][local168][local173];
|
||||
local349 = SceneGraph.tileHeights[local152][local168][local173 + 1];
|
||||
local209 = SceneGraph.tileHeights[local152][local168 + 1][local173 + 1];
|
||||
if (local152 > 0) {
|
||||
@Pc(1067) boolean local1067 = true;
|
||||
if (local178 == 0 && SceneGraph.tileShapes[local152][local168][local173] != 0) {
|
||||
local1067 = false;
|
||||
}
|
||||
if (local194 > 0 && !FloTypeList.method4395(local194 - 1).aBoolean312) {
|
||||
local1067 = false;
|
||||
}
|
||||
if (local1067 && local200 == local202 && local200 == local209 && local349 == local200) {
|
||||
SceneGraph.anIntArrayArrayArray6[local152][local168][local173] |= 0x4;
|
||||
}
|
||||
}
|
||||
if (local178 <= 0) {
|
||||
local234 = -1;
|
||||
local254 = 0;
|
||||
} else {
|
||||
local234 = local142[local168][local173];
|
||||
local267 = (local234 & 0x7F) + x;
|
||||
if (local267 < 0) {
|
||||
local267 = 0;
|
||||
} else if (local267 > 127) {
|
||||
local267 = 127;
|
||||
}
|
||||
local273 = (local234 & 0x380) + (local234 + level & 0xFC00) + local267;
|
||||
local254 = Rasteriser.palette[Static87.method1814(96, local273)];
|
||||
}
|
||||
local267 = local146[local168][local173];
|
||||
local332 = local146[local168][local173 + 1];
|
||||
local273 = local146[local168 + 1][local173];
|
||||
local326 = local146[local168 + 1][local173 + 1];
|
||||
if (local194 == 0) {
|
||||
Static176.method3305(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), 0, 0, 0, 0, local254, 0);
|
||||
if (GlRenderer.enabled && local152 > 0 && local234 != -1 && FluTypeList.get(local178 - 1).aBoolean198) {
|
||||
Static242.method4197(0, 0, true, false, local168, local173, local200 - SceneGraph.tileHeights[0][local168][local173], -SceneGraph.tileHeights[0][local168 + 1][local173] + local202, local209 - SceneGraph.tileHeights[0][local168 + 1][local173 + 1], local349 - SceneGraph.tileHeights[0][local168][local173 + 1]);
|
||||
}
|
||||
if (GlRenderer.enabled && !underwater && SceneGraph.anIntArrayArray11 != null && local152 == 0) {
|
||||
for (local322 = local168 - 1; local322 <= local168 + 1; local322++) {
|
||||
for (@Pc(1794) int local1794 = local173 - 1; local1794 <= local173 + 1; local1794++) {
|
||||
if ((local322 != local168 || local173 != local1794) && local322 >= 0 && local322 < 104 && local1794 >= 0 && local1794 < 104) {
|
||||
@Pc(1834) int local1834 = SceneGraph.tileOverlays[local152][local322][local1794] & 0xFF;
|
||||
if (local1834 != 0) {
|
||||
@Pc(1842) FloType local1842 = FloTypeList.method4395(local1834 - 1);
|
||||
if (local1842.texture != -1 && Rasteriser.textureProvider.getMaterialType(local1842.texture) == MaterialManager.WATER) {
|
||||
SceneGraph.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24);
|
||||
continue label771;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
local322 = SceneGraph.tileShapes[local152][local168][local173] + 1;
|
||||
@Pc(1242) byte local1242 = SceneGraph.tileAngles[local152][local168][local173];
|
||||
@Pc(1248) FloType local1248 = FloTypeList.method4395(local194 - 1);
|
||||
@Pc(1301) int local1301;
|
||||
@Pc(1353) int local1353;
|
||||
@Pc(1288) int local1288;
|
||||
if (GlRenderer.enabled && !underwater && SceneGraph.anIntArrayArray11 != null && local152 == 0) {
|
||||
if (local1248.texture != -1 && Rasteriser.textureProvider.getMaterialType(local1248.texture) == MaterialManager.WATER) {
|
||||
SceneGraph.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889;
|
||||
} else {
|
||||
label737: for (local1288 = local168 - 1; local1288 <= local168 + 1; local1288++) {
|
||||
for (local1301 = local173 - 1; local1301 <= local173 + 1; local1301++) {
|
||||
if ((local168 != local1288 || local1301 != local173) && local1288 >= 0 && local1288 < 104 && local1301 >= 0 && local1301 < 104) {
|
||||
local1353 = SceneGraph.tileOverlays[local152][local1288][local1301] & 0xFF;
|
||||
if (local1353 != 0) {
|
||||
@Pc(1366) FloType local1366 = FloTypeList.method4395(local1353 - 1);
|
||||
if (local1366.texture != -1 && Rasteriser.textureProvider.getMaterialType(local1366.texture) == MaterialManager.WATER) {
|
||||
SceneGraph.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24);
|
||||
break label737;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
local1288 = local1248.texture;
|
||||
if (local1288 >= 0 && !Rasteriser.textureProvider.method3236(local1288)) {
|
||||
local1288 = -1;
|
||||
}
|
||||
@Pc(1458) int local1458;
|
||||
@Pc(1429) int local1429;
|
||||
if (local1288 >= 0) {
|
||||
local1301 = -1;
|
||||
local1353 = Rasteriser.palette[Static230.method3949(Rasteriser.textureProvider.getAverageColor(local1288), 96)];
|
||||
} else if (local1248.anInt5899 == -1) {
|
||||
local1301 = -2;
|
||||
local1353 = 0;
|
||||
} else {
|
||||
local1301 = local1248.anInt5899;
|
||||
local1429 = x + (local1301 & 0x7F);
|
||||
if (local1429 < 0) {
|
||||
local1429 = 0;
|
||||
} else if (local1429 > 127) {
|
||||
local1429 = 127;
|
||||
}
|
||||
local1458 = (local1301 & 0x380) + ((local1301 + level & 0xFC00) + local1429);
|
||||
local1353 = Rasteriser.palette[Static230.method3949(local1458, 96)];
|
||||
}
|
||||
if (local1248.anInt5894 >= 0) {
|
||||
local1429 = local1248.anInt5894;
|
||||
local1458 = x + (local1429 & 0x7F);
|
||||
if (local1458 < 0) {
|
||||
local1458 = 0;
|
||||
} else if (local1458 > 127) {
|
||||
local1458 = 127;
|
||||
}
|
||||
@Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + level & 0xFC00) + local1458);
|
||||
local1353 = Rasteriser.palette[Static230.method3949(local1529, 96)];
|
||||
}
|
||||
Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353);
|
||||
if (GlRenderer.enabled && local152 > 0) {
|
||||
Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - SceneGraph.tileHeights[0][local168][local173], local202 - SceneGraph.tileHeights[0][local168 + 1][local173], local209 - SceneGraph.tileHeights[0][local168 + 1][local173 + 1], -SceneGraph.tileHeights[0][local168][local173 + 1] + local349);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (GlRenderer.enabled) {
|
||||
@Pc(1888) float[][] local1888 = new float[105][105];
|
||||
@Pc(1892) int[][] local1892 = SceneGraph.tileHeights[local152];
|
||||
@Pc(1896) float[][] local1896 = new float[105][105];
|
||||
@Pc(1900) float[][] local1900 = new float[105][105];
|
||||
local200 = 1;
|
||||
while (true) {
|
||||
if (local200 > 103) {
|
||||
@Pc(2025) GlTile[] local2025;
|
||||
if (underwater) {
|
||||
local2025 = Static193.method3501(SceneGraph.tileFlags, SceneGraph.tileShapes[local152], SceneGraph.tileUnderlays[local152], local146, local1896, SceneGraph.anIntArrayArray11, SceneGraph.tileOverlays[local152], SceneGraph.tileAngles[local152], local1888, local152, local1900, local142, SceneGraph.tileHeights[local152], SceneGraph.surfaceTileHeights[0]);
|
||||
method2280(local152, local2025);
|
||||
break;
|
||||
}
|
||||
local2025 = Static193.method3501(SceneGraph.tileFlags, SceneGraph.tileShapes[local152], SceneGraph.tileUnderlays[local152], local146, local1896, null, SceneGraph.tileOverlays[local152], SceneGraph.tileAngles[local152], local1888, local152, local1900, local142, SceneGraph.tileHeights[local152], null);
|
||||
@Pc(2049) GlTile[] local2049 = Static1.method2(local1896, local1888, SceneGraph.tileHeights[local152], local152, local1900, SceneGraph.tileAngles[local152], local146, SceneGraph.tileShapes[local152], SceneGraph.tileUnderlays[local152], SceneGraph.tileOverlays[local152], SceneGraph.tileFlags);
|
||||
@Pc(2057) GlTile[] local2057 = new GlTile[local2025.length + local2049.length];
|
||||
for (local349 = 0; local349 < local2025.length; local349++) {
|
||||
local2057[local349] = local2025[local349];
|
||||
}
|
||||
for (local349 = 0; local349 < local2049.length; local349++) {
|
||||
local2057[local2025.length + local349] = local2049[local349];
|
||||
}
|
||||
method2280(local152, local2057);
|
||||
Static221.method3393(local1900, SceneGraph.tileUnderlays[local152], SceneGraph.tileAngles[local152], LightingManager.lights, local152, LightingManager.lightCount, local1896, SceneGraph.tileShapes[local152], SceneGraph.tileOverlays[local152], SceneGraph.tileHeights[local152], local1888);
|
||||
break;
|
||||
}
|
||||
for (local202 = 1; local202 <= 103; local202++) {
|
||||
local349 = local1892[local202][local200 + 1] - local1892[local202][local200 - 1];
|
||||
local209 = local1892[local202 + 1][local200] - local1892[local202 - 1][local200];
|
||||
@Pc(1962) float local1962 = (float) Math.sqrt((double) (local209 * local209 + local349 * local349 + 65536));
|
||||
local1888[local202][local200] = (float) local209 / local1962;
|
||||
local1896[local202][local200] = -256.0F / local1962;
|
||||
local1900[local202][local200] = (float) local349 / local1962;
|
||||
}
|
||||
local200++;
|
||||
}
|
||||
}
|
||||
SceneGraph.tileUnderlays[local152] = null;
|
||||
SceneGraph.tileOverlays[local152] = null;
|
||||
SceneGraph.tileShapes[local152] = null;
|
||||
SceneGraph.tileAngles[local152] = null;
|
||||
SceneGraph.aByteArrayArrayArray9[local152] = null;
|
||||
}
|
||||
Static220.method3801();
|
||||
if (underwater) {
|
||||
return;
|
||||
}
|
||||
@Pc(2204) int local2204;
|
||||
for (local152 = 0; local152 < 104; local152++) {
|
||||
for (local2204 = 0; local2204 < 104; local2204++) {
|
||||
if ((SceneGraph.tileFlags[1][local152][local2204] & 0x2) == 2) {
|
||||
Static224.method3884(local152, local2204);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (local152 = 0; local152 < 4; local152++) {
|
||||
for (local2204 = 0; local2204 <= 104; local2204++) {
|
||||
for (local168 = 0; local168 <= 104; local168++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x1) != 0) {
|
||||
local200 = local152;
|
||||
for (local173 = local2204; local173 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local173 - 1] & 0x1) != 0; local173--) {
|
||||
}
|
||||
local194 = local152;
|
||||
for (local178 = local2204; local178 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local178 + 1] & 0x1) != 0; local178++) {
|
||||
}
|
||||
label454: while (local194 > 0) {
|
||||
for (local202 = local173; local202 <= local178; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local194 - 1][local168][local202] & 0x1) == 0) {
|
||||
break label454;
|
||||
}
|
||||
}
|
||||
local194--;
|
||||
}
|
||||
label443: while (local200 < 3) {
|
||||
for (local202 = local173; local202 <= local178; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local200 + 1][local168][local202] & 0x1) == 0) {
|
||||
break label443;
|
||||
}
|
||||
}
|
||||
local200++;
|
||||
}
|
||||
local202 = (local200 + 1 - local194) * (-local173 + (local178 - -1));
|
||||
if (local202 >= 8) {
|
||||
local349 = SceneGraph.tileHeights[local200][local168][local173] - 240;
|
||||
local234 = SceneGraph.tileHeights[local194][local168][local173];
|
||||
method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234);
|
||||
for (local254 = local194; local254 <= local200; local254++) {
|
||||
for (local267 = local173; local267 <= local178; local267++) {
|
||||
SceneGraph.anIntArrayArrayArray6[local254][local168][local267] &= 0xFFFFFFFE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x2) != 0) {
|
||||
for (local173 = local168; local173 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local173 - 1][local2204] & 0x2) != 0; local173--) {
|
||||
}
|
||||
local200 = local152;
|
||||
local194 = local152;
|
||||
for (local178 = local168; local178 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local178 + 1][local2204] & 0x2) != 0; local178++) {
|
||||
}
|
||||
label508: while (local194 > 0) {
|
||||
for (local202 = local173; local202 <= local178; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local194 - 1][local202][local2204] & 0x2) == 0) {
|
||||
break label508;
|
||||
}
|
||||
}
|
||||
local194--;
|
||||
}
|
||||
label497: while (local200 < 3) {
|
||||
for (local202 = local173; local202 <= local178; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local200 + 1][local202][local2204] & 0x2) == 0) {
|
||||
break label497;
|
||||
}
|
||||
}
|
||||
local200++;
|
||||
}
|
||||
local202 = (local178 + 1 - local173) * (-local194 + local200 - -1);
|
||||
if (local202 >= 8) {
|
||||
local349 = SceneGraph.tileHeights[local200][local173][local2204] - 240;
|
||||
local234 = SceneGraph.tileHeights[local194][local173][local2204];
|
||||
method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234);
|
||||
for (local254 = local194; local254 <= local200; local254++) {
|
||||
for (local267 = local173; local267 <= local178; local267++) {
|
||||
SceneGraph.anIntArrayArrayArray6[local254][local267][local2204] &= 0xFFFFFFFD;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x4) != 0) {
|
||||
local173 = local168;
|
||||
local178 = local168;
|
||||
for (local194 = local2204; local194 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local194 - 1] & 0x4) != 0; local194--) {
|
||||
}
|
||||
for (local200 = local2204; local200 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local200 + 1] & 0x4) != 0; local200++) {
|
||||
}
|
||||
label562: while (local173 > 0) {
|
||||
for (local202 = local194; local202 <= local200; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local152][local173 - 1][local202] & 0x4) == 0) {
|
||||
break label562;
|
||||
}
|
||||
}
|
||||
local173--;
|
||||
}
|
||||
label551: while (local178 < 104) {
|
||||
for (local202 = local194; local202 <= local200; local202++) {
|
||||
if ((SceneGraph.anIntArrayArrayArray6[local152][local178 + 1][local202] & 0x4) == 0) {
|
||||
break label551;
|
||||
}
|
||||
}
|
||||
local178++;
|
||||
}
|
||||
if ((local178 + 1 - local173) * (local200 - (local194 - 1)) >= 4) {
|
||||
local202 = SceneGraph.tileHeights[local152][local173][local194];
|
||||
method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202);
|
||||
for (local209 = local173; local209 <= local178; local209++) {
|
||||
for (local349 = local194; local349 <= local200; local349++) {
|
||||
SceneGraph.anIntArrayArrayArray6[local152][local209][local349] &= 0xFFFFFFFB;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V")
|
||||
public static void method4647(@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) int arg6) {
|
||||
@Pc(3) Class120 local3 = new Class120();
|
||||
local3.anInt4452 = arg1 / 128;
|
||||
local3.anInt4446 = arg2 / 128;
|
||||
local3.anInt4461 = arg3 / 128;
|
||||
local3.anInt4464 = arg4 / 128;
|
||||
local3.anInt4453 = arg0;
|
||||
local3.anInt4460 = arg1;
|
||||
local3.anInt4445 = arg2;
|
||||
local3.anInt4458 = arg3;
|
||||
local3.anInt4449 = arg4;
|
||||
local3.anInt4444 = arg5;
|
||||
local3.anInt4447 = arg6;
|
||||
SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
|
||||
public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
|
||||
SceneGraph.underwaterHdTiles[arg0] = arg1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +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 Static47 {
|
||||
|
||||
@OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;")
|
||||
public static Scenery method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
|
||||
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
|
||||
if (local7 == null) {
|
||||
return null;
|
||||
}
|
||||
for (@Pc(13) int local13 = 0; local13 < local7.sceneryLen; local13++) {
|
||||
@Pc(22) Scenery local22 = local7.scenery[local13];
|
||||
if ((local22.key >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
|
||||
Static266.method4193(local22);
|
||||
return local22;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ public final class Static69 {
|
|||
for (@Pc(46) int local46 = 0; local46 < local42.sceneryLen; local46++) {
|
||||
@Pc(55) Scenery local55 = local42.scenery[local46];
|
||||
if ((local55.key & 0x400000L) == 4194304L) {
|
||||
@Pc(66) int local66 = local55.primary.getMinY();
|
||||
@Pc(66) int local66 = local55.entity.getMinY();
|
||||
if (local66 != -32768 && local66 < local34) {
|
||||
local34 = local66;
|
||||
}
|
||||
|
|
@ -62,7 +62,7 @@ public final class Static69 {
|
|||
@Pc(11) int local11 = arg3 - 1;
|
||||
@Pc(15) int local15 = arg3 + arg5;
|
||||
for (@Pc(17) int local17 = arg1; local17 <= arg1 + 1; local17++) {
|
||||
if (local17 != SceneGraph.anInt3114) {
|
||||
if (local17 != SceneGraph.levels) {
|
||||
for (@Pc(28) int local28 = local3; local28 <= local7; local28++) {
|
||||
if (local28 >= 0 && local28 < SceneGraph.width) {
|
||||
for (@Pc(39) int local39 = local11; local39 <= local15; local39++) {
|
||||
|
|
@ -75,16 +75,16 @@ public final class Static69 {
|
|||
if (local161.primary.method4543()) {
|
||||
arg0.method4544(local161.primary, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
|
||||
}
|
||||
if (local161.aClass8_6 != null && local161.aClass8_6.method4543()) {
|
||||
arg0.method4544(local161.aClass8_6, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
|
||||
if (local161.secondary != null && local161.secondary.method4543()) {
|
||||
arg0.method4544(local161.secondary, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
|
||||
}
|
||||
}
|
||||
for (@Pc(232) int local232 = 0; local232 < local71.sceneryLen; local232++) {
|
||||
@Pc(241) Scenery local241 = local71.scenery[local232];
|
||||
if (local241 != null && local241.primary.method4543() && (local28 == local241.anInt1701 || local28 == local3) && (local39 == local241.anInt1696 || local39 == local11)) {
|
||||
@Pc(270) int local270 = local241.anInt1713 + 1 - local241.anInt1701;
|
||||
@Pc(278) int local278 = local241.anInt1698 + 1 - local241.anInt1696;
|
||||
arg0.method4544(local241.primary, (local241.anInt1701 - arg2) * 128 + (local270 - arg4) * 64, local158, (local241.anInt1696 - arg3) * 128 + (local278 - arg5) * 64, local1);
|
||||
if (local241 != null && local241.entity.method4543() && (local28 == local241.xMin || local28 == local3) && (local39 == local241.zMin || local39 == local11)) {
|
||||
@Pc(270) int local270 = local241.xMax + 1 - local241.xMin;
|
||||
@Pc(278) int local278 = local241.zMax + 1 - local241.zMin;
|
||||
arg0.method4544(local241.entity, (local241.xMin - arg2) * 128 + (local270 - arg4) * 64, local158, (local241.zMin - arg3) * 128 + (local278 - arg5) * 64, local1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@ public final class Static70 {
|
|||
local72 = 127;
|
||||
}
|
||||
local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72;
|
||||
local53 = Rasteriser.palette[Static230.method3949(local95, 96)];
|
||||
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
|
||||
} else if (local24 >= 0) {
|
||||
local53 = Rasteriser.palette[Static230.method3949(Rasteriser.textureProvider.getAverageColor(local24), 96)];
|
||||
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(Rasteriser.textureProvider.getAverageColor(local24), 96)];
|
||||
} else if (local18.anInt5899 == -1) {
|
||||
local53 = -1;
|
||||
} else {
|
||||
|
|
@ -70,7 +70,7 @@ public final class Static70 {
|
|||
local72 = 127;
|
||||
}
|
||||
local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00);
|
||||
local53 = Rasteriser.palette[Static230.method3949(local95, 96)];
|
||||
local53 = Rasteriser.palette[ColorUtils.multiplyLightnessGrayscale(local95, 96)];
|
||||
}
|
||||
WorldMap.overlayColors[local11 + 1] = local53;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package rt4;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
||||
|
|
@ -16,16 +15,4 @@ public final class Static75 {
|
|||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!g", name = "a", descriptor = "(III)Lclient!df;")
|
||||
public static WallDecor method1633(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
|
||||
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
|
||||
if (local7 == null) {
|
||||
return null;
|
||||
} else {
|
||||
@Pc(14) WallDecor local14 = local7.wallDecor;
|
||||
local7.wallDecor = null;
|
||||
return local14;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -901,20 +901,6 @@ public final class Static87 {
|
|||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(IZI)I")
|
||||
public static int method1814(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
|
||||
if (arg1 == -1) {
|
||||
return 12345678;
|
||||
}
|
||||
arg0 = arg0 * (arg1 & 0x7F) >> 7;
|
||||
if (arg0 < 2) {
|
||||
arg0 = 2;
|
||||
} else if (arg0 > 126) {
|
||||
arg0 = 126;
|
||||
}
|
||||
return arg0 + (arg1 & 0xFF80);
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V")
|
||||
public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
|
||||
Sprites.scrollbars[0].renderTransparent(arg2, arg3);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public final class Static91 {
|
|||
local6.anInt1393 = arg2 * 128 + 64;
|
||||
local6.anInt1391 = arg3;
|
||||
local6.primary = arg4;
|
||||
local6.aClass8_2 = arg5;
|
||||
local6.secondary = arg5;
|
||||
local6.anInt1395 = arg6;
|
||||
local6.anInt1388 = arg7;
|
||||
local6.anInt1394 = arg8;
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ public final class Tile extends Node {
|
|||
public ObjStackEntity aClass79_1;
|
||||
|
||||
@OriginalMember(owner = "client!bj", name = "D", descriptor = "I")
|
||||
public int anInt664 = 0;
|
||||
public int allInteriorFlags = 0;
|
||||
|
||||
@OriginalMember(owner = "client!bj", name = "w", descriptor = "[Lclient!ec;")
|
||||
public final Scenery[] scenery = new Scenery[5];
|
||||
|
||||
@OriginalMember(owner = "client!bj", name = "P", descriptor = "[I")
|
||||
public final int[] anIntArray59 = new int[5];
|
||||
public final int[] interiorFlags = new int[5];
|
||||
|
||||
@OriginalMember(owner = "client!bj", name = "H", descriptor = "I")
|
||||
public final int anInt666;
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@ import org.openrs2.deob.annotation.OriginalMember;
|
|||
public final class Wall {
|
||||
|
||||
@OriginalMember(owner = "client!jh", name = "a", descriptor = "I")
|
||||
public int anInt3044;
|
||||
public int zFine;
|
||||
|
||||
@OriginalMember(owner = "client!jh", name = "e", descriptor = "Lclient!th;")
|
||||
public Entity primary;
|
||||
|
||||
@OriginalMember(owner = "client!jh", name = "h", descriptor = "Lclient!th;")
|
||||
public Entity aClass8_6;
|
||||
public Entity secondary;
|
||||
|
||||
@OriginalMember(owner = "client!jh", name = "k", descriptor = "I")
|
||||
public int anInt3048;
|
||||
public int xFine;
|
||||
|
||||
@OriginalMember(owner = "client!jh", name = "l", descriptor = "I")
|
||||
public int anInt3049;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public final class WallDecor {
|
|||
public int anInt1388;
|
||||
|
||||
@OriginalMember(owner = "client!df", name = "d", descriptor = "Lclient!th;")
|
||||
public Entity aClass8_2;
|
||||
public Entity secondary;
|
||||
|
||||
@OriginalMember(owner = "client!df", name = "e", descriptor = "I")
|
||||
public int anInt1390;
|
||||
|
|
|
|||
|
|
@ -156,13 +156,13 @@ public class WorldMap {
|
|||
@Pc(235) int length = WorldMap.length >> 6;
|
||||
@Pc(239) int width = WorldMap.width >> 6;
|
||||
aByteArrayArrayArray8 = new byte[width][length][];
|
||||
@Pc(249) int local249 = Static45.anInt2293 >> 2 << 10;
|
||||
@Pc(249) int local249 = SceneGraph.anInt2293 >> 2 << 10;
|
||||
aByteArrayArrayArray7 = new byte[width][length][];
|
||||
underlayColors = new int[width][length][];
|
||||
aByteArrayArrayArray3 = new byte[width][length][];
|
||||
anIntArrayArrayArray17 = new int[width][length][];
|
||||
aByteArrayArrayArray12 = new byte[width][length][];
|
||||
@Pc(273) int local273 = Static183.anInt4272 >> 1;
|
||||
@Pc(273) int local273 = SceneGraph.anInt4272 >> 1;
|
||||
aByteArrayArrayArray10 = new byte[width][length][];
|
||||
scenery = new int[width][length][];
|
||||
Static70.loadOverlayColors(local273, local249);
|
||||
|
|
@ -375,7 +375,7 @@ public class WorldMap {
|
|||
local519 = 127;
|
||||
}
|
||||
@Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00);
|
||||
local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.palette[Static87.method1814(96, local541)];
|
||||
local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.palette[ColorUtils.multiplyLightnessSafe(96, local541)];
|
||||
} else if (local462 != null) {
|
||||
local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue