chore: revision 189

runescape-client/src/main/java/UserComparator8.java

@@ -1,19 +1,12 @@
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ex")
+@ObfuscatedName("fo")
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
-	@ObfuscatedName("dk")
-	@ObfuscatedSignature(
-		signature = "Lia;"
-	)
-	@Export("archive8")
-	static Archive archive8;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -21,10 +14,10 @@ public class UserComparator8 extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lje;Lje;I)I",
-		garbageValue = "-1753489227"
+		signature = "(Lke;Lke;I)I",
+		garbageValue = "-956709758"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -43,61 +36,127 @@ public class UserComparator8 extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("gk")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-257658019"
+		signature = "(B)I",
+		garbageValue = "87"
 	)
-	@Export("loadWorlds")
-	static boolean loadWorlds() {
-		try {
-			if (World.World_request == null) {
-				World.World_request = WorldMapData_0.urlRequester.request(new URL(StructDefinition.field3307));
-			} else if (World.World_request.isDone()) {
-				byte[] var0 = World.World_request.getResponse();
-				Buffer var1 = new Buffer(var0);
-				var1.readInt();
-				World.World_count = var1.readUnsignedShort();
-				class96.World_worlds = new World[World.World_count];
-
-				World var3;
-				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) {
-					var3 = class96.World_worlds[var2] = new World();
-					var3.id = var1.readUnsignedShort();
-					var3.properties = var1.readInt();
-					var3.host = var1.readStringCp1252NullTerminated();
-					var3.activity = var1.readStringCp1252NullTerminated();
-					var3.location = var1.readUnsignedByte();
-					var3.population = var1.readShort();
+	static final int method3503() {
+		if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) {
+			return ScriptEvent.Client_plane;
+		} else {
+			int var0 = 3;
+			if (class74.cameraPitch < 310) {
+				int var1;
+				int var2;
+				if (Client.oculusOrbState == 1) {
+					var1 = SoundSystem.oculusOrbFocalPointX >> 7;
+					var2 = ServerPacket.oculusOrbFocalPointY >> 7;
+				} else {
+					var1 = ByteArrayPool.localPlayer.x >> 7;
+					var2 = ByteArrayPool.localPlayer.y >> 7;
 				}
 
-				Interpreter.sortWorlds(class96.World_worlds, 0, class96.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
-				World.World_request = null;
-				return true;
+				int var3 = WorldMapRectangle.cameraX >> 7;
+				int var4 = class200.cameraZ >> 7;
+				if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
+					return ScriptEvent.Client_plane;
+				}
+
+				if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
+					return ScriptEvent.Client_plane;
+				}
+
+				if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) {
+					var0 = ScriptEvent.Client_plane;
+				}
+
+				int var5;
+				if (var1 > var3) {
+					var5 = var1 - var3;
+				} else {
+					var5 = var3 - var1;
+				}
+
+				int var6;
+				if (var2 > var4) {
+					var6 = var2 - var4;
+				} else {
+					var6 = var4 - var2;
+				}
+
+				int var7;
+				int var8;
+				if (var5 > var6) {
+					var7 = var6 * 65536 / var5;
+					var8 = 32768;
+
+					while (var1 != var3) {
+						if (var3 < var1) {
+							++var3;
+						} else if (var3 > var1) {
+							--var3;
+						}
+
+						if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) {
+							var0 = ScriptEvent.Client_plane;
+						}
+
+						var8 += var7;
+						if (var8 >= 65536) {
+							var8 -= 65536;
+							if (var4 < var2) {
+								++var4;
+							} else if (var4 > var2) {
+								--var4;
+							}
+
+							if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) {
+								var0 = ScriptEvent.Client_plane;
+							}
+						}
+					}
+				} else if (var6 > 0) {
+					var7 = var5 * 65536 / var6;
+					var8 = 32768;
+
+					while (var4 != var2) {
+						if (var4 < var2) {
+							++var4;
+						} else if (var4 > var2) {
+							--var4;
+						}
+
+						if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) {
+							var0 = ScriptEvent.Client_plane;
+						}
+
+						var8 += var7;
+						if (var8 >= 65536) {
+							var8 -= 65536;
+							if (var3 < var1) {
+								++var3;
+							} else if (var3 > var1) {
+								--var3;
+							}
+
+							if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) {
+								var0 = ScriptEvent.Client_plane;
+							}
+						}
+					}
+				}
 			}
-		} catch (Exception var4) {
-			var4.printStackTrace();
-			World.World_request = null;
-		}
 
-		return false;
-	}
+			if (ByteArrayPool.localPlayer.x >= 0 && ByteArrayPool.localPlayer.y >= 0 && ByteArrayPool.localPlayer.x < 13312 && ByteArrayPool.localPlayer.y < 13312) {
+				if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][ByteArrayPool.localPlayer.x >> 7][ByteArrayPool.localPlayer.y >> 7] & 4) != 0) {
+					var0 = ScriptEvent.Client_plane;
+				}
 
-	@ObfuscatedName("ke")
-	@ObfuscatedSignature(
-		signature = "(Lhn;IIIB)V",
-		garbageValue = "58"
-	)
-	@Export("drawCompass")
-	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
-		SpriteMask var4 = var0.getSpriteMask(false);
-		if (var4 != null) {
-			if (Client.minimapState < 3) {
-				Entity.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+				return var0;
 			} else {
-				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
+				return ScriptEvent.Client_plane;
 			}
-
 		}
 	}
 }