ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

openrune: just about finish rework, gets to login

Browse Source
This commit is contained in:
therealunull
2020-12-13 15:12:37 -05:00
parent 11a239e94e
commit b54ff7f7db
693 changed files with 11362 additions and 3943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runescape-client/src/main/java/AbstractWorldMapData.java
View File

@@ -281,7 +281,7 @@ public abstract class AbstractWorldMapData {
garbageValue = "-942051498"
)
@Export("worldToMinimap")
static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
int var6 = var3 * var3 + var2 * var2; // L: 10964
if (var6 > 4225 && var6 < 90000) { // L: 10965
int var7 = Client.camAngleY & 2047; // L: 10966
@@ -294,7 +294,7 @@ public abstract class AbstractWorldMapData {
int var15 = (int)(Math.sin(var12) * (double)var14); // L: 10973
int var16 = (int)(Math.cos(var12) * (double)var14); // L: 10974
byte var17 = 20; // L: 10975
ViewportMouse.redHintArrowSprite.method6189(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 10976
ViewportMouse.redHintArrowSpritePixels.method6189(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 10976
} else {
class25.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 10978
}

40
runescape-client/src/main/java/AbstractWorldMapIcon.java
View File

@@ -13,7 +13,7 @@ public abstract class AbstractWorldMapIcon {
descriptor = "[Llm;"
)
@Export("headIconHintSprites")
static Sprite[] headIconHintSprites;
static SpritePixels[] headIconHintSpritePixels;
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Lhs;"
@@ -255,7 +255,7 @@ public abstract class AbstractWorldMapIcon {
static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
if (var0 != null && var0.isVisible()) { // L: 4819
if (var0 instanceof NPC) { // L: 4820
NPCDefinition var6 = ((NPC)var0).definition; // L: 4821
NPCComposition var6 = ((NPC)var0).definition; // L: 4821
if (var6.transforms != null) { // L: 4822
var6 = var6.transform();
}
@@ -294,8 +294,8 @@ public abstract class AbstractWorldMapIcon {
}
} else {
HealthBarDefinition var80 = var87.definition; // L: 4844
Sprite var13 = var80.getBackSprite(); // L: 4845
Sprite var81 = var80.getFrontSprite(); // L: 4846
SpritePixels var13 = var80.getBackSprite(); // L: 4845
SpritePixels var81 = var80.getFrontSprite(); // L: 4846
int var82 = 0; // L: 4848
if (var13 != null && var81 != null) { // L: 4849
if (var80.widthPadding * 2 < var81.subWidth) { // L: 4850
@@ -384,12 +384,12 @@ public abstract class AbstractWorldMapIcon {
if (Client.viewportTempX > -1) { // L: 4911
if (var88.headIconPk != -1) { // L: 4912
var76 += 25; // L: 4913
Message.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4914
Message.headIconPkSpritePixels[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4914
}
if (var88.headIconPrayer != -1) { // L: 4916
var76 += 25; // L: 4917
Client.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4918
Client.headIconPrayerSpritePixels[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4918
}
}
}
@@ -397,27 +397,27 @@ public abstract class AbstractWorldMapIcon {
if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4922
GrandExchangeEvents.method144(var0, var0.defaultHeight + 15); // L: 4923
if (Client.viewportTempX > -1) { // L: 4924
var76 += headIconHintSprites[1].subHeight; // L: 4925
headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4926
var76 += headIconHintSpritePixels[1].subHeight; // L: 4925
headIconHintSpritePixels[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4926
}
}
} else {
NPCDefinition var89 = ((NPC)var0).definition; // L: 4931
NPCComposition var89 = ((NPC)var0).definition; // L: 4931
if (var89.transforms != null) { // L: 4932
var89 = var89.transform();
}
if (var89.headIconPrayer >= 0 && var89.headIconPrayer < Client.headIconPrayerSprites.length) { // L: 4933
if (var89.headIconPrayer >= 0 && var89.headIconPrayer < Client.headIconPrayerSpritePixels.length) { // L: 4933
GrandExchangeEvents.method144(var0, var0.defaultHeight + 15); // L: 4934
if (Client.viewportTempX > -1) { // L: 4935
Client.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4936
Client.headIconPrayerSpritePixels[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4936
}
}
if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4939
GrandExchangeEvents.method144(var0, var0.defaultHeight + 15); // L: 4940
if (Client.viewportTempX > -1) { // L: 4941
headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
headIconHintSpritePixels[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
}
}
}
@@ -489,10 +489,10 @@ public abstract class AbstractWorldMapIcon {
Client.viewportTempY -= 10; // L: 5001
}
Sprite var18 = null; // L: 5003
Sprite var19 = null; // L: 5004
Sprite var20 = null; // L: 5005
Sprite var21 = null; // L: 5006
SpritePixels var18 = null; // L: 5003
SpritePixels var19 = null; // L: 5004
SpritePixels var20 = null; // L: 5005
SpritePixels var21 = null; // L: 5006
var22 = 0; // L: 5007
var23 = 0; // L: 5008
int var24 = 0; // L: 5009
@@ -501,10 +501,10 @@ public abstract class AbstractWorldMapIcon {
int var27 = 0; // L: 5012
int var28 = 0; // L: 5013
int var29 = 0; // L: 5014
Sprite var30 = null; // L: 5015
Sprite var31 = null; // L: 5016
Sprite var32 = null; // L: 5017
Sprite var33 = null; // L: 5018
SpritePixels var30 = null; // L: 5015
SpritePixels var31 = null; // L: 5016
SpritePixels var32 = null; // L: 5017
SpritePixels var33 = null; // L: 5018
int var34 = 0; // L: 5019
int var35 = 0; // L: 5020
int var36 = 0; // L: 5021

6
runescape-client/src/main/java/Actor.java
View File

@@ -12,7 +12,7 @@ public abstract class Actor extends Entity {
descriptor = "[Llm;"
)
@Export("mapDotSprites")
static Sprite[] mapDotSprites;
static SpritePixels[] mapDotSprites;
@ObfuscatedName("an")
@Export("isWalking")
boolean isWalking;
@@ -544,9 +544,9 @@ public abstract class Actor extends Entity {
public static void method1821(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) {
NPC.ItemDefinition_archive = var0; // L: 84
VertexNormal.ItemDefinition_modelArchive = var1; // L: 85
ItemDefinition.ItemDefinition_inMembersWorld = var2; // L: 86
ItemComposition.ItemDefinition_inMembersWorld = var2; // L: 86
Varcs.ItemDefinition_fileCount = NPC.ItemDefinition_archive.getGroupFileCount(10); // L: 87
ItemDefinition.ItemDefinition_fontPlain11 = var3; // L: 88
ItemComposition.ItemDefinition_fontPlain11 = var3; // L: 88
} // L: 89
@ObfuscatedName("x")

10
runescape-client/src/main/java/ArchiveLoader.java
View File

@@ -142,8 +142,8 @@ public class ArchiveLoader {
int var32;
int var39;
if (Login.worldSelectOpen) { // L: 963
if (class301.worldSelectBackSprites == null) { // L: 965
class301.worldSelectBackSprites = class280.method5008(Messages.archive8, "sl_back", "");
if (class301.worldSelectBackSpritePixels == null) { // L: 965
class301.worldSelectBackSpritePixels = class280.method5008(Messages.archive8, "sl_back", "");
}
if (class90.worldSelectFlagSprites == null) { // L: 966
@@ -240,7 +240,7 @@ public class ArchiveLoader {
Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1007
var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1008
Login.hoveredWorldIndex = -1; // L: 1009
if (class301.worldSelectBackSprites != null) { // L: 1010
if (class301.worldSelectBackSpritePixels != null) { // L: 1010
var3 = 88; // L: 1011
byte var34 = 19; // L: 1012
var40 = 765 / (var3 + 1) - 1; // L: 1013
@@ -338,10 +338,10 @@ public class ArchiveLoader {
if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var36 && MouseHandler.MouseHandler_x < var13 + var3 && MouseHandler.MouseHandler_y < var34 + var36 && var19) { // L: 1080
Login.hoveredWorldIndex = var17; // L: 1081
class301.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var36, 128, 16777215); // L: 1082
class301.worldSelectBackSpritePixels[var21].drawTransOverlayAt(var13, var36, 128, 16777215); // L: 1082
var15 = true; // L: 1083
} else {
class301.worldSelectBackSprites[var21].drawAt(var13, var36); // L: 1085
class301.worldSelectBackSpritePixels[var21].drawAt(var13, var36); // L: 1085
}
if (class90.worldSelectFlagSprites != null) { // L: 1086

30
runescape-client/src/main/java/Canvas.java
View File

@@ -64,7 +64,7 @@ public final class Canvas extends java.awt.Canvas {
Client.collisionMaps[var12] = new CollisionMap(104, 104);
}
class25.sceneMinimapSprite = new Sprite(512, 512); // L: 1729
class25.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1729
Login.Login_loadingText = "Starting game engine..."; // L: 1730
Login.Login_loadingPercent = 5; // L: 1731
Client.titleLoadingStage = 20; // L: 1732
@@ -270,9 +270,9 @@ public final class Canvas extends java.awt.Canvas {
var16 = DynamicObject.archive2; // L: 1912
Archive var4 = BuddyRankComparator.archive7; // L: 1913
boolean var17 = Client.isLowDetail; // L: 1914
ObjectDefinition.ObjectDefinition_archive = var16; // L: 1916
ObjectDefinition.ObjectDefinition_modelsArchive = var4; // L: 1917
ObjectDefinition.ObjectDefinition_isLowDetail = var17; // L: 1918
ObjectComposition.ObjectDefinition_archive = var16; // L: 1916
ObjectComposition.ObjectDefinition_modelsArchive = var4; // L: 1917
ObjectComposition.ObjectDefinition_isLowDetail = var17; // L: 1918
World.method1849(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1920
ParamDefinition.method4526(DynamicObject.archive2); // L: 1921
Actor.method1821(DynamicObject.archive2, BuddyRankComparator.archive7, Client.isMembersWorld, class297.fontPlain11); // L: 1922
@@ -313,8 +313,8 @@ public final class Canvas extends java.awt.Canvas {
++var12; // L: 1962
}
if (ViewportMouse.redHintArrowSprite == null) { // L: 1963
ViewportMouse.redHintArrowSprite = Skills.SpriteBuffer_getSprite(Messages.archive8, WorldMapManager.spriteIds.field3845, 0);
if (ViewportMouse.redHintArrowSpritePixels == null) { // L: 1963
ViewportMouse.redHintArrowSpritePixels = Skills.SpriteBuffer_getSprite(Messages.archive8, WorldMapManager.spriteIds.field3845, 0);
} else {
++var12; // L: 1964
}
@@ -357,26 +357,26 @@ public final class Canvas extends java.awt.Canvas {
++var12; // L: 2002
}
if (Message.headIconPkSprites == null) { // L: 2003
Message.headIconPkSprites = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.headIconsPk, 0);
if (Message.headIconPkSpritePixels == null) { // L: 2003
Message.headIconPkSpritePixels = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.headIconsPk, 0);
} else {
++var12; // L: 2004
}
if (Client.headIconPrayerSprites == null) { // L: 2005
Client.headIconPrayerSprites = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3844, 0);
if (Client.headIconPrayerSpritePixels == null) { // L: 2005
Client.headIconPrayerSpritePixels = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3844, 0);
} else {
++var12; // L: 2006
}
if (AbstractWorldMapIcon.headIconHintSprites == null) { // L: 2007
AbstractWorldMapIcon.headIconHintSprites = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3843, 0);
if (AbstractWorldMapIcon.headIconHintSpritePixels == null) { // L: 2007
AbstractWorldMapIcon.headIconHintSpritePixels = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3843, 0);
} else {
++var12; // L: 2008
}
if (GrandExchangeOfferUnitPriceComparator.mapMarkerSprites == null) { // L: 2009
GrandExchangeOfferUnitPriceComparator.mapMarkerSprites = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3846, 0);
if (GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels == null) { // L: 2009
GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels = ClientPreferences.method1918(Messages.archive8, WorldMapManager.spriteIds.field3846, 0);
} else {
++var12; // L: 2010
}
@@ -466,7 +466,7 @@ public final class Canvas extends java.awt.Canvas {
Login.Login_loadingPercent = 70; // L: 2093
} else {
AbstractFont.AbstractFont_modIconSprites = class39.modIconSprites; // L: 2096
ViewportMouse.redHintArrowSprite.normalize(); // L: 2097
ViewportMouse.redHintArrowSpritePixels.normalize(); // L: 2097
int var13 = (int)(Math.random() * 21.0D) - 10; // L: 2098
int var14 = (int)(Math.random() * 21.0D) - 10; // L: 2099
var3 = (int)(Math.random() * 21.0D) - 10; // L: 2100

16
runescape-client/src/main/java/Client.java
View File

@@ -362,7 +362,7 @@ public final class Client extends GameShell implements Usernamed {
descriptor = "[Llm;"
)
@Export("mapIcons")
static Sprite[] mapIcons;
static SpritePixels[] mapIcons;
@ObfuscatedName("rb")
static short field828;
@ObfuscatedName("ra")
@@ -821,7 +821,7 @@ public final class Client extends GameShell implements Usernamed {
descriptor = "[Llm;"
)
@Export("headIconPrayerSprites")
static Sprite[] headIconPrayerSprites;
static SpritePixels[] headIconPrayerSpritePixels;
@ObfuscatedName("hv")
@ObfuscatedGetter(
intValue = -1487008623
@@ -1513,7 +1513,7 @@ public final class Client extends GameShell implements Usernamed {
mapIconCount = 0; // L: 572
mapIconXs = new int[1000]; // L: 573
mapIconYs = new int[1000]; // L: 574
mapIcons = new Sprite[1000]; // L: 575
mapIcons = new SpritePixels[1000]; // L: 575
destinationX = 0; // L: 576
destinationY = 0; // L: 577
minimapState = 0; // L: 584
@@ -1760,7 +1760,7 @@ public final class Client extends GameShell implements Usernamed {
int var41 = var4 + var16; // L: 1007
int var42 = var5 + var15; // L: 1008
if (var41 > 0 && var42 > 0 && var41 < 103 && var42 < 103) { // L: 1009
ObjectDefinition var20 = WorldMapDecoration.getObjectDefinition(var10); // L: 1010
ObjectComposition var20 = WorldMapDecoration.getObjectDefinition(var10); // L: 1010
if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 1011
if (!var20.needsModelFiles()) { // L: 1012
++field702; // L: 1013
@@ -1934,7 +1934,7 @@ public final class Client extends GameShell implements Usernamed {
int var29 = var28 >> 2; // L: 1160
int var30 = var28 & 3; // L: 1161
if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1162
ObjectDefinition var31 = WorldMapDecoration.getObjectDefinition(var21); // L: 1163
ObjectComposition var31 = WorldMapDecoration.getObjectDefinition(var21); // L: 1163
int var32 = var14 + HitSplatDefinition.method4612(var26 & 7, var25 & 7, var46, var31.sizeX, var31.sizeY, var30); // L: 1164
int var33 = var15 + World.method1871(var26 & 7, var25 & 7, var46, var31.sizeX, var31.sizeY, var30); // L: 1165
if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { // L: 1166
@@ -2031,7 +2031,7 @@ public final class Client extends GameShell implements Usernamed {
}
}
ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 1211
ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1211
PacketBufferNode var49;
if (WorldMapIcon_0.client.hasFrame()) { // L: 1212
var49 = ItemContainer.getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 1214
@@ -4205,7 +4205,7 @@ public final class Client extends GameShell implements Usernamed {
@Export("drawLoggedIn")
final void drawLoggedIn() {
if (rootInterface != -1) { // L: 4224
NPCDefinition.method4759(rootInterface);
NPCComposition.method4759(rootInterface);
}
int var1;
@@ -4914,7 +4914,7 @@ public final class Client extends GameShell implements Usernamed {
}
var58 = CollisionMap.getWidget(var16); // L: 6079
ItemDefinition var42;
ItemComposition var42;
if (!var58.isIf3) { // L: 6080
if (var18 == -1) { // L: 6081
var58.modelType = 0; // L: 6082

6
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -177,14 +177,14 @@ public class ClientPreferences {
descriptor = "(Lib;IIB)[Llm;",
garbageValue = "93"
)
public static Sprite[] method1918(AbstractArchive var0, int var1, int var2) {
public static SpritePixels[] method1918(AbstractArchive var0, int var1, int var2) {
if (!class304.method5363(var0, var1, var2)) { // L: 23
return null;
} else {
Sprite[] var4 = new Sprite[class336.SpriteBuffer_spriteCount]; // L: 26
SpritePixels[] var4 = new SpritePixels[class336.SpriteBuffer_spriteCount]; // L: 26
for (int var5 = 0; var5 < class336.SpriteBuffer_spriteCount; ++var5) { // L: 27
Sprite var6 = var4[var5] = new Sprite(); // L: 28
SpritePixels var6 = var4[var5] = new SpritePixels(); // L: 28
var6.width = DirectByteArrayCopier.SpriteBuffer_spriteWidth; // L: 29
var6.height = class336.SpriteBuffer_spriteHeight; // L: 30
var6.xOffset = class336.SpriteBuffer_xOffsets[var5]; // L: 31

10
runescape-client/src/main/java/DirectByteArrayCopier.java
View File

@@ -112,7 +112,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 10895
NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 10896
if (var9 != null && var9.isVisible()) { // L: 10897
NPCDefinition var19 = var9.definition; // L: 10898
NPCComposition var19 = var9.definition; // L: 10898
if (var19 != null && var19.transforms != null) { // L: 10899
var19 = var19.transform();
}
@@ -156,14 +156,14 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
if (var20 != null) { // L: 10925
var11 = var20.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10926
var12 = var20.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10927
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSprites[1], var4); // L: 10928
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10928
}
}
if (Client.hintArrowType == 2) { // L: 10931
var10 = Client.hintArrowX * 4 - NetFileRequest.baseX * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10932
var11 = Client.hintArrowY * 4 - class41.baseY * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10933
AbstractWorldMapData.worldToMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSprites[1], var4); // L: 10934
AbstractWorldMapData.worldToMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10934
}
if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 10936
@@ -171,7 +171,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
if (var21 != null) { // L: 10938
var11 = var21.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10939
var12 = var21.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10940
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSprites[1], var4); // L: 10941
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10941
}
}
}
@@ -179,7 +179,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
if (Client.destinationX != 0) { // L: 10945
var10 = Client.destinationX * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10946
var11 = Client.destinationY * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10947
class25.drawSpriteOnMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSprites[0], var4); // L: 10948
class25.drawSpriteOnMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[0], var4); // L: 10948
}
if (!PlayerAppearance.localPlayer.isHidden) { // L: 10950

2
runescape-client/src/main/java/DynamicObject.java
View File

@@ -145,7 +145,7 @@ public class DynamicObject extends Entity {
this.cycleStart = Client.cycle - var1; // L: 60
}
ObjectDefinition var12 = WorldMapDecoration.getObjectDefinition(this.id); // L: 62
ObjectComposition var12 = WorldMapDecoration.getObjectDefinition(this.id); // L: 62
if (var12.transforms != null) { // L: 63
var12 = var12.transform();
}

10
runescape-client/src/main/java/FontName.java
View File

@@ -339,7 +339,7 @@ public class FontName {
if (var10.itemIds[var19] <= 0) { // L: 9090
if (var10.inventorySprites != null && var19 < 20) { // L: 9135
Sprite var46 = var10.getInventorySprite(var19); // L: 9136
SpritePixels var46 = var10.getInventorySprite(var19); // L: 9136
if (var46 != null) { // L: 9137
var46.drawTransBgAt(var22, var23);
} else if (Widget.field2603) { // L: 9138
@@ -351,7 +351,7 @@ public class FontName {
boolean var38 = false; // L: 9092
var26 = var10.itemIds[var19] - 1; // L: 9093
if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class171.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9094
Sprite var35;
SpritePixels var35;
if (Client.isItemSelected == 1 && var19 == ChatChannel.selectedItemSlot && var10.id == WorldMapLabelSize.selectedItemWidget) { // L: 9096
var35 = WorldMapManager.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
} else {
@@ -483,7 +483,7 @@ public class FontName {
}
if (var10.isIf3 && var10.itemId != -1) { // L: 9192
ItemDefinition var45 = SecureRandomCallable.ItemDefinition_get(var10.itemId); // L: 9193
ItemComposition var45 = SecureRandomCallable.ItemDefinition_get(var10.itemId); // L: 9193
var44 = var45.name; // L: 9194
if (var44 == null) { // L: 9195
var44 = "null";
@@ -506,7 +506,7 @@ public class FontName {
var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9203
}
} else if (var10.type == 5) { // L: 9206
Sprite var40;
SpritePixels var40;
if (!var10.isIf3) { // L: 9207
var40 = var10.getSprite(class8.runCs1(var10)); // L: 9208
if (var40 != null) { // L: 9209
@@ -561,7 +561,7 @@ public class FontName {
}
}
} else {
ItemDefinition var33;
ItemComposition var33;
if (var10.type == 6) { // L: 9244
boolean var36 = class8.runCs1(var10); // L: 9245
if (var36) { // L: 9247

2
runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
View File

@@ -20,7 +20,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
descriptor = "[Llm;"
)
@Export("crossSprites")
static Sprite[] crossSprites;
static SpritePixels[] crossSprites;
@ObfuscatedName("h")
@ObfuscatedSignature(

2
runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
View File

@@ -31,7 +31,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
descriptor = "[Llm;"
)
@Export("mapMarkerSprites")
static Sprite[] mapMarkerSprites;
static SpritePixels[] mapMarkerSpritePixels;
@ObfuscatedName("h")
@ObfuscatedSignature(

8
runescape-client/src/main/java/HealthBarDefinition.java
View File

@@ -157,11 +157,11 @@ public class HealthBarDefinition extends DualNode {
garbageValue = "-1946834755"
)
@Export("getFrontSprite")
public Sprite getFrontSprite() {
public SpritePixels getFrontSprite() {
if (this.frontSpriteID < 0) { // L: 74
return null;
} else {
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
if (var1 != null) {
return var1;
} else {
@@ -181,11 +181,11 @@ public class HealthBarDefinition extends DualNode {
garbageValue = "-8563"
)
@Export("getBackSprite")
public Sprite getBackSprite() {
public SpritePixels getBackSprite() {
if (this.backSpriteID < 0) { // L: 84
return null;
} else {
Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85
SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85
if (var1 != null) {
return var1; // L: 86
} else {

16
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -280,11 +280,11 @@ public class HitSplatDefinition extends DualNode {
descriptor = "(I)Llm;",
garbageValue = "-1476611889"
)
public Sprite method4583() {
public SpritePixels method4583() {
if (this.field3365 < 0) { // L: 127
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3365); // L: 128
SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3365); // L: 128
if (var1 != null) { // L: 129
return var1;
} else {
@@ -303,11 +303,11 @@ public class HitSplatDefinition extends DualNode {
descriptor = "(I)Llm;",
garbageValue = "809304727"
)
public Sprite method4578() {
public SpritePixels method4578() {
if (this.field3366 < 0) { // L: 137
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3366); // L: 138
SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3366); // L: 138
if (var1 != null) { // L: 139
return var1;
} else {
@@ -326,11 +326,11 @@ public class HitSplatDefinition extends DualNode {
descriptor = "(I)Llm;",
garbageValue = "644601071"
)
public Sprite method4587() {
public SpritePixels method4587() {
if (this.field3355 < 0) { // L: 147
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3355); // L: 148
SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3355); // L: 148
if (var1 != null) {
return var1; // L: 149
} else {
@@ -349,11 +349,11 @@ public class HitSplatDefinition extends DualNode {
descriptor = "(S)Llm;",
garbageValue = "500"
)
public Sprite method4585() {
public SpritePixels method4585() {
if (this.field3358 < 0) { // L: 157
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3358); // L: 158
SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3358); // L: 158
if (var1 != null) {
return var1; // L: 159
} else {

4
runescape-client/src/main/java/InvDefinition.java
View File

@@ -111,7 +111,7 @@ public class InvDefinition extends DualNode {
int var19 = Occluder.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 8590
int var20 = var19; // L: 8592
if (var17 == 2 && ArchiveLoader.scene.getObjectFlags(GameObject.Client_plane, var15, var16, var27) >= 0) { // L: 8593 8594
ObjectDefinition var21 = WorldMapDecoration.getObjectDefinition(var19); // L: 8595
ObjectComposition var21 = WorldMapDecoration.getObjectDefinition(var19); // L: 8595
if (var21.transforms != null) { // L: 8596
var21 = var21.transform();
}
@@ -230,7 +230,7 @@ public class InvDefinition extends DualNode {
NodeDeque var36 = Client.groundItems[GameObject.Client_plane][var15][var16]; // L: 8665
if (var36 != null) { // L: 8666
for (TileItem var35 = (TileItem)var36.first(); var35 != null; var35 = (TileItem)var36.next()) { // L: 8667 8668 8701
ItemDefinition var39 = SecureRandomCallable.ItemDefinition_get(var35.id); // L: 8669
ItemComposition var39 = SecureRandomCallable.ItemDefinition_get(var35.id); // L: 8669
if (Client.isItemSelected == 1) { // L: 8670
WorldMapRegion.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class23.colorStartTag(16748608) + var39.name, 16, var35.id, var15, var16); // L: 8671
} else if (Client.isSpellSelected) { // L: 8674

12
runescape-client/src/main/java/ItemDefinition.java → runescape-client/src/main/java/ItemComposition.java
View File

@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jq")
@Implements("ItemDefinition")
public class ItemDefinition extends DualNode {
public class ItemComposition extends DualNode {
@ObfuscatedName("p")
@Export("ItemDefinition_inMembersWorld")
static boolean ItemDefinition_inMembersWorld;
@@ -290,7 +290,7 @@ public class ItemDefinition extends DualNode {
ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30
}
ItemDefinition() {
ItemComposition() {
this.name = "null"; // L: 34
this.zoom2d = 2000; // L: 39
this.xan2d = 0; // L: 40
@@ -491,7 +491,7 @@ public class ItemDefinition extends DualNode {
garbageValue = "1371211432"
)
@Export("genCert")
void genCert(ItemDefinition var1, ItemDefinition var2) {
void genCert(ItemComposition var1, ItemComposition var2) {
this.model = var1.model; // L: 219
this.zoom2d = var1.zoom2d; // L: 220
this.xan2d = var1.xan2d; // L: 221
@@ -515,7 +515,7 @@ public class ItemDefinition extends DualNode {
garbageValue = "-1959177502"
)
@Export("genBought")
void genBought(ItemDefinition var1, ItemDefinition var2) {
void genBought(ItemComposition var1, ItemComposition var2) {
this.model = var1.model; // L: 237
this.zoom2d = var1.zoom2d; // L: 238
this.xan2d = var1.xan2d; // L: 239
@@ -559,7 +559,7 @@ public class ItemDefinition extends DualNode {
garbageValue = "312275833"
)
@Export("genPlaceholder")
void genPlaceholder(ItemDefinition var1, ItemDefinition var2) {
void genPlaceholder(ItemComposition var1, ItemComposition var2) {
this.model = var1.model; // L: 270
this.zoom2d = var1.zoom2d; // L: 271
this.xan2d = var1.xan2d; // L: 272
@@ -684,7 +684,7 @@ public class ItemDefinition extends DualNode {
garbageValue = "-1807857103"
)
@Export("getCountObj")
public ItemDefinition getCountObj(int var1) {
public ItemComposition getCountObj(int var1) {
if (this.countobj != null && var1 > 1) { // L: 342
int var2 = -1; // L: 343

2
runescape-client/src/main/java/Message.java
View File

@@ -15,7 +15,7 @@ public class Message extends DualNode {
descriptor = "[Llm;"
)
@Export("headIconPkSprites")
static Sprite[] headIconPkSprites;
static SpritePixels[] headIconPkSpritePixels;
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = -1661930895

2
runescape-client/src/main/java/MouseRecorder.java
View File

@@ -132,7 +132,7 @@ public class MouseRecorder implements Runnable {
TileItem var6;
for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7036 7037 7045
ItemDefinition var7 = SecureRandomCallable.ItemDefinition_get(var6.id); // L: 7038
ItemComposition var7 = SecureRandomCallable.ItemDefinition_get(var6.id); // L: 7038
long var11 = (long)var7.price; // L: 7039
if (var7.isStackable == 1) { // L: 7040
var11 *= (long)(var6.quantity + 1);

2
runescape-client/src/main/java/NPC.java
View File

@@ -22,7 +22,7 @@ public final class NPC extends Actor {
descriptor = "Ljd;"
)
@Export("definition")
NPCDefinition definition;
NPCComposition definition;
NPC() {
} // L: 12

10
runescape-client/src/main/java/NPCDefinition.java → runescape-client/src/main/java/NPCComposition.java
View File

@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jd")
@Implements("NPCDefinition")
public class NPCDefinition extends DualNode {
public class NPCComposition extends DualNode {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Lib;"
@@ -192,7 +192,7 @@ public class NPCDefinition extends DualNode {
NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 19
}
NPCDefinition() {
NPCComposition() {
this.name = "null"; // L: 21
this.size = 1; // L: 22
this.idleSequence = -1; // L: 25
@@ -378,7 +378,7 @@ public class NPCDefinition extends DualNode {
@Export("getModel")
public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if (this.transforms != null) { // L: 163
NPCDefinition var12 = this.transform(); // L: 164
NPCComposition var12 = this.transform(); // L: 164
return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 165 166
} else {
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 168
@@ -452,7 +452,7 @@ public class NPCDefinition extends DualNode {
@Export("getModelData")
public final ModelData getModelData() {
if (this.transforms != null) { // L: 201
NPCDefinition var7 = this.transform(); // L: 202
NPCComposition var7 = this.transform(); // L: 202
return var7 == null ? null : var7.getModelData(); // L: 203 204
} else if (this.field3502 == null) { // L: 206
return null;
@@ -505,7 +505,7 @@ public class NPCDefinition extends DualNode {
garbageValue = "-51"
)
@Export("transform")
public final NPCDefinition transform() {
public final NPCComposition transform() {
int var1 = -1; // L: 229
if (this.transformVarbit != -1) { // L: 230
var1 = Coord.getVarbit(this.transformVarbit);

8
runescape-client/src/main/java/ObjectDefinition.java → runescape-client/src/main/java/ObjectComposition.java
View File

@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jm")
@Implements("ObjectDefinition")
public class ObjectDefinition extends DualNode {
public class ObjectComposition extends DualNode {
@ObfuscatedName("h")
@Export("ObjectDefinition_isLowDetail")
public static boolean ObjectDefinition_isLowDetail;
@@ -270,7 +270,7 @@ public class ObjectDefinition extends DualNode {
field3386 = new ModelData[4]; // L: 24
}
ObjectDefinition() {
ObjectComposition() {
this.name = "null";
this.sizeX = 1;
this.sizeY = 1;
@@ -844,7 +844,7 @@ public class ObjectDefinition extends DualNode {
garbageValue = "2135439243"
)
@Export("transform")
public final ObjectDefinition transform() {
public final ObjectComposition transform() {
int var1 = -1; // L: 385
if (this.transformVarbit != -1) { // L: 386
var1 = Coord.getVarbit(this.transformVarbit);
@@ -920,7 +920,7 @@ public class ObjectDefinition extends DualNode {
} else {
for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 433
if (this.transforms[var1] != -1) { // L: 434
ObjectDefinition var2 = WorldMapDecoration.getObjectDefinition(this.transforms[var1]); // L: 435
ObjectComposition var2 = WorldMapDecoration.getObjectDefinition(this.transforms[var1]); // L: 435
if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 436
return true;
}

4
runescape-client/src/main/java/ObjectSound.java
View File

@@ -89,7 +89,7 @@ public final class ObjectSound extends Node {
descriptor = "Ljm;"
)
@Export("obj")
ObjectDefinition obj;
ObjectComposition obj;
static {
objectSounds = new NodeDeque(); // L: 11
@@ -106,7 +106,7 @@ public final class ObjectSound extends Node {
@Export("set")
void set() {
int var1 = this.soundEffectId; // L: 30
ObjectDefinition var2 = this.obj.transform(); // L: 31
ObjectComposition var2 = this.obj.transform(); // L: 31
if (var2 != null) { // L: 32
this.soundEffectId = var2.ambientSoundId; // L: 33
this.field1086 = var2.int4 * 128; // L: 34

4
runescape-client/src/main/java/PlayerType.java
View File

@@ -90,9 +90,9 @@ public enum PlayerType implements Enumerated {
descriptor = "(IIII)Llm;",
garbageValue = "-320192439"
)
static Sprite method4170(int var0, int var1, int var2) {
static SpritePixels method4170(int var0, int var1, int var2) {
DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38
long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41
return (Sprite)var3.get(var4); // L: 43
return (SpritePixels)var3.get(var4); // L: 43
}
}

2
runescape-client/src/main/java/RouteStrategy.java
View File

@@ -779,7 +779,7 @@ public abstract class RouteStrategy {
Client.mouseCrossState = 0; // L: 7872
var13 = Client.npcs[var3]; // L: 7873
if (var13 != null) { // L: 7874
NPCDefinition var17 = var13.definition; // L: 7875
NPCComposition var17 = var13.definition; // L: 7875
if (var17.transforms != null) { // L: 7876
var17 = var17.transform();
}

2
runescape-client/src/main/java/ScriptEvent.java
View File

@@ -112,7 +112,7 @@ public class ScriptEvent extends Node {
garbageValue = "-82"
)
static final void method1259(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
ObjectDefinition var9 = WorldMapDecoration.getObjectDefinition(var4); // L: 899
ObjectComposition var9 = WorldMapDecoration.getObjectDefinition(var4); // L: 899
int var10;
int var11;
if (var5 != 1 && var5 != 3) { // L: 902

10
runescape-client/src/main/java/SecureRandomCallable.java
View File

@@ -27,13 +27,13 @@ public class SecureRandomCallable implements Callable {
garbageValue = "97561494"
)
@Export("ItemDefinition_get")
public static ItemDefinition ItemDefinition_get(int var0) {
ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); // L: 92
public static ItemComposition ItemDefinition_get(int var0) {
ItemComposition var1 = (ItemComposition) ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92
if (var1 != null) { // L: 93
return var1;
} else {
byte[] var2 = NPC.ItemDefinition_archive.takeFile(10, var0); // L: 94
var1 = new ItemDefinition(); // L: 95
var1 = new ItemComposition(); // L: 95
var1.id = var0; // L: 96
if (var2 != null) { // L: 97
var1.decode(new Buffer(var2));
@@ -52,7 +52,7 @@ public class SecureRandomCallable implements Callable {
var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
}
if (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102
if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102
var1.name = "Members object"; // L: 103
var1.isTradable = false; // L: 104
var1.groundActions = null; // L: 105
@@ -77,7 +77,7 @@ public class SecureRandomCallable implements Callable {
}
}
ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); // L: 119
ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 119
return var1; // L: 120
}
}

6
runescape-client/src/main/java/SecureRandomFuture.java
View File

@@ -75,9 +75,9 @@ public class SecureRandomFuture {
garbageValue = "109574038"
)
public static void method2205(boolean var0) {
if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { // L: 571
if (var0 != ItemComposition.ItemDefinition_inMembersWorld) { // L: 571
TileItem.method2187(); // L: 572
ItemDefinition.ItemDefinition_inMembersWorld = var0; // L: 573
ItemComposition.ItemDefinition_inMembersWorld = var0; // L: 573
}
} // L: 575
@@ -545,7 +545,7 @@ public class SecureRandomFuture {
if (Client.hintArrowType == 2) { // L: 4621
GrandExchangeOffer.worldToScreen((Client.hintArrowX - NetFileRequest.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class41.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4622
if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4623
AbstractWorldMapIcon.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
AbstractWorldMapIcon.headIconHintSpritePixels[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
}
}

2
runescape-client/src/main/java/Skeleton.java
View File

@@ -120,7 +120,7 @@ public class Skeleton extends Node {
InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10605
if (var4 != null) { // L: 10606
NPCDefinition.method4759(var4.group);
NPCComposition.method4759(var4.group);
}
}

4
runescape-client/src/main/java/Skills.java
View File

@@ -33,11 +33,11 @@ public class Skills {
garbageValue = "71"
)
@Export("SpriteBuffer_getSprite")
public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
if (!class304.method5363(var0, var1, var2)) {
return null;
} else {
Sprite var4 = new Sprite(); // L: 57
SpritePixels var4 = new SpritePixels(); // L: 57
var4.width = DirectByteArrayCopier.SpriteBuffer_spriteWidth; // L: 58
var4.height = class336.SpriteBuffer_spriteHeight;
var4.xOffset = class336.SpriteBuffer_xOffsets[0]; // L: 60

16
runescape-client/src/main/java/Sprite.java → runescape-client/src/main/java/SpritePixels.java
View File

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lm")
@Implements("Sprite")
public final class Sprite extends Rasterizer2D {
public final class SpritePixels extends Rasterizer2D {
@ObfuscatedName("h")
@Export("pixels")
public int[] pixels;
@@ -28,7 +28,7 @@ public final class Sprite extends Rasterizer2D {
@Export("height")
public int height;
public Sprite(int[] var1, int var2, int var3) {
public SpritePixels(int[] var1, int var2, int var3) {
this.pixels = var1; // L: 26
this.subWidth = this.width = var2; // L: 27
this.subHeight = this.height = var3; // L: 28
@@ -36,11 +36,11 @@ public final class Sprite extends Rasterizer2D {
this.xOffset = 0; // L: 30
} // L: 31
public Sprite(int var1, int var2) {
public SpritePixels(int var1, int var2) {
this(new int[var2 * var1], var1, var2); // L: 22
} // L: 23
Sprite() {
SpritePixels() {
} // L: 19
@ObfuscatedName("h")
@@ -48,8 +48,8 @@ public final class Sprite extends Rasterizer2D {
descriptor = "()Llm;"
)
@Export("mirrorHorizontally")
public Sprite mirrorHorizontally() {
Sprite var1 = new Sprite(this.subWidth, this.subHeight); // L: 34
public SpritePixels mirrorHorizontally() {
SpritePixels var1 = new SpritePixels(this.subWidth, this.subHeight); // L: 34
var1.width = this.width; // L: 35
var1.height = this.height; // L: 36
var1.xOffset = this.width - this.subWidth - this.xOffset; // L: 37
@@ -69,8 +69,8 @@ public final class Sprite extends Rasterizer2D {
descriptor = "()Llm;"
)
@Export("copyNormalized")
public Sprite copyNormalized() {
Sprite var1 = new Sprite(this.width, this.height); // L: 48
public SpritePixels copyNormalized() {
SpritePixels var1 = new SpritePixels(this.width, this.height); // L: 48
for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 49
for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 50

4
runescape-client/src/main/java/StudioGame.java
View File

@@ -97,7 +97,7 @@ public enum StudioGame implements Enumerated {
return 1; // L: 2797
} else {
int var4;
ItemDefinition var5;
ItemComposition var5;
if (var0 == ScriptOpcodes.OC_OP) { // L: 2799
VarcInt.Interpreter_intStackSize -= 2; // L: 2800
var6 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 2801
@@ -131,7 +131,7 @@ public enum StudioGame implements Enumerated {
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = SecureRandomCallable.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 2824
return 1; // L: 2825
} else {
ItemDefinition var7;
ItemComposition var7;
if (var0 == ScriptOpcodes.OC_CERT) { // L: 2827
var6 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 2828
var7 = SecureRandomCallable.ItemDefinition_get(var6); // L: 2829

8
runescape-client/src/main/java/TileItem.java
View File

@@ -154,9 +154,9 @@ public final class TileItem extends Entity {
garbageValue = "-1747466644"
)
public static void method2187() {
ItemDefinition.ItemDefinition_cached.clear(); // L: 565
ItemDefinition.ItemDefinition_cachedModels.clear(); // L: 566
ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 567
ItemComposition.ItemDefinition_cached.clear(); // L: 565
ItemComposition.ItemDefinition_cachedModels.clear(); // L: 566
ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 567
} // L: 568
@ObfuscatedName("jl")
@@ -165,7 +165,7 @@ public final class TileItem extends Entity {
garbageValue = "9349"
)
@Export("addNpcToMenu")
static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) {
if (Client.menuOptionsCount < 400) { // L: 8719
if (var0.transforms != null) { // L: 8720
var0 = var0.transform();

2
runescape-client/src/main/java/UrlRequester.java
View File

@@ -24,7 +24,7 @@ public class UrlRequester implements Runnable {
descriptor = "Llm;"
)
@Export("compass")
static Sprite compass;
static SpritePixels compass;
@ObfuscatedName("h")
@Export("thread")
final Thread thread;

2
runescape-client/src/main/java/UserComparator4.java
View File

@@ -330,7 +330,7 @@ public class UserComparator4 implements Comparator {
}
if (var17 != null) { // L: 6854
ObjectDefinition var18 = WorldMapDecoration.getObjectDefinition(var14); // L: 6855
ObjectComposition var18 = WorldMapDecoration.getObjectDefinition(var14); // L: 6855
int var19;
int var20;
if (var5 != 1 && var5 != 3) { // L: 6858

2
runescape-client/src/main/java/UserComparator9.java
View File

@@ -86,7 +86,7 @@ public class UserComparator9 extends AbstractUserComparator {
int var5 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 743
var3.itemId = var4; // L: 744
var3.itemQuantity = var5; // L: 745
ItemDefinition var6 = SecureRandomCallable.ItemDefinition_get(var4); // L: 746
ItemComposition var6 = SecureRandomCallable.ItemDefinition_get(var4); // L: 746
var3.modelAngleX = var6.xan2d; // L: 747
var3.modelAngleY = var6.yan2d; // L: 748
var3.modelAngleZ = var6.zan2d; // L: 749

2
runescape-client/src/main/java/VarbitDefinition.java
View File

@@ -115,7 +115,7 @@ public class VarbitDefinition extends DualNode {
for (int var6 = var2; var6 < var3; ++var6) { // L: 82
char var7 = var0.charAt(var6); // L: 83
if (ObjectDefinition.method4657(var7)) { // L: 84
if (ObjectComposition.method4657(var7)) { // L: 84
char var8 = UserComparator10.method3492(var7); // L: 85
if (var8 != 0) { // L: 86
var9.append(var8); // L: 87

2
runescape-client/src/main/java/ViewportMouse.java
View File

@@ -68,7 +68,7 @@ public class ViewportMouse {
descriptor = "Llm;"
)
@Export("redHintArrowSprite")
static Sprite redHintArrowSprite;
static SpritePixels redHintArrowSpritePixels;
static {
ViewportMouse_isInViewport = false; // L: 4

14
runescape-client/src/main/java/Widget.java
View File

@@ -1245,7 +1245,7 @@ public class Widget extends Node {
garbageValue = "14"
)
@Export("getSprite")
public Sprite getSprite(boolean var1) {
public SpritePixels getSprite(boolean var1) {
field2603 = false; // L: 530
int var2;
if (var1) { // L: 532
@@ -1258,7 +1258,7 @@ public class Widget extends Node {
return null;
} else {
long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 535
Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); // L: 536
SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 536
if (var5 != null) { // L: 537
return var5;
} else {
@@ -1331,14 +1331,14 @@ public class Widget extends Node {
garbageValue = "1550530577"
)
@Export("getInventorySprite")
public Sprite getInventorySprite(int var1) {
public SpritePixels getInventorySprite(int var1) {
field2603 = false; // L: 565
if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 566
int var2 = this.inventorySprites[var1]; // L: 567
if (var2 == -1) { // L: 568
return null;
} else {
Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); // L: 569
SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 569
if (var3 != null) { // L: 570
return var3;
} else {
@@ -1418,7 +1418,7 @@ public class Widget extends Node {
}
if (var5 == 4) { // L: 619
ItemDefinition var9 = SecureRandomCallable.ItemDefinition_get(var6); // L: 620
ItemComposition var9 = SecureRandomCallable.ItemDefinition_get(var6); // L: 620
var8 = var9.getModelData(10); // L: 621
if (var8 == null) { // L: 622
field2603 = true; // L: 623
@@ -1459,11 +1459,11 @@ public class Widget extends Node {
if (var5 != null) { // L: 642
return var5;
} else {
Sprite var6 = this.getSprite(var1); // L: 643
SpritePixels var6 = this.getSprite(var1); // L: 643
if (var6 == null) { // L: 644
return null;
} else {
Sprite var7 = var6.copyNormalized(); // L: 645
SpritePixels var7 = var6.copyNormalized(); // L: 645
int[] var8 = new int[var7.subHeight]; // L: 646
int[] var9 = new int[var7.subHeight]; // L: 647

4
runescape-client/src/main/java/World.java
View File

@@ -172,8 +172,8 @@ public class World {
garbageValue = "-186964533"
)
public static void method1849(AbstractArchive var0, AbstractArchive var1) {
NPCDefinition.NpcDefinition_archive = var0; // L: 57
NPCDefinition.NpcDefinition_modelArchive = var1; // L: 58
NPCComposition.NpcDefinition_archive = var0; // L: 57
NPCComposition.NpcDefinition_modelArchive = var1; // L: 58
} // L: 59
@ObfuscatedName("x")

18
runescape-client/src/main/java/WorldMap.java
View File

@@ -260,7 +260,7 @@ public class WorldMap {
descriptor = "Llm;"
)
@Export("sprite")
Sprite sprite;
SpritePixels spritePixels;
@ObfuscatedName("bn")
@ObfuscatedGetter(
intValue = -905159911
@@ -802,9 +802,9 @@ public class WorldMap {
garbageValue = "-90"
)
boolean method6515(int var1, int var2, int var3, int var4, int var5, int var6) {
if (this.sprite == null) { // L: 449
if (this.spritePixels == null) { // L: 449
return true;
} else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 450
} else if (this.spritePixels.subWidth == var1 && this.spritePixels.subHeight == var2) { // L: 450
if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 451
return true;
} else if (this.field4048 != Client.field915) { // L: 452
@@ -837,16 +837,16 @@ public class WorldMap {
int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 468
int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 469
if (this.method6515(var8, var9, var13, var14, var3, var4)) { // L: 470
if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 471
Arrays.fill(this.sprite.pixels, 0); // L: 474
if (this.spritePixels != null && this.spritePixels.subWidth == var8 && this.spritePixels.subHeight == var9) { // L: 471
Arrays.fill(this.spritePixels.pixels, 0); // L: 474
} else {
this.sprite = new Sprite(var8, var9); // L: 472
this.spritePixels = new SpritePixels(var8, var9); // L: 472
}
this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 475
this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 476
this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 477
WorldMapIcon_0.field148.method4346(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 478
WorldMapIcon_0.field148.method4346(this.minCachedTileX, this.minCachedTileY, this.spritePixels, (float)this.cachedPixelsPerTile / var10); // L: 478
this.field4048 = Client.field915; // L: 479
var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 480
var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 481
@@ -854,9 +854,9 @@ public class WorldMap {
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 483
if (1.0F == var10) { // L: 484
this.sprite.method6181(var13, var14, 192); // L: 485
this.spritePixels.method6181(var13, var14, 192); // L: 485
} else {
this.sprite.method6184(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); // L: 488
this.spritePixels.method6184(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); // L: 488
}
}

2
runescape-client/src/main/java/WorldMapData_1.java
View File

@@ -402,7 +402,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
int var14 = Occluder.Entity_unpackID(var7); // L: 6999
int var15 = var12 & 31; // L: 7000
int var16 = var12 >> 6 & 3; // L: 7001
ObjectDefinition var13;
ObjectComposition var13;
if (var1 == 0) { // L: 7002
ArchiveLoader.scene.removeBoundaryObject(var0, var2, var3); // L: 7003
var13 = WorldMapDecoration.getObjectDefinition(var14); // L: 7004

10
runescape-client/src/main/java/WorldMapDecoration.java
View File

@@ -39,13 +39,13 @@ public class WorldMapDecoration {
garbageValue = "-671846279"
)
@Export("getObjectDefinition")
public static ObjectDefinition getObjectDefinition(int var0) {
ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); // L: 73
public static ObjectComposition getObjectDefinition(int var0) {
ObjectComposition var1 = (ObjectComposition) ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73
if (var1 != null) { // L: 74
return var1;
} else {
byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); // L: 75
var1 = new ObjectDefinition(); // L: 76
byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75
var1 = new ObjectComposition(); // L: 76
var1.id = var0; // L: 77
if (var2 != null) { // L: 78
var1.decode(new Buffer(var2));
@@ -57,7 +57,7 @@ public class WorldMapDecoration {
var1.boolean1 = false; // L: 82
}
ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84
ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84
return var1; // L: 85
}
}

6
runescape-client/src/main/java/WorldMapElement.java
View File

@@ -277,7 +277,7 @@ public class WorldMapElement extends DualNode {
garbageValue = "-375882692"
)
@Export("getSpriteBool")
public Sprite getSpriteBool(boolean var1) {
public SpritePixels getSpriteBool(boolean var1) {
int var2 = this.sprite1; // L: 161
return this.getSprite(var2); // L: 162
}
@@ -288,11 +288,11 @@ public class WorldMapElement extends DualNode {
garbageValue = "954144981"
)
@Export("getSprite")
Sprite getSprite(int var1) {
SpritePixels getSprite(int var1) {
if (var1 < 0) { // L: 166
return null;
} else {
Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); // L: 167
SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 167
if (var2 != null) { // L: 168
return var2;
} else {

12
runescape-client/src/main/java/WorldMapIcon_0.java
View File

@@ -65,7 +65,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
this.element = var3; // L: 15
this.label = var4; // L: 16
WorldMapElement var5 = UserComparator10.WorldMapElement_get(this.getElement()); // L: 17
Sprite var6 = var5.getSpriteBool(false); // L: 18
SpritePixels var6 = var5.getSpriteBool(false); // L: 18
if (var6 != null) { // L: 19
this.subWidth = var6.subWidth; // L: 20
this.subHeight = var6.subHeight; // L: 21
@@ -122,20 +122,20 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
garbageValue = "-1562808952"
)
@Export("getNpcDefinition")
public static NPCDefinition getNpcDefinition(int var0) {
NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); // L: 62
public static NPCComposition getNpcDefinition(int var0) {
NPCComposition var1 = (NPCComposition) NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62
if (var1 != null) { // L: 63
return var1;
} else {
byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); // L: 64
var1 = new NPCDefinition(); // L: 65
byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64
var1 = new NPCComposition(); // L: 65
var1.id = var0; // L: 66
if (var2 != null) { // L: 67
var1.decode(new Buffer(var2));
}
var1.postDecode(); // L: 68
NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); // L: 69
NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69
return var1; // L: 70
}
}

6
runescape-client/src/main/java/WorldMapIcon_1.java
View File

@@ -110,7 +110,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
this.element = WorldMapDecoration.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
this.label = this.region.createMapLabel(UserComparator10.WorldMapElement_get(this.element)); // L: 25
WorldMapElement var1 = UserComparator10.WorldMapElement_get(this.getElement()); // L: 26
Sprite var2 = var1.getSpriteBool(false); // L: 27
SpritePixels var2 = var1.getSpriteBool(false); // L: 27
if (var2 != null) { // L: 28
this.subWidth = var2.subWidth; // L: 29
this.subHeight = var2.subHeight; // L: 30
@@ -205,8 +205,8 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
garbageValue = "620552386"
)
public static void method339() {
NPCDefinition.NpcDefinition_cached.clear(); // L: 285
NPCDefinition.NpcDefinition_cachedModels.clear(); // L: 286
NPCComposition.NpcDefinition_cached.clear(); // L: 285
NPCComposition.NpcDefinition_cachedModels.clear(); // L: 286
} // L: 287
@ObfuscatedName("q")

24
runescape-client/src/main/java/WorldMapManager.java
View File

@@ -47,7 +47,7 @@ public final class WorldMapManager {
descriptor = "Llm;"
)
@Export("compositeTextureSprite")
Sprite compositeTextureSprite;
SpritePixels compositeTextureSpritePixels;
@ObfuscatedName("t")
@Export("icons")
HashMap icons;
@@ -189,7 +189,7 @@ public final class WorldMapManager {
System.nanoTime(); // L: 93
if (var1.isValidFileName(WorldMapCacheName.field327.name, var2)) { // L: 94
byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field327.name, var2); // L: 95
this.compositeTextureSprite = WorldMapSection0.convertJpgToSprite(var20); // L: 96
this.compositeTextureSpritePixels = WorldMapSection0.convertJpgToSprite(var20); // L: 96
}
System.nanoTime(); // L: 98
@@ -298,8 +298,8 @@ public final class WorldMapManager {
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
if (this.compositeTextureSprite != null) { // L: 166
this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169
if (this.compositeTextureSpritePixels != null) { // L: 166
this.compositeTextureSpritePixels.drawScaledAt(var1, var2, var3, var4); // L: 169
if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170
if (this.icons == null) { // L: 173
this.buildIcons0(); // L: 174
@@ -777,7 +777,7 @@ public final class WorldMapManager {
garbageValue = "-1786223770"
)
@Export("getItemSprite")
public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
if (var1 == -1) { // L: 353
var4 = 0;
} else if (var4 == 2 && var1 != 1) { // L: 354
@@ -785,15 +785,15 @@ public final class WorldMapManager {
}
long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16); // L: 355
Sprite var8;
SpritePixels var8;
if (!var5) { // L: 357
var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); // L: 358
var8 = (SpritePixels) ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 358
if (var8 != null) { // L: 359
return var8;
}
}
ItemDefinition var9 = SecureRandomCallable.ItemDefinition_get(var0); // L: 361
ItemComposition var9 = SecureRandomCallable.ItemDefinition_get(var0); // L: 361
if (var1 > 1 && var9.countobj != null) { // L: 362
int var10 = -1; // L: 363
@@ -812,7 +812,7 @@ public final class WorldMapManager {
if (var19 == null) { // L: 370
return null;
} else {
Sprite var20 = null; // L: 371
SpritePixels var20 = null; // L: 371
if (var9.noteTemplate != -1) { // L: 372
var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373
if (var20 == null) { // L: 374
@@ -835,7 +835,7 @@ public final class WorldMapManager {
int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386
int[] var15 = new int[4]; // L: 387
Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388
var8 = new Sprite(36, 32); // L: 389
var8 = new SpritePixels(36, 32); // L: 389
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390
Rasterizer2D.Rasterizer2D_clear(); // L: 391
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392
@@ -878,11 +878,11 @@ public final class WorldMapManager {
}
if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409
ItemDefinition.ItemDefinition_fontPlain11.draw(class195.inventoryQuantityFormat(var1), 0, 9, 16776960, 1); // L: 410
ItemComposition.ItemDefinition_fontPlain11.draw(class195.inventoryQuantityFormat(var1), 0, 9, 16776960, 1); // L: 410
}
if (!var5) { // L: 412
ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6);
ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
}
Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 413

8
runescape-client/src/main/java/WorldMapRectangle.java
View File

@@ -113,10 +113,10 @@ public final class WorldMapRectangle {
FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2863
MusicPatchPcmStream.method3953(); // L: 2865
UserComparator2.method5959(); // L: 2866
ObjectDefinition.ObjectDefinition_cached.clear(); // L: 2868
ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 2869
ObjectDefinition.ObjectDefinition_cachedEntities.clear(); // L: 2870
ObjectDefinition.ObjectDefinition_cachedModels.clear(); // L: 2871
ObjectComposition.ObjectDefinition_cached.clear(); // L: 2868
ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2869
ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2870
ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2871
WorldMapIcon_1.method339(); // L: 2873
TileItem.method2187(); // L: 2874
SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2876

24
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -95,7 +95,7 @@ public class WorldMapRegion {
garbageValue = "-1252499183"
)
void method534(int var1, int var2, int var3) {
Sprite var4 = PlayerType.method4170(this.regionX, this.regionY, this.pixelsPerTile); // L: 61
SpritePixels var4 = PlayerType.method4170(this.regionX, this.regionY, this.pixelsPerTile); // L: 61
if (var4 != null) { // L: 62
if (var3 == this.pixelsPerTile * 64) { // L: 63
var4.drawAt(var1, var2); // L: 64
@@ -154,7 +154,7 @@ public class WorldMapRegion {
WorldMapDecoration[] var10 = var9; // L: 99
for (int var11 = 0; var11 < var10.length; ++var11) { // L: 100
ObjectDefinition var13;
ObjectComposition var13;
boolean var14;
label66: {
WorldMapDecoration var12 = var10[var11]; // L: 101
@@ -164,7 +164,7 @@ public class WorldMapRegion {
for (int var16 = 0; var16 < var15.length; ++var16) { // L: 109
int var17 = var15[var16]; // L: 110
ObjectDefinition var18 = WorldMapDecoration.getObjectDefinition(var17); // L: 112
ObjectComposition var18 = WorldMapDecoration.getObjectDefinition(var17); // L: 112
if (var18.mapIconId != -1) { // L: 113
var14 = true; // L: 114
break label66;
@@ -196,7 +196,7 @@ public class WorldMapRegion {
garbageValue = "1801137136"
)
@Export("getIcon")
void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 141
Coord var7 = null; // L: 142
if (this.worldMapData_0 != null) { // L: 143
@@ -340,7 +340,7 @@ public class WorldMapRegion {
if (var6) { // L: 254
byte[] var7 = var5.takeFileFlat(var8); // L: 255
WorldMapSprite var9 = DynamicObject.method2300(var7); // L: 256
Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 257
SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 257
var10.setRaster(); // L: 258
if (this.worldMapData_0 != null) { // L: 259
this.method471(var2, var3, var9); // L: 260
@@ -541,7 +541,7 @@ public class WorldMapRegion {
int var11 = var9.decoration; // L: 402
boolean var10 = var11 >= WorldMapDecorationType.field2764.id && var11 <= WorldMapDecorationType.field2755.id; // L: 404
if (var10 || BoundaryObject.method3342(var9.decoration)) { // L: 406
ObjectDefinition var12 = WorldMapDecoration.getObjectDefinition(var9.objectDefinitionId); // L: 407
ObjectComposition var12 = WorldMapDecoration.getObjectDefinition(var9.objectDefinitionId); // L: 407
if (var12.mapSceneId != -1) { // L: 408
if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 409
var4[var12.mapSceneId].method6141(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 413
@@ -570,7 +570,7 @@ public class WorldMapRegion {
for (int var7 = 0; var7 < var6.length; ++var7) { // L: 431
WorldMapDecoration var8 = var6[var7]; // L: 432
if (FriendLoginUpdate.method5290(var8.decoration)) { // L: 434
ObjectDefinition var9 = WorldMapDecoration.getObjectDefinition(var8.objectDefinitionId); // L: 435
ObjectComposition var9 = WorldMapDecoration.getObjectDefinition(var8.objectDefinitionId); // L: 435
int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 436
if (var8.decoration == WorldMapDecorationType.field2761.id) { // L: 437
this.method503(var1, var2, var8.rotation, var10); // L: 438
@@ -675,7 +675,7 @@ public class WorldMapRegion {
)
@Export("drawBackgroundCircle")
void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) {
Sprite var6 = var1.getSpriteBool(false); // L: 506
SpritePixels var6 = var1.getSpriteBool(false); // L: 506
if (var6 != null) { // L: 507
var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 510
if (var4 % var5 < var5 / 2) { // L: 511
@@ -703,7 +703,7 @@ public class WorldMapRegion {
garbageValue = "0"
)
void method494(WorldMapElement var1, int var2, int var3) {
Sprite var4 = var1.getSpriteBool(false); // L: 524
SpritePixels var4 = var1.getSpriteBool(false); // L: 524
if (var4 != null) { // L: 525
int var5 = this.method497(var4, var1.horizontalAlignment); // L: 526
int var6 = this.method498(var4, var1.verticalAlignment); // L: 527
@@ -757,7 +757,7 @@ public class WorldMapRegion {
descriptor = "(Llm;Ljt;I)I",
garbageValue = "-1268952607"
)
int method497(Sprite var1, HorizontalAlignment var2) {
int method497(SpritePixels var1, HorizontalAlignment var2) {
switch(var2.value) { // L: 563
case 1:
return -var1.subWidth / 2; // L: 570
@@ -773,7 +773,7 @@ public class WorldMapRegion {
descriptor = "(Llm;Lit;S)I",
garbageValue = "-11626"
)
int method498(Sprite var1, VerticalAlignment var2) {
int method498(SpritePixels var1, VerticalAlignment var2) {
switch(var2.value) { // L: 580
case 1:
return 0; // L: 583
@@ -1046,7 +1046,7 @@ public class WorldMapRegion {
Client.dragItemSlotDestination = var15; // L: 9747
Occluder.hoveredItemContainer = var0; // L: 9748
if (var0.itemIds[var15] > 0) { // L: 9749
ItemDefinition var8 = SecureRandomCallable.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 9750
ItemComposition var8 = SecureRandomCallable.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 9750
if (Client.isItemSelected == 1 && class52.method844(FaceNormal.getWidgetFlags(var0))) { // L: 9751
if (var0.id != WorldMapLabelSize.selectedItemWidget || var15 != ChatChannel.selectedItemSlot) { // L: 9752
insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class23.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 9753

6
runescape-client/src/main/java/WorldMapSection0.java
View File

@@ -219,7 +219,7 @@ public class WorldMapSection0 implements WorldMapSection {
garbageValue = "1856556337"
)
@Export("convertJpgToSprite")
public static final Sprite convertJpgToSprite(byte[] var0) {
public static final SpritePixels convertJpgToSprite(byte[] var0) {
BufferedImage var1 = null; // L: 20
try {
@@ -229,12 +229,12 @@ public class WorldMapSection0 implements WorldMapSection {
int[] var4 = new int[var2 * var3]; // L: 25
PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26
var5.grabPixels(); // L: 27
return new Sprite(var4, var2, var3); // L: 28
return new SpritePixels(var4, var2, var3); // L: 28
} catch (IOException var7) { // L: 30
} catch (InterruptedException var8) { // L: 31
}
return new Sprite(0, 0); // L: 32
return new SpritePixels(0, 0); // L: 32
}
@ObfuscatedName("j")

4
runescape-client/src/main/java/WorldMapSection1.java
View File

@@ -203,7 +203,7 @@ public class WorldMapSection1 implements WorldMapSection {
static final void method626(double var0) {
Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 10642
((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 10643
ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 10645
ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 10645
Timer.clientPreferences.field1057 = var0; // L: 10647
GrandExchangeOffer.savePreferences(); // L: 10648
} // L: 10649
@@ -220,7 +220,7 @@ public class WorldMapSection1 implements WorldMapSection {
int var3 = 0; // L: 11104
for (int var4 = 0; var4 < Varcs.ItemDefinition_fileCount; ++var4) { // L: 11105
ItemDefinition var9 = SecureRandomCallable.ItemDefinition_get(var4); // L: 11106
ItemComposition var9 = SecureRandomCallable.ItemDefinition_get(var4); // L: 11106
if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11107 11108 11109
if (var3 >= 250) { // L: 11110
PacketBufferNode.foundItemIdCount = -1; // L: 11111

6
runescape-client/src/main/java/class1.java
View File

@@ -85,7 +85,7 @@ final class class1 implements class0 {
int[] var11 = class25.sceneMinimapSprite.pixels; // L: 5496
var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5497
var13 = Occluder.Entity_unpackID(var5); // L: 5498
ObjectDefinition var14 = WorldMapDecoration.getObjectDefinition(var13); // L: 5499
ObjectComposition var14 = WorldMapDecoration.getObjectDefinition(var13); // L: 5499
if (var14.mapSceneId != -1) { // L: 5500
IndexedSprite var15 = WorldMapRegion.mapSceneSprites[var14.mapSceneId]; // L: 5501
if (var15 != null) { // L: 5502
@@ -162,7 +162,7 @@ final class class1 implements class0 {
var8 = var7 >> 6 & 3; // L: 5572
var9 = var7 & 31; // L: 5573
var10 = Occluder.Entity_unpackID(var5); // L: 5574
ObjectDefinition var24 = WorldMapDecoration.getObjectDefinition(var10); // L: 5575
ObjectComposition var24 = WorldMapDecoration.getObjectDefinition(var10); // L: 5575
int var19;
if (var24.mapSceneId != -1) { // L: 5576
IndexedSprite var20 = WorldMapRegion.mapSceneSprites[var24.mapSceneId]; // L: 5577
@@ -196,7 +196,7 @@ final class class1 implements class0 {
var5 = ArchiveLoader.scene.getFloorDecorationTag(var0, var1, var2); // L: 5603
if (0L != var5) { // L: 5604
var7 = Occluder.Entity_unpackID(var5); // L: 5605
ObjectDefinition var21 = WorldMapDecoration.getObjectDefinition(var7); // L: 5606
ObjectComposition var21 = WorldMapDecoration.getObjectDefinition(var7); // L: 5606
if (var21.mapSceneId != -1) { // L: 5607
IndexedSprite var22 = WorldMapRegion.mapSceneSprites[var21.mapSceneId]; // L: 5608
if (var22 != null) { // L: 5609

2
runescape-client/src/main/java/class224.java
View File

@@ -17,7 +17,7 @@ public class class224 {
descriptor = "Llm;"
)
@Export("rightTitleSprite")
static Sprite rightTitleSprite;
static SpritePixels rightTitleSprite;
@ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "Llo;"

2
runescape-client/src/main/java/class234.java
View File

@@ -30,7 +30,7 @@ public class class234 {
garbageValue = "1847408099"
)
static final boolean method4159(int var0, int var1) {
ObjectDefinition var2 = WorldMapDecoration.getObjectDefinition(var0); // L: 892
ObjectComposition var2 = WorldMapDecoration.getObjectDefinition(var0); // L: 892
if (var1 == 11) { // L: 893
var1 = 10;
}

12
runescape-client/src/main/java/class248.java
View File

@@ -62,7 +62,7 @@ public class class248 {
}
}
Sprite var11 = new Sprite(var6, var2, var2); // L: 59
SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 59
this.spriteMap.put(var1, var11); // L: 60
} // L: 61
@@ -71,12 +71,12 @@ public class class248 {
descriptor = "(II)Llm;",
garbageValue = "-2015707218"
)
Sprite method4343(int var1) {
SpritePixels method4343(int var1) {
if (!this.spriteMap.containsKey(var1)) { // L: 64
this.method4342(var1); // L: 65
}
return (Sprite)this.spriteMap.get(var1); // L: 67
return (SpritePixels)this.spriteMap.get(var1); // L: 67
}
@ObfuscatedName("w")
@@ -106,9 +106,9 @@ public class class248 {
descriptor = "(IILlm;FB)V",
garbageValue = "-62"
)
public final void method4346(int var1, int var2, Sprite var3, float var4) {
public final void method4346(int var1, int var2, SpritePixels var3, float var4) {
int var5 = (int)(var4 * 18.0F); // L: 82
Sprite var6 = this.method4343(var5); // L: 83
SpritePixels var6 = this.method4343(var5); // L: 83
int var7 = var5 * 2 + 1; // L: 84
Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 85
Bounds var9 = new Bounds(0, 0); // L: 86
@@ -157,7 +157,7 @@ public class class248 {
descriptor = "(Llm;Llm;Llc;B)V",
garbageValue = "36"
)
void method4347(Sprite var1, Sprite var2, Bounds var3) {
void method4347(SpritePixels var1, SpritePixels var2, Bounds var3) {
if (var3.highX != 0 && var3.highY != 0) { // L: 118
int var4 = 0; // L: 119
int var5 = 0; // L: 120

6
runescape-client/src/main/java/class25.java
View File

@@ -11,7 +11,7 @@ public class class25 {
descriptor = "Llm;"
)
@Export("sceneMinimapSprite")
static Sprite sceneMinimapSprite;
static SpritePixels sceneMinimapSprite;
@ObfuscatedName("rf")
@ObfuscatedGetter(
intValue = 487407289
@@ -22,7 +22,7 @@ public class class25 {
descriptor = "Llm;"
)
@Export("leftTitleSprite")
static Sprite leftTitleSprite;
static SpritePixels leftTitleSprite;
@ObfuscatedName("al")
@Export("garbageCollector")
static GarbageCollectorMXBean garbageCollector;
@@ -191,7 +191,7 @@ public class class25 {
garbageValue = "-1541467427"
)
@Export("drawSpriteOnMinimap")
static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
if (var4 != null) { // L: 10982
int var6 = Client.camAngleY & 2047; // L: 10983
int var7 = var3 * var3 + var2 * var2; // L: 10984

2
runescape-client/src/main/java/class280.java
View File

@@ -8,7 +8,7 @@ public class class280 {
descriptor = "(Lib;Ljava/lang/String;Ljava/lang/String;B)[Llm;",
garbageValue = "0"
)
public static Sprite[] method5008(AbstractArchive var0, String var1, String var2) {
public static SpritePixels[] method5008(AbstractArchive var0, String var1, String var2) {
int var3 = var0.getGroupId(var1); // L: 139
int var4 = var0.getFileId(var3, var2); // L: 140
return ClientPreferences.method1918(var0, var3, var4); // L: 141

2
runescape-client/src/main/java/class301.java
View File

@@ -9,5 +9,5 @@ public final class class301 {
descriptor = "[Llm;"
)
@Export("worldSelectBackSprites")
static Sprite[] worldSelectBackSprites;
static SpritePixels[] worldSelectBackSpritePixels;
}

4
runescape-client/src/main/java/class7.java
View File

@@ -58,7 +58,7 @@ public enum class7 implements Enumerated {
Tiles.Tiles_minPlane = var0;
}
ObjectDefinition var8 = WorldMapDecoration.getObjectDefinition(var3); // L: 234
ObjectComposition var8 = WorldMapDecoration.getObjectDefinition(var3); // L: 234
int var9;
int var10;
if (var4 != 1 && var4 != 3) { // L: 237
@@ -636,7 +636,7 @@ public enum class7 implements Enumerated {
garbageValue = "1516995220"
)
@Export("addWidgetItemMenuItem")
static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) {
static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
String[] var5 = var1.inventoryActions; // L: 9686
byte var6 = -1; // L: 9687
String var7 = null; // L: 9688

2
runescape-client/src/main/java/class89.java
View File

@@ -113,7 +113,7 @@ public class class89 {
Login.title_muteSprite = null; // L: 224
DirectByteArrayCopier.options_buttons_0Sprite = null; // L: 225
ItemContainer.options_buttons_2Sprite = null; // L: 226
class301.worldSelectBackSprites = null; // L: 227
class301.worldSelectBackSpritePixels = null; // L: 227
class90.worldSelectFlagSprites = null; // L: 228
WorldMapSectionType.worldSelectArrows = null; // L: 229
class349.worldSelectStars = null; // L: 230