RS-Client: Refactoring (also gradle compiler args) (#1236)

* gradle: compiler args for mixins/rs-client

* rs-client: yes

* rs-client: no
This commit is contained in:
Lucwousin
2019-08-02 21:01:00 +01:00
committed by Kyleeld
parent 2057fdfd41
commit 11f3b74687
124 changed files with 6121 additions and 5998 deletions
-6
View File
@@ -42,12 +42,6 @@ allprojects {
rootPath = rootDir.toString().replace('\\', '/')
injectedClassesPath = rootPath + "/injected-client/build/libs/injected-client-" + version + ".jar"
}
gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
}
}
}
subprojects {
@@ -47,16 +47,16 @@ public class RasterizerHook
private static final String r3d_vert = "Rasterizer3D_vertAlpha";
private static final String r3d_horiz = "Rasterizer3D_horizAlpha";
private static final String r3d_field = "Rasterizer3D_alpha";
private static final String sprite_alpha1 = "Sprite_alpha1";
private static final String sprite_alpha2 = "Sprite_alpha2";
private static final String sprite_alpha1 = "Sprite_drawTransparent";
private static final String sprite_alpha2 = "Sprite_drawTransScaled";
private static final String font = "AbstractFont_placeGlyph";
private static final String rast3D = "Rasterizer3D_iDontKnow";
private static final String rast3D2 = "Rasterizer3D_textureAlpha";
private static final String sprite = "Sprite_something";
private static final String sprite2 = "Sprite_somethingElse";
private static final String sprite3 = "Sprite_anotherOne";
private static final String sprite4 = "Sprite_andAnotherOne";
private static final String sprite = "Sprite_draw";
private static final String sprite2 = "Sprite_drawScaled";
private static final String sprite3 = "Sprite_drawTransOverlay";
private static final String sprite4 = "Sprite_drawTransBg";
private static final String indexedSprite = "IndexedSprite_something";
private static final String indexedSprite2 = "IndexedSprite_two";
@@ -155,6 +155,8 @@ public enum MenuAction
WIDGET_TYPE_5(29),
/**
* Interaction with widget (type 6).
*
* This is the continue button on message boxes
*/
WIDGET_TYPE_6(30),
/**
@@ -35,10 +35,12 @@ public final class WidgetType
public static final int TEXT_INVENTORY = 7;
public static final int IF1_TOOLTIP = 8;
public static final int LINE = 9;
public static final int EQUIPMENT_SCREEN_MODEL = 328;
public static final int FPS = 1336;
public static final int VIEWPORT = 1337;
public static final int MINIMAP = 1338;
public static final int COMPASS = 1339;
public static final int WORLD_MAP = 1400;
public static final int WORLD_MAP_OVERVIEW = 1401;
public static final int LOGIN_SCREEN_FIRE = 1402;
}
+3 -2
View File
@@ -1,9 +1,10 @@
description = 'RuneLite Mixins'
dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
implementation project(':runescape-api')
compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compileOnly group: 'javax.inject', name: 'javax.inject', version: '1'
}
tasks.withType(JavaCompile){
options.compilerArgs.addAll('-source', '7', '-Xlint:-unchecked')
}
@@ -279,10 +279,10 @@ public interface RSClient extends RSGameShell, Client
@Override
int[] getPlayerMenuTypes();
@Import("MouseHandler_x0")
@Import("MouseHandler_xVolatile")
int getMouseX();
@Import("MouseHandler_y0")
@Import("MouseHandler_yVolatile")
int getMouseY();
@Import("Scene_selectedScreenX")
@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
public interface RSSprite extends Sprite
{
@Import("drawAt2")
@Import("drawTransBgAt")
@Override
void drawAt(int x, int y);
@@ -30,9 +30,9 @@ public interface RSSprite extends Sprite
@Import("height")
void setMaxHeight(int maxHeight);
@Import("yOffset")
void setOffsetX(int offsetX); // <-- I don't even know
@Import("xOffset")
void setOffsetY(int offsetY); // <-- I don't even know
void setOffsetX(int offsetX);
@Import("yOffset")
void setOffsetY(int offsetY);
}
+3
View File
@@ -6,3 +6,6 @@ dependencies {
testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
}
tasks.withType(JavaCompile) {
options.compilerArgs.addAll('-g:source,vars,lines', '-Xlint:-unchecked')
}
@@ -1043,14 +1043,14 @@ public abstract class AbstractFont extends Rasterizer2D {
@ObfuscatedName("at")
@Export("AbstractFont_placeGlyphAlpha")
static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;
var2 = ((var2 & 0xff00) * var9 & 0xff0000) + (var9 * (var2 & 0xff00ff) & 0xff00ff00) >> 8;
var9 = 256 - var9;
for (int var10 = -var6; var10 < 0; ++var10) {
for (int var11 = -var5; var11 < 0; ++var11) {
if (var1[var3++] != 0) {
int var12 = var0[var4];
var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2;
var0[var4++] = (((var12 & 0xff00) * var9 & 0xff0000) + ((var12 & 0xff00ff) * var9 & 0xff00ff00) >> 8) + var2;
} else {
++var4;
}
@@ -284,7 +284,7 @@ public abstract class AbstractWorldMapData {
int var9 = var8 - var7;
String var6;
if (var9 < -9) {
var6 = ClientPreferences.colorStartTag(16711680);
var6 = ClientPreferences.colorStartTag(0xff0000);
} else if (var9 < -6) {
var6 = ClientPreferences.colorStartTag(16723968);
} else if (var9 < -3) {
@@ -292,7 +292,7 @@ public abstract class AbstractWorldMapData {
} else if (var9 < 0) {
var6 = ClientPreferences.colorStartTag(16756736);
} else if (var9 > 9) {
var6 = ClientPreferences.colorStartTag(65280);
var6 = ClientPreferences.colorStartTag(0xff00);
} else if (var9 > 6) {
var6 = ClientPreferences.colorStartTag(4259584);
} else if (var9 > 3) {
@@ -300,21 +300,21 @@ public abstract class AbstractWorldMapData {
} else if (var9 > 0) {
var6 = ClientPreferences.colorStartTag(12648192);
} else {
var6 = ClientPreferences.colorStartTag(16776960);
var6 = ClientPreferences.colorStartTag(0xffff00);
}
var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
}
if (var0.isFollower && Client.followerOpsLowPriority) {
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
}
if (Client.isItemSelected == 1) {
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(16776960) + var4, 7, var1, var2, var3);
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 7, var1, var2, var3);
} else if (Client.isSpellSelected) {
if ((WorldMapCacheName.selectedSpellFlags & 2) == 2) {
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(16776960) + var4, 8, var1, var2, var3);
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 8, var1, var2, var3);
}
} else {
int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
@@ -343,7 +343,7 @@ public abstract class AbstractWorldMapData {
var8 = var10 + 13;
}
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(16776960) + var4, var8, var1, var2, var3);
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
}
}
}
@@ -378,14 +378,14 @@ public abstract class AbstractWorldMapData {
var8 = var12 + 13;
}
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(16776960) + var4, var8, var1, var2, var3);
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
}
}
}
}
if (!var0.isFollower || !Client.followerOpsLowPriority) {
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
}
}
@@ -105,7 +105,7 @@ public abstract class AbstractWorldMapIcon {
if (!this.hasValidElement()) {
return false;
}
WorldMapElement var3 = class222.getWorldMapElement(this.getElement());
WorldMapElement var3 = class222.WorldMapElement_get(this.getElement());
int var4 = this.getSubWidth();
int var5 = this.getSubHeight();
switch(var3.horizontalAlignment.value) {
+3 -2
View File
@@ -438,9 +438,10 @@ public class Archive extends AbstractArchive {
signature = "(IB)V",
garbageValue = "35"
)
static final void method4269(int var0) {
@Export("drawInterfaceModelComponents")
static final void drawInterfaceModelComponents(int var0) {
if (class162.loadInterface(var0)) {
class225.method4122(Widget.Widget_interfaceComponents[var0], -1);
class225.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1);
}
}
}
@@ -74,7 +74,7 @@ public class ArchiveDiskActionHandler implements Runnable {
field3144 = 600;
}
} else {
EnumDefinition.method4550(100L);
EnumDefinition.sleepMillis(100L);
synchronized(ArchiveDiskActionHandler_lock) {
if (field3144 <= 1) {
field3144 = 0;
@@ -256,7 +256,7 @@ public class ArchiveLoader {
}
if (!Client.localPlayer.isHidden) {
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 0xffffff);
}
} else {
Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
@@ -192,7 +192,7 @@ public final class BZip2Decompressor {
int[] var23 = null;
int[] var24 = null;
int[] var25 = null;
var0.blockSize100k = 1410065408;
var0.blockSize100k = 1;
if (VarbitDefinition.BZip2Decompressor_block == null) {
VarbitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
}
+100 -98
View File
@@ -311,7 +311,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedSignature(
signature = "Lhj;"
)
static Widget field850;
@Export("meslayerContinueWidget")
static Widget meslayerContinueWidget;
@ObfuscatedName("mx")
@ObfuscatedGetter(
intValue = 176559841
@@ -584,7 +585,8 @@ public final class Client extends GameShell implements Usernamed {
)
static long field666;
@ObfuscatedName("cb")
static boolean field667;
@Export("hadFocus")
static boolean hadFocus;
@ObfuscatedName("cx")
@Export("displayFps")
static boolean displayFps;
@@ -1102,7 +1104,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = -36674671
)
static int field774;
@Export("drawPlayerNames")
static int drawPlayerNames;
@ObfuscatedName("kv")
@ObfuscatedGetter(
intValue = -469680529
@@ -1211,12 +1214,14 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = 1100971195
)
static int field803;
@Export("viewportX")
static int viewportX;
@ObfuscatedName("lz")
@ObfuscatedGetter(
intValue = 361474091
)
static int field804;
@Export("viewportY")
static int viewportY;
@ObfuscatedName("lv")
@ObfuscatedSignature(
signature = "Lcn;"
@@ -1287,7 +1292,7 @@ public final class Client extends GameShell implements Usernamed {
field717 = -1;
field665 = -1;
field666 = -1L;
field667 = true;
hadFocus = true;
displayFps = false;
rebootTimer = 0;
hintArrowType = 0;
@@ -1390,7 +1395,7 @@ public final class Client extends GameShell implements Usernamed {
localPlayerIndex = -1;
field771 = 0;
renderSelf = true;
field774 = 0;
drawPlayerNames = 0;
field775 = 0;
field776 = new int[1000];
playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51};
@@ -1419,8 +1424,8 @@ public final class Client extends GameShell implements Usernamed {
shiftClickDrop = false;
tapToDrop = false;
showMouseOverText = true;
field803 = -1;
field804 = -1;
viewportX = -1;
viewportY = -1;
field840 = 0;
field833 = 50;
isItemSelected = 0;
@@ -1436,7 +1441,7 @@ public final class Client extends GameShell implements Usernamed {
field818 = -1;
chatEffects = 0;
field809 = 0;
field850 = null;
meslayerContinueWidget = null;
runEnergy = 0;
weight = 0;
staffModLevel = 0;
@@ -1485,7 +1490,7 @@ public final class Client extends GameShell implements Usernamed {
gameDrawingMode = 0;
field868 = 0L;
isResizable = true;
field870 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
field870 = new int[]{0xffff00, 0xff0000, 0xff00, 65535, 0xff00ff, 0xffffff};
publicChatMode = 0;
tradeChatMode = 0;
field762 = "";
@@ -1621,11 +1626,17 @@ public final class Client extends GameShell implements Usernamed {
while (true) {
ArchiveDiskAction var1;
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast();
synchronized (ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
var1 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast();
}
if (var1 == null) {
break;
}
var1.archive.load(var1.archiveDisk, (int) var1.key, var1.data, false);
}
int var6;
try {
if (class197.field2402 == 1) {
@@ -1695,15 +1706,15 @@ public final class Client extends GameShell implements Usernamed {
}
synchronized(MouseHandler.MouseHandler_instance) {
MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0;
MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0;
MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_y0;
MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_millis0;
MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButton0;
MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedX0;
MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedY0;
MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis0;
MouseHandler.MouseHandler_lastButton0 = 0;
MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile;
MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile;
MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile;
MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile;
MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile;
MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile;
MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile;
MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile;
MouseHandler.MouseHandler_lastButtonVolatile = 0;
}
if (WorldMapManager.mouseWheel != null) {
@@ -1718,28 +1729,20 @@ public final class Client extends GameShell implements Usernamed {
VarbitDefinition.method4484(this);
Timer.load();
WallDecoration.method3291();
} else if (gameState != 10 && gameState != 11) {
if (gameState == 20) {
} else if (gameState == 10 || gameState == 11) {
VarbitDefinition.method4484(this);
} else if (gameState == 20) {
VarbitDefinition.method4484(this);
this.doCycleLoggedOut();
} else if (gameState == 25) {
PacketBufferNode.method3628();
}
} else {
VarbitDefinition.method4484(this);
}
if (gameState == 30) {
this.doCycleLoggedIn();
} else if (gameState == 40 || gameState == 45) {
this.doCycleLoggedOut();
}
return;
}
var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false);
}
}
@ObfuscatedName("ag")
@@ -1808,8 +1811,9 @@ public final class Client extends GameShell implements Usernamed {
this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
} else if (gameState == 5) {
class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, class169.fontPlain12);
} else if (gameState != 10 && gameState != 11) {
if (gameState == 20) {
} else if (gameState == 10 || gameState == 11) {
class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, class169.fontPlain12);
} else if (gameState == 20) {
class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, class169.fontPlain12);
} else if (gameState == 25) {
if (field709 == 1) {
@@ -1836,9 +1840,6 @@ public final class Client extends GameShell implements Usernamed {
} else if (gameState == 45) {
TriBool.drawLoadingMessage("Please wait...", false);
}
} else {
class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, class169.fontPlain12);
}
if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
for (var4 = 0; var4 < rootWidgetCount; ++var4) {
@@ -2849,8 +2850,8 @@ public final class Client extends GameShell implements Usernamed {
for (var5 = 0; var5 < KeyHandler.field386; ++var5) {
long var22 = var20 - field879;
if (var22 > 16777215L) {
var22 = 16777215L;
if (var22 > 0xffffffL) {
var22 = 0xffffffL;
}
field879 = var20;
@@ -2879,15 +2880,15 @@ public final class Client extends GameShell implements Usernamed {
packetWriter.method2219(var15);
}
if (class267.field3557 && !field667) {
field667 = true;
if (class267.hasFocus && !hadFocus) {
hadFocus = true;
var15 = Archive.method4265(ClientPacket.field2276, packetWriter.isaacCipher);
var15.packetBuffer.writeByte(1);
packetWriter.method2219(var15);
}
if (!class267.field3557 && field667) {
field667 = false;
if (!class267.hasFocus && hadFocus) {
hadFocus = false;
var15 = Archive.method4265(ClientPacket.field2276, packetWriter.isaacCipher);
var15.packetBuffer.writeByte(0);
packetWriter.method2219(var15);
@@ -2947,10 +2948,10 @@ public final class Client extends GameShell implements Usernamed {
for (var7 = 0; var7 < 104; ++var7) {
long var24 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(class42.plane, var6, var7);
if (0L != var24) {
var10 = class43.method770(var24);
var10 = class43.getObjectIdFromTag(var24);
var11 = ViewportMouse.getObjectDefinition(var10).mapIconId;
if (var11 >= 0) {
mapIcons[mapIconCount] = class222.getWorldMapElement(var11).getSpriteBool(false);
mapIcons[mapIconCount] = class222.WorldMapElement_get(var11).getSpriteBool(false);
mapIconXs[mapIconCount] = var6;
mapIconYs[mapIconCount] = var7;
++mapIconCount;
@@ -3018,7 +3019,7 @@ public final class Client extends GameShell implements Usernamed {
if (ItemContainer.field549 != null) {
++field759;
if (field759 >= 15) {
Strings.method4120(ItemContainer.field549);
Strings.invalidateWidget(ItemContainer.field549);
ItemContainer.field549 = null;
}
}
@@ -3053,7 +3054,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var4 != localPlayer.plane) {
WorldMapLabel.method418(localPlayer.pathX[0] + MusicPatchNode2.baseX * 64, localPlayer.pathY[0] + class1.baseY * 64, var4, false);
WorldMapLabel.changePlane(localPlayer.pathX[0] + MusicPatchNode2.baseX * 64, localPlayer.pathY[0] + class1.baseY * 64, var4, false);
}
mouseWheelRotation = 0;
@@ -3087,7 +3088,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (WorldMapIcon_0.dragInventoryWidget != null) {
Strings.method4120(WorldMapIcon_0.dragInventoryWidget);
Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget);
++itemDragDuration;
if (MouseHandler.MouseHandler_currentButton == 0) {
if (field874) {
@@ -3171,21 +3172,21 @@ public final class Client extends GameShell implements Usernamed {
if (var36 != LoginScreenAnimation.mousedOverWidgetIf1) {
if (var36 != null) {
Strings.method4120(var36);
Strings.invalidateWidget(var36);
}
if (LoginScreenAnimation.mousedOverWidgetIf1 != null) {
Strings.method4120(LoginScreenAnimation.mousedOverWidgetIf1);
Strings.invalidateWidget(LoginScreenAnimation.mousedOverWidgetIf1);
}
}
if (var38 != class32.field284 && field840 == field833) {
if (var38 != null) {
Strings.method4120(var38);
Strings.invalidateWidget(var38);
}
if (class32.field284 != null) {
Strings.method4120(class32.field284);
Strings.invalidateWidget(class32.field284);
}
}
@@ -3193,7 +3194,7 @@ public final class Client extends GameShell implements Usernamed {
if (field840 < field833) {
++field840;
if (field840 == field833) {
Strings.method4120(class32.field284);
Strings.invalidateWidget(class32.field284);
}
}
} else if (field840 > 0) {
@@ -3326,7 +3327,7 @@ public final class Client extends GameShell implements Usernamed {
packetWriter.method2219(var30);
}
ArchiveLoader.friendSystem.method1762();
ArchiveLoader.friendSystem.processFriendUpdates();
++packetWriter.field1319;
if (packetWriter.field1319 > 50) {
var30 = Archive.method4265(ClientPacket.field2225, packetWriter.isaacCipher);
@@ -3416,7 +3417,7 @@ public final class Client extends GameShell implements Usernamed {
@Export("drawLoggedIn")
final void drawLoggedIn() {
if (rootInterface != -1) {
Archive.method4269(rootInterface);
Archive.drawInterfaceModelComponents(rootInterface);
}
int var1;
@@ -3430,8 +3431,8 @@ public final class Client extends GameShell implements Usernamed {
}
field741 = cycle;
field803 = -1;
field804 = -1;
viewportX = -1;
viewportY = -1;
class294.field3697 = null;
if (rootInterface != -1) {
rootWidgetCount = 0;
@@ -3441,11 +3442,11 @@ public final class Client extends GameShell implements Usernamed {
Rasterizer2D.Rasterizer2D_resetClip();
if (showMouseCross) {
if (mouseCrossColor == 1) {
Occluder.crossSprites[mouseCrossState * 20 / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
Occluder.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8);
}
if (mouseCrossColor == 2) {
Occluder.crossSprites[mouseCrossState * 20 / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
Occluder.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8);
}
}
@@ -3456,8 +3457,8 @@ public final class Client extends GameShell implements Usernamed {
int var7;
int var13;
if (!isMenuOpen) {
if (field803 != -1) {
WorldMapSprite.drawMenuActionTextAt(field803, field804);
if (viewportX != -1) {
WorldMapSprite.drawMenuActionTextAt(viewportX, viewportY);
}
} else {
var1 = class247.menuX;
@@ -3476,12 +3477,12 @@ public final class Client extends GameShell implements Usernamed {
int var16;
for (var13 = 0; var13 < menuOptionsCount; ++var13) {
var15 = var2 + (menuOptionsCount - 1 - var13) * 15 + 31;
var16 = 16777215;
var16 = 0xffffff;
if (var6 > var1 && var6 < var1 + var3 && var7 > var15 - 13 && var7 < var15 + 3) {
var16 = 16776960;
var16 = 0xffff00;
}
WorldMapIcon_1.fontBold12.draw(WorldMapLabel.method417(var13), var1 + 3, var15, var16, 0);
WorldMapIcon_1.fontBold12.draw(WorldMapLabel.getMenuText(var13), var1 + 3, var15, var16, 0);
}
var13 = class247.menuX;
@@ -3499,9 +3500,9 @@ public final class Client extends GameShell implements Usernamed {
if (gameDrawingMode == 3) {
for (var1 = 0; var1 < rootWidgetCount; ++var1) {
if (field862[var1]) {
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128);
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
} else if (field861[var1]) {
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128);
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
}
}
}
@@ -3512,21 +3513,23 @@ public final class Client extends GameShell implements Usernamed {
var4 = field718;
for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) {
if (var5.soundEffectId != -1 || var5.soundEffectIds != null) {
if (var5.soundEffectId == -1 && var5.soundEffectIds == null) {
continue;
}
var6 = 0;
if (var2 > var5.field1077 * 128) {
var6 += var2 - var5.field1077 * 128;
} else if (var2 < var5.field1083 * 16384) {
var6 += var5.field1083 * 16384 - var2;
} else if (var2 < var5.x * 16384) {
var6 += var5.x * 16384 - var2;
}
if (var3 > var5.field1082 * 128) {
var6 += var3 - var5.field1082 * 128;
} else if (var3 < var5.field1090 * 128) {
var6 += var5.field1090 * 128 - var3;
} else if (var3 < var5.y * 128) {
var6 += var5.y * 128 - var3;
}
if (var6 - 64 <= var5.field1091 && field892 != 0 && var1 == var5.field1078) {
if (var6 - 64 <= var5.field1091 && field892 != 0 && var1 == var5.plane) {
var6 -= 64;
if (var6 < 0) {
var6 = 0;
@@ -3582,7 +3585,6 @@ public final class Client extends GameShell implements Usernamed {
}
}
}
}
field718 = 0;
}
@@ -3673,7 +3675,7 @@ public final class Client extends GameShell implements Usernamed {
var6 = class80.getWidget(var16);
if (var47 != var6.isHidden) {
var6.isHidden = var47;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
var1.serverPacket = null;
@@ -3760,7 +3762,7 @@ public final class Client extends GameShell implements Usernamed {
var8.modelAngleX = var16;
var8.modelAngleY = var17;
var8.modelZoom = var5;
Strings.method4120(var8);
Strings.invalidateWidget(var8);
}
var1.serverPacket = null;
@@ -3805,7 +3807,7 @@ public final class Client extends GameShell implements Usernamed {
var19.modelAngleX = var43.xan2d;
var19.modelAngleY = var43.yan2d;
var19.modelZoom = var43.zoom2d * 100 / var17;
Strings.method4120(var19);
Strings.invalidateWidget(var19);
} else {
var19.itemId = var5;
var19.itemQuantity = var17;
@@ -3828,7 +3830,7 @@ public final class Client extends GameShell implements Usernamed {
var19.modelZoom = var19.modelZoom * 32 / var19.rawWidth;
}
Strings.method4120(var19);
Strings.invalidateWidget(var19);
}
var1.serverPacket = null;
@@ -3951,7 +3953,7 @@ public final class Client extends GameShell implements Usernamed {
if (var5 != var6.scrollY) {
var6.scrollY = var5;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
}
@@ -3997,7 +3999,7 @@ public final class Client extends GameShell implements Usernamed {
var53.itemIds[var17] = 0;
}
Strings.method4120(var53);
Strings.invalidateWidget(var53);
var1.serverPacket = null;
return true;
}
@@ -4065,7 +4067,7 @@ public final class Client extends GameShell implements Usernamed {
var6.sequenceId = var16;
var6.modelFrame = 0;
var6.modelFrameCycle = 0;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
var1.serverPacket = null;
@@ -4302,9 +4304,9 @@ public final class Client extends GameShell implements Usernamed {
class197.closeInterface(var54, true);
}
if (field850 != null) {
Strings.method4120(field850);
field850 = null;
if (meslayerContinueWidget != null) {
Strings.invalidateWidget(meslayerContinueWidget);
meslayerContinueWidget = null;
}
var1.serverPacket = null;
@@ -4346,7 +4348,7 @@ public final class Client extends GameShell implements Usernamed {
if (var6.modelType != 2 || var16 != var6.modelId) {
var6.modelType = 2;
var6.modelId = var16;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
var1.serverPacket = null;
@@ -4363,7 +4365,7 @@ public final class Client extends GameShell implements Usernamed {
var19.rawY = var5;
var19.xAlignment = 0;
var19.yAlignment = 0;
Strings.method4120(var19);
Strings.invalidateWidget(var19);
this.alignWidget(var19);
if (var19.type == 0) {
WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var19, false);
@@ -4472,7 +4474,7 @@ public final class Client extends GameShell implements Usernamed {
var53 = class80.getWidget(var16);
var53.modelType = 3;
var53.modelId = localPlayer.appearance.getChatHeadId();
Strings.method4120(var53);
Strings.invalidateWidget(var53);
var1.serverPacket = null;
return true;
}
@@ -4654,7 +4656,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var6 != null) {
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
class65.method1176();
@@ -4699,7 +4701,7 @@ public final class Client extends GameShell implements Usernamed {
var6 = class80.getWidget(var16);
if (!var18.equals(var6.text)) {
var6.text = var18;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
var1.serverPacket = null;
@@ -4754,7 +4756,7 @@ public final class Client extends GameShell implements Usernamed {
Widget var28 = class80.getWidget(var16);
if (var9 != var28.color) {
var28.color = var9;
Strings.method4120(var28);
Strings.invalidateWidget(var28);
}
var1.serverPacket = null;
@@ -4793,12 +4795,12 @@ public final class Client extends GameShell implements Usernamed {
var8 = class80.getWidget(var5);
if (var8 != null) {
Strings.method4120(var8);
Strings.invalidateWidget(var8);
}
var8 = class80.getWidget(var16);
if (var8 != null) {
Strings.method4120(var8);
Strings.invalidateWidget(var8);
WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true);
}
@@ -4881,7 +4883,7 @@ public final class Client extends GameShell implements Usernamed {
if (var6.modelType != 1 || var5 != var6.modelId) {
var6.modelType = 1;
var6.modelId = var5;
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
var1.serverPacket = null;
@@ -4919,7 +4921,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (var6 != null) {
Strings.method4120(var6);
Strings.invalidateWidget(var6);
}
class65.method1176();
@@ -5102,7 +5104,7 @@ public final class Client extends GameShell implements Usernamed {
field874 = false;
itemDragDuration = 0;
if (WorldMapIcon_0.dragInventoryWidget != null) {
Strings.method4120(WorldMapIcon_0.dragInventoryWidget);
Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget);
}
WorldMapIcon_0.dragInventoryWidget = class80.getWidget(var5);
@@ -5113,7 +5115,7 @@ public final class Client extends GameShell implements Usernamed {
Decimator.method2510(var2);
}
Strings.method4120(WorldMapIcon_0.dragInventoryWidget);
Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget);
return;
}
@@ -5151,7 +5153,7 @@ public final class Client extends GameShell implements Usernamed {
)
@Export("resizeRoot")
final void resizeRoot(boolean var1) {
WorldMapSprite.method416(rootInterface, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, var1);
WorldMapSprite.resizeComponents(rootInterface, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, var1);
}
@ObfuscatedName("iw")
@@ -5182,7 +5184,7 @@ public final class Client extends GameShell implements Usernamed {
garbageValue = "41"
)
final void method1641() {
Strings.method4120(clickedWidget);
Strings.invalidateWidget(clickedWidget);
++class80.widgetDragDuration;
if (field745 && field873) {
int var1 = MouseHandler.MouseHandler_x;
@@ -806,7 +806,7 @@ public class ClientPacket implements ClientPacketMarker
var29 = 16;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = ViewportMouse.getObjectDefinition(class43.method770(var30)).int2;
var29 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var30)).int2;
}
if (var9.animationId == -1 && var9.transforms == null) {
@@ -820,7 +820,7 @@ public class ClientPacket implements ClientPacketMarker
var29 = 8;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = ViewportMouse.getObjectDefinition(class43.method770(var30)).int2 / 2;
var29 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var30)).int2 / 2;
}
if (var9.animationId == -1 && var9.transforms == null) {
@@ -843,7 +843,7 @@ public class ClientPacket implements ClientPacketMarker
var29 = 8;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = ViewportMouse.getObjectDefinition(class43.method770(var30)).int2 / 2;
var29 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var30)).int2 / 2;
}
int var28 = var5 + 2 & 3;
+1 -1
View File
@@ -30,7 +30,7 @@ public abstract class Clock {
garbageValue = "-333181863"
)
@Export("wait")
public abstract int wait(int var1, int var2);
public abstract int wait(int tickLength, int fiveOrOne);
@ObfuscatedName("fx")
@ObfuscatedSignature(
@@ -62,7 +62,7 @@ public class CollisionMap {
if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
this.flags[var1][var2] = 16777216;
} else {
this.flags[var1][var2] = 16777215;
this.flags[var1][var2] = 0xffffff;
}
}
}
+77 -69
View File
@@ -30,7 +30,9 @@ public class Decimator {
int[][] table;
public Decimator(int var1, int var2) {
if (var2 != var1) {
if (var2 == var1) {
return;
}
int var3 = FriendSystem.method1819(var1, var2);
var1 /= var3;
var2 /= var3;
@@ -64,7 +66,6 @@ public class Decimator {
}
}
}
@ObfuscatedName("q")
@ObfuscatedSignature(
@@ -73,7 +74,9 @@ public class Decimator {
)
@Export("resample")
byte[] resample(byte[] var1) {
if (this.table != null) {
if (this.table == null) {
return var1;
}
int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14;
int[] var3 = new int[var2];
int var4 = 0;
@@ -107,7 +110,6 @@ public class Decimator {
var1[var6] = (byte)var10;
}
}
}
return var1;
}
@@ -175,7 +177,9 @@ public class Decimator {
)
@Export("drawActor2d")
static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
if (var0 != null && var0.isVisible()) {
if (var0 == null || !var0.isVisible()) {
return;
}
if (var0 instanceof NPC) {
NPCDefinition var6 = ((NPC)var0).definition;
if (var6.transforms != null) {
@@ -194,28 +198,28 @@ public class Decimator {
if (var1 < var75 && var0.playerCycle == Client.cycle) {
var10 = (Player)var0;
boolean var9;
if (Client.field774 == 0) {
if (Client.drawPlayerNames == 0) {
var9 = false;
} else {
boolean var78;
if (var10 != Client.localPlayer) {
var78 = (Client.field774 & 4) != 0;
var78 = (Client.drawPlayerNames & 4) != 0;
boolean var79 = var78;
boolean var13;
if (!var78) {
var13 = (Client.field774 & 1) != 0;
var13 = (Client.drawPlayerNames & 1) != 0;
var79 = var13 && var10.isFriend();
}
var13 = var79;
if (!var79) {
boolean var80 = (Client.field774 & 2) != 0;
boolean var80 = (Client.drawPlayerNames & 2) != 0;
var13 = var80 && var10.isClanMember();
}
var9 = var13;
} else {
var78 = (Client.field774 & 8) != 0;
var78 = (Client.drawPlayerNames & 8) != 0;
var9 = var78;
}
}
@@ -226,7 +230,7 @@ public class Decimator {
class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
byte var92 = 9;
var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0);
var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 0xffffff, 0);
var8 = 18;
}
}
@@ -245,7 +249,9 @@ public class Decimator {
if (var88.isEmpty()) {
var88.remove();
}
} else {
continue;
}
HealthBarDefinition var91 = var88.definition;
Sprite var76 = var91.getBackSprite();
Sprite var14 = var91.getFrontSprite();
@@ -282,7 +288,19 @@ public class Decimator {
var93 = 1;
}
if (var76 != null && var14 != null) {
if (var76 == null || var14 == null) {
var87 += 5;
if (Client.viewportTempX > -1) {
var21 = var2 + Client.viewportTempX - (var15 >> 1);
var22 = var3 + Client.viewportTempY - var87;
Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00);
Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000);
}
var87 += 2;
continue;
}
if (var93 == var15) {
var93 += var16 * 2;
} else {
@@ -295,29 +313,17 @@ public class Decimator {
var23 = var3 + Client.viewportTempY - var87;
var22 -= var16;
if (var17 >= 0 && var17 < 255) {
var76.method6129(var22, var23, var17);
var76.drawTransAt(var22, var23, var17);
Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
var14.method6129(var22, var23, var17);
var14.drawTransAt(var22, var23, var17);
} else {
var76.drawAt2(var22, var23);
var76.drawTransBgAt(var22, var23);
Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
var14.drawAt2(var22, var23);
var14.drawTransBgAt(var22, var23);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
var87 += 2;
} else {
var87 += 5;
if (Client.viewportTempX > -1) {
var21 = var2 + Client.viewportTempX - (var15 >> 1);
var22 = var3 + Client.viewportTempY - var87;
Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 65280);
Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 16711680);
}
var87 += 2;
}
}
}
}
@@ -337,12 +343,12 @@ public class Decimator {
if (Client.viewportTempX > -1) {
if (var10.headIconPk != -1) {
var87 += 25;
UserComparator3.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
UserComparator3.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
}
if (var10.headIconPrayer != -1) {
var87 += 25;
SoundCache.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
SoundCache.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
}
}
}
@@ -351,7 +357,7 @@ public class Decimator {
class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
var87 += class173.headIconHintSprites[1].subHeight;
class173.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
class173.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
}
}
} else {
@@ -363,14 +369,14 @@ public class Decimator {
if (var90.headIconPrayer >= 0 && var90.headIconPrayer < SoundCache.headIconPrayerSprites.length) {
class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
SoundCache.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
SoundCache.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
}
}
if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
class173.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
class173.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
}
}
}
@@ -422,12 +428,17 @@ public class Decimator {
}
}
if (var96 - var98 <= Client.cycle) {
if (var96 - var98 > Client.cycle) {
continue;
}
if (var95 == null) {
var0.hitSplatCycles[var77] = -1;
} else {
continue;
}
class219.getActorScreenLocation(var0, var0.defaultHeight / 2);
if (Client.viewportTempX > -1) {
if (Client.viewportTempX <= -1) {
continue;
}
if (var77 == 1) {
Client.viewportTempY -= 20;
}
@@ -476,7 +487,7 @@ public class Decimator {
var42 = var43;
}
var26 = var82.yOffset;
var26 = var82.xOffset;
}
var83 = var95.method4557();
@@ -487,7 +498,7 @@ public class Decimator {
var42 = var43;
}
var27 = var83.yOffset;
var27 = var83.xOffset;
}
var84 = var95.method4558();
@@ -498,7 +509,7 @@ public class Decimator {
var42 = var43;
}
var28 = var84.yOffset;
var28 = var84.xOffset;
}
var85 = var95.method4583();
@@ -509,7 +520,7 @@ public class Decimator {
var42 = var43;
}
var29 = var85.yOffset;
var29 = var85.xOffset;
}
if (var81 != null) {
@@ -521,7 +532,7 @@ public class Decimator {
var42 = var43;
}
var38 = var30.yOffset;
var38 = var30.xOffset;
}
var31 = var81.method4557();
@@ -532,7 +543,7 @@ public class Decimator {
var42 = var43;
}
var39 = var31.yOffset;
var39 = var31.xOffset;
}
var32 = var81.method4558();
@@ -543,7 +554,7 @@ public class Decimator {
var42 = var43;
}
var40 = var32.yOffset;
var40 = var32.xOffset;
}
var33 = var81.method4583();
@@ -554,7 +565,7 @@ public class Decimator {
var42 = var43;
}
var41 = var33.yOffset;
var41 = var33.xOffset;
}
}
@@ -706,94 +717,91 @@ public class Decimator {
if (var73 >= 0 && var73 < 255) {
if (var82 != null) {
var82.method6129(var65 + var52 - var26, var66, var73);
var82.drawTransAt(var65 + var52 - var26, var66, var73);
}
if (var84 != null) {
var84.method6129(var65 + var53 - var28, var66, var73);
var84.drawTransAt(var65 + var53 - var28, var66, var73);
}
if (var83 != null) {
for (var74 = 0; var74 < var49; ++var74) {
var83.method6129(var23 * var74 + (var54 + var65 - var27), var66, var73);
var83.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73);
}
}
if (var85 != null) {
var85.method6129(var56 + var65 - var29, var66, var73);
var85.drawTransAt(var56 + var65 - var29, var66, var73);
}
var86.drawAlpha(var45, var55 + var65, var69, var95.field3333, 0, var73);
if (var81 != null) {
if (var30 != null) {
var30.method6129(var65 + var57 - var38, var66, var73);
var30.drawTransAt(var65 + var57 - var38, var66, var73);
}
if (var32 != null) {
var32.method6129(var65 + var58 - var40, var66, var73);
var32.drawTransAt(var65 + var58 - var40, var66, var73);
}
if (var31 != null) {
for (var74 = 0; var74 < var50; ++var74) {
var31.method6129(var74 * var35 + (var65 + var59 - var39), var66, var73);
var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73);
}
}
if (var33 != null) {
var33.method6129(var60 + var65 - var41, var66, var73);
var33.drawTransAt(var60 + var65 - var41, var66, var73);
}
var44.drawAlpha(var46, var65 + var61, var72, var81.field3333, 0, var73);
}
} else {
if (var82 != null) {
var82.drawAt2(var52 + var65 - var26, var66);
var82.drawTransBgAt(var52 + var65 - var26, var66);
}
if (var84 != null) {
var84.drawAt2(var53 + var65 - var28, var66);
var84.drawTransBgAt(var53 + var65 - var28, var66);
}
if (var83 != null) {
for (var74 = 0; var74 < var49; ++var74) {
var83.drawAt2(var74 * var23 + (var65 + var54 - var27), var66);
var83.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66);
}
}
if (var85 != null) {
var85.drawAt2(var65 + var56 - var29, var66);
var85.drawTransBgAt(var65 + var56 - var29, var66);
}
var86.draw(var45, var65 + var55, var69, var95.field3333 | -16777216, 0);
if (var81 != null) {
var86.draw(var45, var65 + var55, var69, var95.field3333 | 0xff000000, 0);
if (var81 == null) {
continue;
}
if (var30 != null) {
var30.drawAt2(var57 + var65 - var38, var66);
var30.drawTransBgAt(var57 + var65 - var38, var66);
}
if (var32 != null) {
var32.drawAt2(var58 + var65 - var40, var66);
var32.drawTransBgAt(var58 + var65 - var40, var66);
}
if (var31 != null) {
for (var74 = 0; var74 < var50; ++var74) {
var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66);
var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66);
}
}
if (var33 != null) {
var33.drawAt2(var60 + var65 - var41, var66);
var33.drawTransBgAt(var60 + var65 - var41, var66);
}
var44.draw(var46, var61 + var65, var72, var81.field3333 | -16777216, 0);
}
}
}
}
var44.draw(var46, var61 + var65, var72, var81.field3333 | 0xff000000, 0);
}
}
}
}
@ObfuscatedName("je")
@ObfuscatedSignature(
@@ -98,7 +98,7 @@ public class DevicePcmPlayer extends PcmPlayer {
for (int var2 = 0; var2 < var1; ++var2) {
int var3 = super.samples[var2];
if ((var3 + 8388608 & -16777216) != 0) {
if ((var3 + 8388608 & 0xff000000) != 0) {
var3 = 8388607 ^ var3 >> 31;
}
@@ -96,7 +96,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
int var12;
if (0L != var7) {
var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var2, var3, var7);
int var14 = class43.method770(var7);
int var14 = class43.getObjectIdFromTag(var7);
int var15 = var12 & 31;
int var16 = var12 >> 6 & 3;
ObjectDefinition var13;
@@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("DynamicObject")
public class DynamicObject extends Entity {
@ObfuscatedName("x")
static int[] field1301;
static int[] Tiles_hueMultiplier;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -982722193
@@ -133,9 +133,18 @@ public class EnumDefinition extends DualNode {
}
@ObfuscatedName("q")
public static final void method4550(long var0) {
if (var0 > 0L) {
if (0L == var0 % 10L) {
@Export("sleepMillis")
public static final void sleepMillis(long var0) {
if (var0 <= 0L) {
return;
}
if (0L != var0 % 10L) {
try {
Thread.sleep(var0);
} catch (InterruptedException var6) {
}
return;
}
long var2 = var0 - 1L;
try {
@@ -147,15 +156,8 @@ public class EnumDefinition extends DualNode {
Thread.sleep(1L);
} catch (InterruptedException var7) {
}
} else {
try {
Thread.sleep(var0);
} catch (InterruptedException var6) {
}
}
}
}
@ObfuscatedName("ar")
@ObfuscatedSignature(
@@ -43,8 +43,8 @@ public class FaceNormal {
signature = "(Lhp;Lhp;B)V",
garbageValue = "-92"
)
@Export("setNpcDefinitionArchives")
public static void setNpcDefinitionArchives(AbstractArchive var0, AbstractArchive var1) {
@Export("NpcDefinition_setArchives")
public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
NPCDefinition.NpcDefinition_archive = var0;
NPCDefinition.NpcDefinition_modelArchive = var1;
}
@@ -80,8 +80,8 @@ public class FaceNormal {
static void method3264() {
Client.mouseLastLastPressedTimeMillis = 1L;
class40.mouseRecorder.index = 0;
class267.field3557 = true;
Client.field667 = true;
class267.hasFocus = true;
Client.hadFocus = true;
Client.field879 = -1L;
class192.method3678();
Client.packetWriter.method2218();
@@ -158,7 +158,7 @@ public class FaceNormal {
Client.followerIndex = -1;
if (Client.rootInterface != -1) {
var0 = Client.rootInterface;
if (var0 != -1 && ViewportMouse.loadedInterfaces[var0]) {
if (var0 != -1 && ViewportMouse.Widget_loadedInterfaces[var0]) {
Widget.Widget_archive.clearFilesGroup(var0);
if (Widget.Widget_interfaceComponents[var0] != null) {
boolean var5 = true;
@@ -177,7 +177,7 @@ public class FaceNormal {
Widget.Widget_interfaceComponents[var0] = null;
}
ViewportMouse.loadedInterfaces[var0] = false;
ViewportMouse.Widget_loadedInterfaces[var0] = false;
}
}
}
@@ -188,7 +188,7 @@ public class FaceNormal {
Client.rootInterface = -1;
Client.interfaceParents = new NodeHashTable(8);
Client.field850 = null;
Client.meslayerContinueWidget = null;
Strings.method4121();
Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
+46 -38
View File
@@ -204,7 +204,10 @@ public class FontName {
for (int var9 = 0; var9 < var0.length; ++var9) {
Widget var10 = var0[var9];
if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
if (var10 == null || (var10.parentId != var1 && (var1 != -1412584499 || var10 != Client.clickedWidget))) {
continue;
}
int var11;
if (var8 == -1) {
Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
@@ -218,7 +221,10 @@ public class FontName {
var10.rootIndex = var11;
var10.cycle = Client.cycle;
if (!var10.isIf3 || !ScriptEvent.isComponentHidden(var10)) {
if (var10.isIf3 && ScriptEvent.isComponentHidden(var10)) {
continue;
}
if (var10.contentType > 0) {
GrandExchangeOfferTotalQuantityComparator.method85(var10);
}
@@ -229,7 +235,7 @@ public class FontName {
int var15;
int var16;
if (var10 == Client.clickedWidget) {
if (var1 != -1412584499 && !var10.isScrollBar) {
if (var1 != 0xabcdabcd && !var10.isScrollBar) {
WorldMapIcon_1.field188 = var0;
WorldMapDecorationType.field2742 = var6;
ClientPacket.field2305 = var7;
@@ -307,18 +313,20 @@ public class FontName {
var18 = var20 < var5 ? var20 : var5;
}
if (!var10.isIf3 || var15 < var17 && var16 < var18) {
if (var10.isIf3 && (var15 >= var17 || var16 >= var18)) {
continue;
}
if (var10.contentType != 0) {
if (var10.contentType == 1336) {
if (Client.displayFps) {
var13 += 15;
class169.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
class169.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 0xffff00, -1);
var13 += 15;
Runtime var42 = Runtime.getRuntime();
var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L);
var21 = 16776960;
var21 = 0xffff00;
if (var20 > 327680 && !Client.isLowDetail) {
var21 = 16711680;
var21 = 0xff0000;
}
class169.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
@@ -328,8 +336,8 @@ public class FontName {
}
if (var10.contentType == 1337) {
Client.field803 = var12;
Client.field804 = var13;
Client.viewportX = var12;
Client.viewportY = var13;
class4.drawEntities(var12, var13, var10.width, var10.height);
Client.field843[var10.rootIndex] = true;
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
@@ -390,12 +398,17 @@ public class FontName {
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
}
if (Client.isResizable || Client.field862[var11] || Client.gameDrawingMode > 1) {
if (!Client.isResizable && !Client.field862[var11] && Client.gameDrawingMode <= 1) {
continue;
}
if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
NetFileRequest.method4139(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
}
if (var10.type != 1) {
if (var10.type == 1) {
continue;
}
int var23;
int var24;
int var25;
@@ -416,9 +429,9 @@ public class FontName {
if (var10.inventorySprites != null && var19 < 20) {
Sprite var46 = var10.getInventorySprite(var19);
if (var46 != null) {
var46.drawAt2(var22, var23);
var46.drawTransBgAt(var22, var23);
} else if (Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
}
} else {
@@ -450,7 +463,7 @@ public class FontName {
var25 = 0;
}
var27.method6129(var24 + var22, var25 + var23, 128);
var27.drawTransAt(var24 + var22, var25 + var23, 128);
if (var1 != -1) {
Widget var28 = var0[var1 & 65535];
int var29;
@@ -466,7 +479,7 @@ public class FontName {
var28.scrollY -= var29;
Client.field763 += var29;
Strings.method4120(var28);
Strings.invalidateWidget(var28);
}
if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
@@ -481,16 +494,16 @@ public class FontName {
var28.scrollY += var29;
Client.field763 -= var29;
Strings.method4120(var28);
Strings.invalidateWidget(var28);
}
}
} else if (var10 == ItemContainer.field549 && var19 == Client.field698) {
var27.method6129(var22, var23, 128);
var27.drawTransAt(var22, var23, 128);
} else {
var27.drawAt2(var22, var23);
var27.drawTransBgAt(var22, var23);
}
} else {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
}
}
@@ -537,7 +550,7 @@ public class FontName {
var39 = var10.getFont();
if (var39 == null) {
if (Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
} else {
String var44 = var10.text;
@@ -569,7 +582,7 @@ public class FontName {
}
}
if (var10 == Client.field850) {
if (var10 == Client.meslayerContinueWidget) {
var44 = "Please wait...";
var20 = var10.color;
}
@@ -585,9 +598,9 @@ public class FontName {
if (!var10.isIf3) {
var40 = var10.getSprite(ChatChannel.runCs1(var10));
if (var40 != null) {
var40.drawAt2(var12, var13);
var40.drawTransBgAt(var12, var13);
} else if (Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
} else {
if (var10.itemId != -1) {
@@ -598,7 +611,7 @@ public class FontName {
if (var40 == null) {
if (Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
} else {
var20 = var40.width;
@@ -608,11 +621,11 @@ public class FontName {
if (var10.spriteAngle != 0) {
var40.method6186(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
} else if (var14 != 0) {
var40.method6131(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
} else if (var20 == var10.width && var21 == var10.height) {
var40.drawAt2(var12, var13);
var40.drawTransBgAt(var12, var13);
} else {
var40.method6125(var12, var13, var10.width, var10.height);
var40.drawScaledAt(var12, var13, var10.width, var10.height);
}
} else {
Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
@@ -624,9 +637,9 @@ public class FontName {
if (var10.spriteAngle != 0) {
var40.method6186(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
} else if (var14 != 0) {
var40.method6129(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255));
var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255));
} else {
var40.drawAt2(var12 + var24 * var20, var13 + var21 * var25);
var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25);
}
}
}
@@ -656,7 +669,7 @@ public class FontName {
var41.calculateBoundsCylinder();
var22 = var41.height / 2;
} else {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
}
} else if (var10.modelType == 5) {
@@ -668,13 +681,13 @@ public class FontName {
} else if (var20 == -1) {
var41 = var10.getModel((SequenceDefinition)null, -1, var36, Client.localPlayer.appearance);
if (var41 == null && Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
} else {
SequenceDefinition var47 = GrandExchangeEvent.getSequenceDefinition(var20);
var41 = var10.getModel(var47, var10.modelFrame, var36, Client.localPlayer.appearance);
if (var41 == null && Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
}
@@ -700,7 +713,7 @@ public class FontName {
var39 = var10.getFont();
if (var39 == null) {
if (Widget.field2562) {
Strings.method4120(var10);
Strings.invalidateWidget(var10);
}
continue;
}
@@ -815,11 +828,6 @@ public class FontName {
}
}
}
}
}
}
}
}
}
@@ -84,7 +84,8 @@ public class FriendSystem {
signature = "(B)V",
garbageValue = "9"
)
final void method1762() {
@Export("processFriendUpdates")
final void processFriendUpdates() {
for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
if ((long)var1.field3661 < DirectByteArrayCopier.currentTimeMs() / 1000L - 5L) {
if (var1.world > 0) {
@@ -342,7 +343,7 @@ public class FriendSystem {
garbageValue = "-77884497"
)
public static int method1784(int var0) {
return class43.method770(ViewportMouse.ViewportMouse_entityTags[var0]);
return class43.getObjectIdFromTag(ViewportMouse.ViewportMouse_entityTags[var0]);
}
@ObfuscatedName("ag")
+21 -19
View File
@@ -62,12 +62,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@ObfuscatedGetter(
intValue = 798302801
)
static int field448;
@Export("cycleDurationMillis")
static int cycleDurationMillis;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 369880599
)
static int field443;
static int fiveOrOne;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1519220993
@@ -90,8 +91,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
)
static int field465;
@ObfuscatedName("au")
@Export("hasFocus")
static volatile boolean hasFocus;
@Export("volatileFocus")
static volatile boolean volatileFocus;
@ObfuscatedName("ah")
@ObfuscatedGetter(
longValue = -5454616642198733289L
@@ -190,13 +191,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
field466 = 0;
stopTimeMs = 0L;
isKilled = false;
field448 = 20;
field443 = 1;
cycleDurationMillis = 20;
fiveOrOne = 1;
fps = 0;
field452 = new long[32];
field453 = new long[32];
field465 = 500;
hasFocus = true;
volatileFocus = true;
garbageCollectorLastCollectionTime = -1L;
garbageCollectorLastCheckTimeMs = -1L;
}
@@ -243,9 +244,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
)
@Export("post")
final void post(Object var1) {
if (this.eventQueue != null) {
if (this.eventQueue == null) {
return;
}
for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) {
EnumDefinition.method4550(1L);
EnumDefinition.sleepMillis(1L);
}
if (var1 != null) {
@@ -253,7 +256,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
}
}
@ObfuscatedName("k")
@ObfuscatedSignature(
@@ -444,7 +446,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
var2.removeMouseListener(MouseHandler.MouseHandler_instance);
var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
var2.removeFocusListener(MouseHandler.MouseHandler_instance);
MouseHandler.MouseHandler_currentButton0 = 0;
MouseHandler.MouseHandler_currentButtonVolatile = 0;
if (this.mouseWheelHandler != null) {
this.mouseWheelHandler.removeFrom(this.canvas);
}
@@ -587,7 +589,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
synchronized(this) {
class267.field3557 = hasFocus;
class267.hasFocus = volatileFocus;
}
this.doCycle();
@@ -876,7 +878,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final void destroy() {
if (this == gameShell && !isKilled) {
stopTimeMs = DirectByteArrayCopier.currentTimeMs();
EnumDefinition.method4550(5000L);
EnumDefinition.sleepMillis(5000L);
this.kill();
}
}
@@ -894,7 +896,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (var2.startsWith("1.6.0_")) {
int var3;
for (var3 = 6; var3 < var2.length() && class49.isCharDigit(var2.charAt(var3)); ++var3) {
for (var3 = 6; var3 < var2.length() && class49.isDigit(var2.charAt(var3)); ++var3) {
}
String var4 = var2.substring(6, var3);
@@ -904,17 +906,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
}
field443 = 5;
fiveOrOne = 5;
}
}
this.setFocusCycleRoot(true);
this.addCanvas();
this.setUp();
clock = class173.method3589();
clock = class173.newClock();
while (0L == stopTimeMs || DirectByteArrayCopier.currentTimeMs() < stopTimeMs) {
field449 = clock.wait(field448, field443);
field449 = clock.wait(cycleDurationMillis, fiveOrOne);
for (int var5 = 0; var5 < field449; ++var5) {
this.method953();
@@ -951,12 +953,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
public final void focusGained(FocusEvent var1) {
hasFocus = true;
volatileFocus = true;
this.field464 = true;
}
public final void focusLost(FocusEvent var1) {
hasFocus = false;
volatileFocus = false;
}
public final void windowActivated(WindowEvent var1) {
@@ -122,9 +122,9 @@ public class GrandExchangeEvent {
}
}
if (Client.field850 != null) {
Strings.method4120(Client.field850);
Client.field850 = null;
if (Client.meslayerContinueWidget != null) {
Strings.invalidateWidget(Client.meslayerContinueWidget);
Client.meslayerContinueWidget = null;
}
}
@@ -92,7 +92,8 @@ public class GrandExchangeEvents {
signature = "(Lhp;Lhp;B)V",
garbageValue = "-127"
)
public static void method66(AbstractArchive var0, AbstractArchive var1) {
@Export("KitDefinition_setArchives")
public static void KitDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
KitDefinition.KitDefinition_archive = var0;
class288.KitDefinition_modelsArchive = var1;
KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3);
@@ -103,7 +104,8 @@ public class GrandExchangeEvents {
signature = "(Lhp;B)V",
garbageValue = "1"
)
public static void method68(AbstractArchive var0) {
@Export("VarpDefinition_setArchives")
public static void VarpDefinition_setArchives(AbstractArchive var0) {
VarpDefinition.VarpDefinition_archive = var0;
VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16);
}
@@ -186,10 +188,10 @@ public class GrandExchangeEvents {
}
for (var11 = 0; var11 < 104; ++var11) {
ServerBuild.field3103[var11] = 0;
Tiles.field508[var11] = 0;
Tiles.field507[var11] = 0;
DynamicObject.field1301[var11] = 0;
ServerBuild.Tiles_hue[var11] = 0;
Tiles.Tiles_saturation[var11] = 0;
Tiles.Tiles_lightness[var11] = 0;
DynamicObject.Tiles_hueMultiplier[var11] = 0;
Fonts.field3689[var11] = 0;
}
@@ -200,14 +202,14 @@ public class GrandExchangeEvents {
if (var13 >= 0 && var13 < 104) {
var14 = Tiles.field504[var2][var13][var12] & 255;
if (var14 > 0) {
FloorUnderlayDefinition var45 = ItemContainer.method1117(var14 - 1);
var10000 = ServerBuild.field3103;
FloorUnderlayDefinition var45 = ItemContainer.FloorUnderlayDefinition_get(var14 - 1);
var10000 = ServerBuild.Tiles_hue;
var10000[var12] += var45.hue;
var10000 = Tiles.field508;
var10000 = Tiles.Tiles_saturation;
var10000[var12] += var45.saturation;
var10000 = Tiles.field507;
var10000 = Tiles.Tiles_lightness;
var10000[var12] += var45.lightness;
var10000 = DynamicObject.field1301;
var10000 = DynamicObject.Tiles_hueMultiplier;
var10000[var12] += var45.hueMultiplier;
var10002 = Fonts.field3689[var12]++;
}
@@ -234,13 +236,13 @@ public class GrandExchangeEvents {
var47 = var46;
}
var10000 = ServerBuild.field3103;
var10000 = ServerBuild.Tiles_hue;
var10000[var12] -= var47.hue;
var10000 = Tiles.field508;
var10000 = Tiles.Tiles_saturation;
var10000[var12] -= var47.saturation;
var10000 = Tiles.field507;
var10000 = Tiles.Tiles_lightness;
var10000[var12] -= var47.lightness;
var10000 = DynamicObject.field1301;
var10000 = DynamicObject.Tiles_hueMultiplier;
var10000[var12] -= var47.hueMultiplier;
var10002 = Fonts.field3689[var12]--;
}
@@ -257,19 +259,19 @@ public class GrandExchangeEvents {
for (var17 = -5; var17 < 109; ++var17) {
var18 = var17 + 5;
if (var18 >= 0 && var18 < 104) {
var12 += ServerBuild.field3103[var18];
var13 += Tiles.field508[var18];
var14 += Tiles.field507[var18];
var15 += DynamicObject.field1301[var18];
var12 += ServerBuild.Tiles_hue[var18];
var13 += Tiles.Tiles_saturation[var18];
var14 += Tiles.Tiles_lightness[var18];
var15 += DynamicObject.Tiles_hueMultiplier[var18];
var16 += Fonts.field3689[var18];
}
var19 = var17 - 5;
if (var19 >= 0 && var19 < 104) {
var12 -= ServerBuild.field3103[var19];
var13 -= Tiles.field508[var19];
var14 -= Tiles.field507[var19];
var15 -= DynamicObject.field1301[var19];
var12 -= ServerBuild.Tiles_hue[var19];
var13 -= Tiles.Tiles_saturation[var19];
var14 -= Tiles.Tiles_lightness[var19];
var15 -= DynamicObject.Tiles_hueMultiplier[var19];
var16 -= Fonts.field3689[var19];
}
@@ -380,7 +382,7 @@ public class GrandExchangeEvents {
if (var51 >= 0) {
var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var51);
var39 = -1;
} else if (var35.primaryRgb == 16711935) {
} else if (var35.primaryRgb == 0xff00ff) {
var39 = -2;
var51 = -1;
var40 = -2;
@@ -631,10 +633,10 @@ public class GrandExchangeEvents {
if (MouseHandler.MouseHandler_currentButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
var0.scrollY -= 4;
Strings.method4120(var0);
Strings.invalidateWidget(var0);
} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
var0.scrollY += 4;
Strings.method4120(var0);
Strings.invalidateWidget(var0);
} else if (var5 >= var1 - Client.field882 && var5 < Client.field882 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
var7 = var3 * (var3 - 32) / var4;
if (var7 < 8) {
@@ -644,7 +646,7 @@ public class GrandExchangeEvents {
int var8 = var6 - var2 - 16 - var7 / 2;
int var9 = var3 - 32 - var7;
var0.scrollY = var8 * (var4 - var3) / var9;
Strings.method4120(var0);
Strings.invalidateWidget(var0);
Client.field719 = true;
}
}
@@ -653,7 +655,7 @@ public class GrandExchangeEvents {
var7 = var0.width;
if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
var0.scrollY += Client.mouseWheelRotation * 45;
Strings.method4120(var0);
Strings.invalidateWidget(var0);
}
}
@@ -524,7 +524,7 @@ public class GrandExchangeOffer {
WorldMapElement var6;
if (var0 == ScriptOpcodes.MEC_TEXT) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
var6 = class222.WorldMapElement_get(var3);
if (var6.name == null) {
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
} else {
@@ -535,13 +535,13 @@ public class GrandExchangeOffer {
}
if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
var6 = class222.WorldMapElement_get(var3);
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize;
return 1;
}
if (var0 == ScriptOpcodes.MEC_CATEGORY) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
var6 = class222.WorldMapElement_get(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
@@ -552,7 +552,7 @@ public class GrandExchangeOffer {
}
if (var0 == ScriptOpcodes.MEC_SPRITE) {
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var6 = class222.getWorldMapElement(var3);
var6 = class222.WorldMapElement_get(var3);
if (var6 == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
@@ -195,16 +195,16 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
if (var1 == 324) {
Client.playerAppearance.method4006(false);
Client.playerAppearance.changeSex(false);
}
if (var1 == 325) {
Client.playerAppearance.method4006(true);
Client.playerAppearance.changeSex(true);
}
if (var1 == 326) {
PacketBufferNode var4 = Archive.method4265(ClientPacket.field2215, Client.packetWriter.isaacCipher);
Client.playerAppearance.method3995(var4.packetBuffer);
Client.playerAppearance.write(var4.packetBuffer);
Client.packetWriter.method2219(var4);
return true;
}
@@ -87,16 +87,18 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
signature = "(IIIIIILer;Lfv;S)V",
garbageValue = "-19782"
)
static final void method1236(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
if (var0 < Tiles.Tiles_minPlane) {
Tiles.Tiles_minPlane = var0;
static final void method1236(int plane, int x, int y, int objectID, int rotation, int objectType, Scene var6, CollisionMap var7) {
if (Client.isLowDetail && (Tiles.Tiles_renderFlags[0][x][y] & 2) == 0 && (Tiles.Tiles_renderFlags[plane][x][y] & 16) != 0) {
return;
}
if (plane < Tiles.Tiles_minPlane) {
Tiles.Tiles_minPlane = plane;
}
ObjectDefinition var8 = ViewportMouse.getObjectDefinition(var3);
ObjectDefinition var8 = ViewportMouse.getObjectDefinition(objectID);
int var9;
int var10;
if (var4 != 1 && var4 != 3) {
if (rotation != 1 && rotation != 3) {
var9 = var8.sizeX;
var10 = var8.sizeY;
} else {
@@ -106,323 +108,64 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
int var11;
int var12;
if (var9 + var1 <= 104) {
var11 = (var9 >> 1) + var1;
var12 = (var9 + 1 >> 1) + var1;
if (var9 + x <= 104) {
var11 = (var9 >> 1) + x;
var12 = (var9 + 1 >> 1) + x;
} else {
var11 = var1;
var12 = var1 + 1;
var11 = x;
var12 = x + 1;
}
int var13;
int var14;
if (var10 + var2 <= 104) {
var13 = (var10 >> 1) + var2;
var14 = var2 + (var10 + 1 >> 1);
if (var10 + y <= 104) {
var13 = (var10 >> 1) + y;
var14 = y + (var10 + 1 >> 1);
} else {
var13 = var2;
var14 = var2 + 1;
var13 = y;
var14 = y + 1;
}
int[][] var15 = Tiles.Tiles_heights[var0];
int[][] var15 = Tiles.Tiles_heights[plane];
int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2;
int var17 = (var1 << 7) + (var9 << 6);
int var18 = (var2 << 7) + (var10 << 6);
long var19 = Tile.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
int var21 = var5 + (var4 << 6);
int var17 = (x << 7) + (var9 << 6);
int var18 = (y << 7) + (var10 << 6);
long var19 = Tile.calculateTag(x, y, 2, var8.int1 == 0, objectID);
int var21 = objectType + (rotation << 6);
if (var8.int3 == 1) {
var21 += 256;
}
if (var8.method4598()) {
class83.method1996(var0, var1, var2, var8, var4);
if (var8.hasSound()) {
class83.newObjectSound(plane, x, y, var8, rotation);
}
Object var22;
if (var5 == 22) {
if (objectType == 22) {
if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(22, var4, var15, var17, var16, var18);
var22 = var8.method4591(22, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null);
}
var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21);
var6.newFloorDecoration(plane, x, y, var16, (Entity)var22, var19, var21);
if (var8.interactType == 1 && var7 != null) {
var7.method3562(var1, var2);
var7.method3562(x, y);
}
}
} else {
int var23;
if (var5 != 10 && var5 != 11) {
int[] var10000;
if (var5 >= 12) {
} else if (objectType == 10 || objectType == 11) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(var5, var4, var15, var17, var16, var18);
var22 = var8.method4591(10, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.method3076(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21);
if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 2340;
}
if (var8.interactType != 0 && var7 != null) {
var7.method3560(var1, var2, var9, var10, var8.boolean1);
}
} else if (var5 == 0) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(0, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field512[var4], 0, var19, var21);
if (var4 == 0) {
if (var8.clipped) {
class32.field282[var0][var1][var2] = 50;
class32.field282[var0][var1][var2 + 1] = 50;
}
if (var8.modelClipped) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 585;
}
} else if (var4 == 1) {
if (var8.clipped) {
class32.field282[var0][var1][var2 + 1] = 50;
class32.field282[var0][var1 + 1][var2 + 1] = 50;
}
if (var8.modelClipped) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[1 + var2] |= 1170;
}
} else if (var4 == 2) {
if (var8.clipped) {
class32.field282[var0][var1 + 1][var2] = 50;
class32.field282[var0][var1 + 1][var2 + 1] = 50;
}
if (var8.modelClipped) {
var10000 = FaceNormal.field1887[var0][var1 + 1];
var10000[var2] |= 585;
}
} else if (var4 == 3) {
if (var8.clipped) {
class32.field282[var0][var1][var2] = 50;
class32.field282[var0][var1 + 1][var2] = 50;
}
if (var8.modelClipped) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 1170;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(var1, var2, var5, var4, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(var0, var1, var2, var8.int2);
}
} else if (var5 == 1) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(1, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field513[var4], 0, var19, var21);
if (var8.clipped) {
if (var4 == 0) {
class32.field282[var0][var1][var2 + 1] = 50;
} else if (var4 == 1) {
class32.field282[var0][var1 + 1][var2 + 1] = 50;
} else if (var4 == 2) {
class32.field282[var0][var1 + 1][var2] = 50;
} else if (var4 == 3) {
class32.field282[var0][var1][var2] = 50;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(var1, var2, var5, var4, var8.boolean1);
}
} else {
int var28;
if (var5 == 2) {
var28 = var4 + 1 & 3;
Object var29;
Object var30;
if (var8.animationId == -1 && var8.transforms == null) {
var29 = var8.method4591(2, var4 + 4, var15, var17, var16, var18);
var30 = var8.method4591(2, var28, var15, var17, var16, var18);
} else {
var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field512[var4], Tiles.field512[var28], var19, var21);
if (var8.modelClipped) {
if (var4 == 0) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 585;
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2 + 1] |= 1170;
} else if (var4 == 1) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2 + 1] |= 1170;
var10000 = FaceNormal.field1887[var0][var1 + 1];
var10000[var2] |= 585;
} else if (var4 == 2) {
var10000 = FaceNormal.field1887[var0][var1 + 1];
var10000[var2] |= 585;
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 1170;
} else if (var4 == 3) {
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 1170;
var10000 = FaceNormal.field1887[var0][var1];
var10000[var2] |= 585;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(var1, var2, var5, var4, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(var0, var1, var2, var8.int2);
}
} else if (var5 == 3) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(3, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field513[var4], 0, var19, var21);
if (var8.clipped) {
if (var4 == 0) {
class32.field282[var0][var1][var2 + 1] = 50;
} else if (var4 == 1) {
class32.field282[var0][var1 + 1][var2 + 1] = 50;
} else if (var4 == 2) {
class32.field282[var0][var1 + 1][var2] = 50;
} else if (var4 == 3) {
class32.field282[var0][var1][var2] = 50;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(var1, var2, var5, var4, var8.boolean1);
}
} else if (var5 == 9) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(var5, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.method3076(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21);
if (var8.interactType != 0 && var7 != null) {
var7.method3560(var1, var2, var9, var10, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(var0, var1, var2, var8.int2);
}
} else if (var5 == 4) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field512[var4], 0, 0, 0, var19, var21);
} else {
long var31;
Object var33;
if (var5 == 5) {
var28 = 16;
var31 = var6.getBoundaryObjectTag(var0, var1, var2);
if (var31 != 0L) {
var28 = ViewportMouse.getObjectDefinition(class43.method770(var31)).int2;
}
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, var4, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field512[var4], 0, var28 * Tiles.field514[var4], var28 * Tiles.field520[var4], var19, var21);
} else if (var5 == 6) {
var28 = 8;
var31 = var6.getBoundaryObjectTag(var0, var1, var2);
if (0L != var31) {
var28 = ViewportMouse.getObjectDefinition(class43.method770(var31)).int2 / 2;
}
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, var4 + 4, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21);
} else if (var5 == 7) {
var23 = var4 + 2 & 3;
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, var23 + 4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21);
} else if (var5 == 8) {
var28 = 8;
var31 = var6.getBoundaryObjectTag(var0, var1, var2);
if (var31 != 0L) {
var28 = ViewportMouse.getObjectDefinition(class43.method770(var31)).int2 / 2;
}
int var27 = var4 + 2 & 3;
Object var26;
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, var4 + 4, var15, var17, var16, var18);
var26 = var8.method4591(4, var27 + 4, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21);
}
}
}
} else {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(10, var4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
}
if (var22 != null && var6.method3076(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
var23 = 15;
if (var22 != null && var6.method3076(plane, x, y, var16, var9, var10, (Entity) var22, objectType == 11 ? 256 : 0, var19, var21) && var8.clipped) {
int var23 = 15;
if (var22 instanceof Model) {
var23 = ((Model)var22).method2864() / 4;
var23 = ((Model) var22).method2864() / 4;
if (var23 > 30) {
var23 = 30;
}
@@ -430,19 +173,267 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
for (int var24 = 0; var24 <= var9; ++var24) {
for (int var25 = 0; var25 <= var10; ++var25) {
if (var23 > class32.field282[var0][var24 + var1][var25 + var2]) {
class32.field282[var0][var24 + var1][var25 + var2] = (byte)var23;
if (var23 > class32.field282[plane][var24 + x][var25 + y]) {
class32.field282[plane][var24 + x][var25 + y] = (byte) var23;
}
}
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3560(var1, var2, var9, var10, var8.boolean1);
var7.method3560(x, y, var9, var10, var8.boolean1);
}
} else if (objectType >= 12) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21);
if (objectType >= 12 && objectType <= 17 && objectType != 13 && plane > 0) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 2340;
}
if (var8.interactType != 0 && var7 != null) {
var7.method3560(x, y, var9, var10, var8.boolean1);
}
} else if (objectType == 0) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(0, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, var19, var21);
if (rotation == 0) {
if (var8.clipped) {
class32.field282[plane][x][y] = 50;
class32.field282[plane][x][y + 1] = 50;
}
if (var8.modelClipped) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 585;
}
} else if (rotation == 1) {
if (var8.clipped) {
class32.field282[plane][x][y + 1] = 50;
class32.field282[plane][x + 1][y + 1] = 50;
}
if (var8.modelClipped) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[1 + y] |= 1170;
}
} else if (rotation == 2) {
if (var8.clipped) {
class32.field282[plane][x + 1][y] = 50;
class32.field282[plane][x + 1][y + 1] = 50;
}
if (var8.modelClipped) {
int[] var10000 = FaceNormal.field1887[plane][x + 1];
var10000[y] |= 585;
}
} else if (rotation == 3) {
if (var8.clipped) {
class32.field282[plane][x][y] = 50;
class32.field282[plane][x + 1][y] = 50;
}
if (var8.modelClipped) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 1170;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(x, y, objectType, rotation, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(plane, x, y, var8.int2);
}
} else if (objectType == 1) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(1, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21);
if (var8.clipped) {
if (rotation == 0) {
class32.field282[plane][x][y + 1] = 50;
} else if (rotation == 1) {
class32.field282[plane][x + 1][y + 1] = 50;
} else if (rotation == 2) {
class32.field282[plane][x + 1][y] = 50;
} else if (rotation == 3) {
class32.field282[plane][x][y] = 50;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(x, y, objectType, rotation, var8.boolean1);
}
} else if (objectType == 2) {
int var28 = rotation + 1 & 3;
Object var29;
Object var30;
if (var8.animationId == -1 && var8.transforms == null) {
var29 = var8.method4591(2, rotation + 4, var15, var17, var16, var18);
var30 = var8.method4591(2, var28, var15, var17, var16, var18);
} else {
var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newBoundaryObject(plane, x, y, var16, (Entity) var29, (Entity) var30, Tiles.field512[rotation], Tiles.field512[var28], var19, var21);
if (var8.modelClipped) {
if (rotation == 0) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 585;
var10000 = FaceNormal.field1887[plane][x];
var10000[y + 1] |= 1170;
} else if (rotation == 1) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y + 1] |= 1170;
var10000 = FaceNormal.field1887[plane][x + 1];
var10000[y] |= 585;
} else if (rotation == 2) {
int[] var10000 = FaceNormal.field1887[plane][x + 1];
var10000[y] |= 585;
var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 1170;
} else if (rotation == 3) {
int[] var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 1170;
var10000 = FaceNormal.field1887[plane][x];
var10000[y] |= 585;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(x, y, objectType, rotation, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(plane, x, y, var8.int2);
}
} else if (objectType == 3) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(3, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21);
if (var8.clipped) {
if (rotation == 0) {
class32.field282[plane][x][y + 1] = 50;
} else if (rotation == 1) {
class32.field282[plane][x + 1][y + 1] = 50;
} else if (rotation == 2) {
class32.field282[plane][x + 1][y] = 50;
} else if (rotation == 3) {
class32.field282[plane][x][y] = 50;
}
}
if (var8.interactType != 0 && var7 != null) {
var7.method3559(x, y, objectType, rotation, var8.boolean1);
}
} else if (objectType == 9) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21);
if (var8.interactType != 0 && var7 != null) {
var7.method3560(x, y, var9, var10, var8.boolean1);
}
if (var8.int2 != 16) {
var6.method3082(plane, x, y, var8.int2);
}
} else if (objectType == 4) {
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, rotation, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, 0, 0, var19, var21);
} else if (objectType == 5) {
int var28 = 16;
long var31 = var6.getBoundaryObjectTag(plane, x, y);
Object var33;
if (var31 != 0L) {
var28 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var31)).int2;
}
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, Tiles.field512[rotation], 0, var28 * Tiles.field514[rotation], var28 * Tiles.field520[rotation], var19, var21);
} else if (objectType == 6) {
int var28 = 8;
long var31 = var6.getBoundaryObjectTag(plane, x, y);
Object var33;
if (0L != var31) {
var28 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var31)).int2 / 2;
}
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21);
} else if (objectType == 7) {
int var23 = rotation + 2 & 3;
if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, var23 + 4, var15, var17, var16, var18);
} else {
var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, 256, var23, 0, 0, var19, var21);
} else if (objectType == 8) {
int var28 = 8;
long var31 = var6.getBoundaryObjectTag(plane, x, y);
if (var31 != 0L) {
var28 = ViewportMouse.getObjectDefinition(class43.getObjectIdFromTag(var31)).int2 / 2;
}
int var27 = rotation + 2 & 3;
Object var26;
Object var33;
if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18);
var26 = var8.method4591(4, var27 + 4, var15, var17, var16, var18);
} else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null);
}
var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) var26, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21);
}
}
@@ -44,7 +44,9 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
}
int var4 = GrandExchangeOfferWorldComparator.method61(var0).type;
if (var4 != 0) {
if (var4 == 0) {
return;
}
int var2 = Varps.Varps_main[var0];
if (var4 == 1) {
if (var2 == 1) {
@@ -192,5 +194,4 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
}
}
}
}
@@ -43,8 +43,8 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
signature = "(Lhp;B)V",
garbageValue = "0"
)
@Export("setVarcIntArchive")
public static void setVarcIntArchive(AbstractArchive var0) {
@Export("VarcInt_setArchives")
public static void VarcInt_setArchives(AbstractArchive var0) {
VarcInt.VarcInt_archive = var0;
}
@@ -77,19 +77,19 @@ public class HealthBar extends Node {
@Export("get")
HealthBarUpdate get(int var1) {
HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last();
if (var2 != null && var2.cycle <= var1) {
if (var2 == null || var2.cycle > var1) {
return null;
}
for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
var2.remove();
var2 = var3;
}
if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
return var2;
}
if (this.definition.int5 + var2.cycle + var2.cycleOffset <= var1) {
var2.remove();
return null;
}
return null;
return var2;
}
@ObfuscatedName("e")
@@ -105,14 +105,17 @@ public class HealthBarUpdate extends Node {
)
public static void method1671(PacketBuffer var0) {
ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last();
if (var1 != null) {
if (var1 == null) {
return;
}
int var2 = var0.offset;
var0.writeInt(var1.id);
for (int var3 = 0; var3 < var1.size; ++var3) {
if (var1.creationErrors[var3] != 0) {
var0.writeByte(var1.creationErrors[var3]);
} else {
continue;
}
try {
int var4 = var1.operations[var3];
Field var5;
@@ -134,14 +137,7 @@ public class HealthBarUpdate extends Node {
}
Method var25;
if (var4 != 3) {
if (var4 == 4) {
var25 = var1.methods[var3];
var6 = var25.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
} else {
if (var4 == 3) {
var25 = var1.methods[var3];
byte[][] var10 = var1.arguments[var3];
Object[] var7 = new Object[var10.length];
@@ -163,6 +159,11 @@ public class HealthBarUpdate extends Node {
} else {
var0.writeByte(4);
}
} else if (var4 == 4) {
var25 = var1.methods[var3];
var6 = var25.getModifiers();
var0.writeByte(0);
var0.writeInt(var6);
}
} catch (ClassNotFoundException var13) {
var0.writeByte(-10);
@@ -190,12 +191,10 @@ public class HealthBarUpdate extends Node {
var0.writeByte(-21);
}
}
}
var0.writeCrc(var2);
var1.remove();
}
}
@ObfuscatedName("ax")
@ObfuscatedSignature(
@@ -132,7 +132,7 @@ public class HitSplatDefinition extends DualNode {
HitSplatDefinition() {
this.fontId = -1;
this.field3333 = 16777215;
this.field3333 = 0xffffff;
this.field3344 = 70;
this.field3334 = -1;
this.field3336 = -1;
@@ -129,7 +129,7 @@ public class Interpreter {
if (var7 > 2500) {
var4.method6146(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
} else {
var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
}
}
@@ -38,7 +38,8 @@ public class ItemContainer extends Node {
signature = "(IB)Lic;",
garbageValue = "-70"
)
public static FloorUnderlayDefinition method1117(int var0) {
@Export("FloorUnderlayDefinition_get")
public static FloorUnderlayDefinition FloorUnderlayDefinition_get(int var0) {
FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
@@ -178,7 +178,8 @@ public final class KeyHandler implements KeyListener, FocusListener {
signature = "(Lhp;I)V",
garbageValue = "-939658474"
)
public static void method794(AbstractArchive var0) {
@Export("ParamDefinition_setArchives")
public static void ParamDefinition_setArchives(AbstractArchive var0) {
ParamDefinition.ParamDefinition_archive = var0;
}
@@ -195,10 +196,10 @@ public final class KeyHandler implements KeyListener, FocusListener {
FaceNormal.field1887 = null;
class32.field282 = null;
Tiles.field515 = null;
ServerBuild.field3103 = null;
Tiles.field508 = null;
Tiles.field507 = null;
DynamicObject.field1301 = null;
ServerBuild.Tiles_hue = null;
Tiles.Tiles_saturation = null;
Tiles.Tiles_lightness = null;
DynamicObject.Tiles_hueMultiplier = null;
Fonts.field3689 = null;
}
@@ -257,7 +257,9 @@ public class KitDefinition extends DualNode {
Client.soundEffects[var0] = var9;
}
if (Client.queuedSoundEffectDelays[var0] < 0) {
if (Client.queuedSoundEffectDelays[var0] >= 0) {
continue;
}
int var2;
if (Client.soundLocations[var0] != 0) {
int var3 = (Client.soundLocations[var0] & 255) * 128;
@@ -296,7 +298,6 @@ public class KitDefinition extends DualNode {
}
Client.queuedSoundEffectDelays[var0] = -100;
}
} else {
--Client.soundEffectCount;
@@ -312,7 +313,9 @@ public class KitDefinition extends DualNode {
}
}
if (Client.field699) {
if (!Client.field699) {
return;
}
boolean var12;
if (class197.field2402 != 0) {
var12 = true;
@@ -327,7 +330,6 @@ public class KitDefinition extends DualNode {
Client.field699 = false;
}
}
}
}
@@ -80,7 +80,7 @@ public class LoginScreenAnimation {
this.field1055 = 0;
this.field1056 = 0;
this.sprites = var1;
this.method1721();
this.initColors();
}
@ObfuscatedName("q")
@@ -88,7 +88,8 @@ public class LoginScreenAnimation {
signature = "(I)V",
garbageValue = "-1195148401"
)
void method1721() {
@Export("initColors")
void initColors() {
this.field1045 = new int[256];
int var1;
@@ -97,15 +98,15 @@ public class LoginScreenAnimation {
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1045[var1 + 64] = var1 * 1024 + 16711680;
this.field1045[var1 + 64] = var1 * 1024 + 0xff0000;
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1045[var1 + 128] = var1 * 4 + 16776960;
this.field1045[var1 + 128] = var1 * 4 + 0xffff00;
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1045[var1 + 192] = 16777215;
this.field1045[var1 + 192] = 0xffffff;
}
this.field1046 = new int[256];
@@ -115,7 +116,7 @@ public class LoginScreenAnimation {
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1046[var1 + 64] = var1 * 4 + 65280;
this.field1046[var1 + 64] = var1 * 4 + 0xff00;
}
for (var1 = 0; var1 < 64; ++var1) {
@@ -123,7 +124,7 @@ public class LoginScreenAnimation {
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1046[var1 + 192] = 16777215;
this.field1046[var1 + 192] = 0xffffff;
}
this.field1047 = new int[256];
@@ -137,11 +138,11 @@ public class LoginScreenAnimation {
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1047[var1 + 128] = var1 * 1024 + 16711935;
this.field1047[var1 + 128] = var1 * 1024 + 0xff00ff;
}
for (var1 = 0; var1 < 64; ++var1) {
this.field1047[var1 + 192] = 16777215;
this.field1047[var1 + 192] = 0xffffff;
}
this.field1044 = new int[256];
@@ -179,7 +180,7 @@ public class LoginScreenAnimation {
@Export("draw")
void draw(int var1, int var2) {
if (this.field1039 == null) {
this.method1721();
this.initColors();
}
if (this.field1056 == 0) {
@@ -340,7 +341,7 @@ public class LoginScreenAnimation {
)
final int method1725(int var1, int var2, int var3) {
int var4 = 256 - var3;
return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8;
return (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) + (var3 * (var2 & 0xff00) + var4 * (var1 & 0xff00) & 0xff0000) >> 8;
}
@ObfuscatedName("l")
@@ -416,7 +417,7 @@ public class LoginScreenAnimation {
int var13 = 256 - var10;
var10 = this.field1044[var10];
int var14 = MusicPatchPcmStream.rasterProvider.pixels[var8];
MusicPatchPcmStream.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8;
MusicPatchPcmStream.rasterProvider.pixels[var8++] = 0xff000000 | (var13 * (var14 & 0xff00) + var12 * (var10 & 0xff00) & 0xff0000) + ((var14 & 0xff00ff) * var13 + (var10 & 0xff00ff) * var12 & 0xff00ff00) >> 8;
} else {
++var8;
}
@@ -534,7 +535,7 @@ public class LoginScreenAnimation {
var13 = Client.localPlayer.plane;
var14 = MusicPatchNode2.baseX * 64 + (MouseHandler.oculusOrbFocalPointX >> 7);
var15 = class1.baseY * 64 + (WorldMapArea.oculusOrbFocalPointY >> 7);
WorldMapLabel.method418(var14, var15, var13, true);
WorldMapLabel.changePlane(var14, var15, var13, true);
}
}
+16 -14
View File
@@ -421,9 +421,9 @@ public class Messages {
}
if (var16.isIf3) {
Client.selectedSpellName = var16.dataText + ClientPreferences.colorStartTag(16777215);
Client.selectedSpellName = var16.dataText + ClientPreferences.colorStartTag(0xffffff);
} else {
Client.selectedSpellName = ClientPreferences.colorStartTag(65280) + var16.spellName + ClientPreferences.colorStartTag(16777215);
Client.selectedSpellName = ClientPreferences.colorStartTag(0xff00) + var16.spellName + ClientPreferences.colorStartTag(0xffffff);
}
}
@@ -458,10 +458,10 @@ public class Messages {
}
}
} else if (var2 == 30) {
if (Client.field850 == null) {
ScriptFrame.method1086(var1, var0);
Client.field850 = Client.getWidgetChild(var1, var0);
Strings.method4120(Client.field850);
if (Client.meslayerContinueWidget == null) {
ScriptFrame.resumePauseWidget(var1, var0);
Client.meslayerContinueWidget = Client.getWidgetChild(var1, var0);
Strings.invalidateWidget(Client.meslayerContinueWidget);
}
} else if (var2 == 31) {
var8 = Archive.method4265(ClientPacket.field2266, Client.packetWriter.isaacCipher);
@@ -539,8 +539,8 @@ public class Messages {
WorldMapIcon_1.selectedItemSlot = var0;
MouseRecorder.selectedItemWidget = var1;
class4.selectedItemId = var3;
Strings.method4120(var16);
Client.selectedItemName = ClientPreferences.colorStartTag(16748608) + WorldMapArea.getItemDefinition(var3).name + ClientPreferences.colorStartTag(16777215);
Strings.invalidateWidget(var16);
Client.selectedItemName = ClientPreferences.colorStartTag(16748608) + WorldMapArea.getItemDefinition(var3).name + ClientPreferences.colorStartTag(0xffffff);
if (Client.selectedItemName == null) {
Client.selectedItemName = "null";
}
@@ -821,7 +821,7 @@ public class Messages {
if (Client.isItemSelected != 0) {
Client.isItemSelected = 0;
Strings.method4120(class80.getWidget(MouseRecorder.selectedItemWidget));
Strings.invalidateWidget(class80.getWidget(MouseRecorder.selectedItemWidget));
}
if (Client.isSpellSelected) {
@@ -829,7 +829,7 @@ public class Messages {
}
if (ItemContainer.field549 != null && Client.field759 == 0) {
Strings.method4120(ItemContainer.field549);
Strings.invalidateWidget(ItemContainer.field549);
}
}
@@ -841,7 +841,9 @@ public class Messages {
)
static void method2163(int var0, int var1, int var2, int var3, String var4) {
Widget var5 = Client.getWidgetChild(var1, var2);
if (var5 != null) {
if (var5 == null) {
return;
}
if (var5.onOp != null) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = var5;
@@ -856,7 +858,9 @@ public class Messages {
var11 = GrandExchangeOfferAgeComparator.method149(var5);
}
if (var11) {
if (!var11) {
return;
}
int var8 = class268.getWidgetClickMask(var5);
int var9 = var0 - 1;
boolean var7 = (var8 >> var9 + 1 & 1) != 0;
@@ -944,6 +948,4 @@ public class Messages {
}
}
}
}
}
@@ -67,7 +67,7 @@ public class MilliClock extends Clock {
garbageValue = "-333181863"
)
@Export("wait")
public int wait(int var1, int var2) {
public int wait(int tickLength, int fiveOrOne) {
int var3 = this.field2014;
int var4 = this.field2013;
this.field2014 = 300;
@@ -77,7 +77,7 @@ public class MilliClock extends Clock {
this.field2014 = var3;
this.field2013 = var4;
} else if (this.field2012 > this.field2011[this.field2016]) {
this.field2014 = (int)((long)(var1 * 2560) / (this.field2012 - this.field2011[this.field2016]));
this.field2014 = (int)((long)(tickLength * 2560) / (this.field2012 - this.field2011[this.field2016]));
}
if (this.field2014 < 25) {
@@ -86,11 +86,11 @@ public class MilliClock extends Clock {
if (this.field2014 > 256) {
this.field2014 = 256;
this.field2013 = (int)((long)var1 - (this.field2012 - this.field2011[this.field2016]) / 10L);
this.field2013 = (int)((long) tickLength - (this.field2012 - this.field2011[this.field2016]) / 10L);
}
if (this.field2013 > var1) {
this.field2013 = var1;
if (this.field2013 > tickLength) {
this.field2013 = tickLength;
}
this.field2011[this.field2016] = this.field2012;
@@ -104,11 +104,11 @@ public class MilliClock extends Clock {
}
}
if (this.field2013 < var2) {
this.field2013 = var2;
if (this.field2013 < fiveOrOne) {
this.field2013 = fiveOrOne;
}
EnumDefinition.method4550((long)this.field2013);
EnumDefinition.sleepMillis((long)this.field2013);
for (var5 = 0; this.field2015 < 256; this.field2015 += this.field2014) {
++var5;
+19 -16
View File
@@ -545,7 +545,9 @@ public class Model extends Entity {
@ObfuscatedName("k")
@Export("calculateBoundingBox")
void calculateBoundingBox(int var1) {
if (this.xMidOffset == -1) {
if (this.xMidOffset != -1) {
return;
}
int var2 = 0;
int var3 = 0;
int var4 = 0;
@@ -604,12 +606,13 @@ public class Model extends Entity {
}
}
}
@ObfuscatedName("l")
@Export("calculateBoundsCylinder")
public void calculateBoundsCylinder() {
if (this.boundsType != 1) {
if (this.boundsType == 1) {
return;
}
this.boundsType = 1;
super.height = 0;
this.bottomY = 0;
@@ -637,11 +640,12 @@ public class Model extends Entity {
this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D);
this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D);
}
}
@ObfuscatedName("b")
void method2910() {
if (this.boundsType != 2) {
if (this.boundsType == 2) {
return;
}
this.boundsType = 2;
this.xzRadius = 0;
@@ -659,7 +663,6 @@ public class Model extends Entity {
this.radius = this.xzRadius;
this.diameter = this.xzRadius + this.xzRadius;
}
}
@ObfuscatedName("i")
public int method2864() {
@@ -680,8 +683,9 @@ public class Model extends Entity {
)
@Export("animate")
public void animate(Frames var1, int var2) {
if (this.vertexLabels != null) {
if (var2 != -1) {
if (this.vertexLabels == null || var2 == -1) {
return;
}
Animation var3 = var1.frames[var2];
Skeleton var4 = var3.skeleton;
Model_transformTempX = 0;
@@ -695,8 +699,6 @@ public class Model extends Entity {
this.resetBounds();
}
}
}
@ObfuscatedName("r")
@ObfuscatedSignature(
@@ -704,8 +706,13 @@ public class Model extends Entity {
)
@Export("animate2")
public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
if (var2 != -1) {
if (var5 != null && var4 != -1) {
if (var2 == -1) {
return;
}
if (var5 == null || var4 == -1) {
this.animate(var1, var2);
return;
}
Animation var6 = var1.frames[var2];
Animation var7 = var3.frames[var4];
Skeleton var8 = var6.skeleton;
@@ -744,10 +751,6 @@ public class Model extends Entity {
}
this.resetBounds();
} else {
this.animate(var1, var2);
}
}
}
@ObfuscatedName("v")
@@ -17,8 +17,8 @@ public class ModelData0 {
@ObfuscatedName("b")
public static short[] field1870;
@ObfuscatedName("i")
@Export("inMembersWorld")
public static boolean inMembersWorld;
@Export("ItemDefinition_inMembersWorld")
public static boolean ItemDefinition_inMembersWorld;
ModelData0() {
}
@@ -81,7 +81,7 @@ public class ModelData0 {
var4.rawY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var4.xAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
var4.yAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3];
Strings.method4120(var4);
Strings.invalidateWidget(var4);
WorldMapSprite.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
@@ -95,7 +95,7 @@ public class ModelData0 {
var4.rawHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var4.widthAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
var4.heightAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3];
Strings.method4120(var4);
Strings.invalidateWidget(var4);
WorldMapSprite.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
@@ -107,7 +107,7 @@ public class ModelData0 {
boolean var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
if (var5 != var4.isHidden) {
var4.isHidden = var5;
Strings.method4120(var4);
Strings.invalidateWidget(var4);
}
return 1;
@@ -34,26 +34,26 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
@ObfuscatedGetter(
intValue = 1710921911
)
@Export("MouseHandler_currentButton0")
public static volatile int MouseHandler_currentButton0;
@Export("MouseHandler_currentButtonVolatile")
public static volatile int MouseHandler_currentButtonVolatile;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1256133149
)
@Export("MouseHandler_x0")
public static volatile int MouseHandler_x0;
@Export("MouseHandler_xVolatile")
public static volatile int MouseHandler_xVolatile;
@ObfuscatedName("c")
@ObfuscatedGetter(
intValue = 1661434067
)
@Export("MouseHandler_y0")
public static volatile int MouseHandler_y0;
@Export("MouseHandler_yVolatile")
public static volatile int MouseHandler_yVolatile;
@ObfuscatedName("f")
@ObfuscatedGetter(
longValue = -8614064843857647631L
)
@Export("MouseHandler_millis0")
public static volatile long MouseHandler_millis0;
@Export("MouseHandler_lastMovedVolatile")
public static volatile long MouseHandler_lastMovedVolatile;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1270652981
@@ -76,26 +76,26 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
@ObfuscatedGetter(
intValue = -1163235529
)
@Export("MouseHandler_lastButton0")
public static volatile int MouseHandler_lastButton0;
@Export("MouseHandler_lastButtonVolatile")
public static volatile int MouseHandler_lastButtonVolatile;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -1839013683
)
@Export("MouseHandler_lastPressedX0")
public static volatile int MouseHandler_lastPressedX0;
@Export("MouseHandler_lastPressedXVolatile")
public static volatile int MouseHandler_lastPressedXVolatile;
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = -62123151
)
@Export("MouseHandler_lastPressedY0")
public static volatile int MouseHandler_lastPressedY0;
@Export("MouseHandler_lastPressedYVolatile")
public static volatile int MouseHandler_lastPressedYVolatile;
@ObfuscatedName("g")
@ObfuscatedGetter(
longValue = -4691083224527858071L
)
@Export("MouseHandler_lastPressedTimeMillis0")
public static volatile long MouseHandler_lastPressedTimeMillis0;
@Export("MouseHandler_lastPressedTimeMillisVolatile")
public static volatile long MouseHandler_lastPressedTimeMillisVolatile;
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 1647189949
@@ -130,18 +130,18 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
static {
MouseHandler_instance = new MouseHandler();
MouseHandler_idleCycles = 0;
MouseHandler_currentButton0 = 0;
MouseHandler_x0 = -1;
MouseHandler_y0 = -1;
MouseHandler_millis0 = -1L;
MouseHandler_currentButtonVolatile = 0;
MouseHandler_xVolatile = -1;
MouseHandler_yVolatile = -1;
MouseHandler_lastMovedVolatile = -1L;
MouseHandler_currentButton = 0;
MouseHandler_x = 0;
MouseHandler_y = 0;
MouseHandler_millis = 0L;
MouseHandler_lastButton0 = 0;
MouseHandler_lastPressedX0 = 0;
MouseHandler_lastPressedY0 = 0;
MouseHandler_lastPressedTimeMillis0 = 0L;
MouseHandler_lastButtonVolatile = 0;
MouseHandler_lastPressedXVolatile = 0;
MouseHandler_lastPressedYVolatile = 0;
MouseHandler_lastPressedTimeMillisVolatile = 0L;
MouseHandler_lastButton = 0;
MouseHandler_lastPressedX = 0;
MouseHandler_lastPressedY = 0;
@@ -168,9 +168,9 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
public final synchronized void mouseMoved(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
MouseHandler_x0 = var1.getX();
MouseHandler_y0 = var1.getY();
MouseHandler_millis0 = var1.getWhen();
MouseHandler_xVolatile = var1.getX();
MouseHandler_yVolatile = var1.getY();
MouseHandler_lastMovedVolatile = var1.getWhen();
}
}
@@ -178,12 +178,12 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
public final synchronized void mousePressed(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
MouseHandler_lastPressedX0 = var1.getX();
MouseHandler_lastPressedY0 = var1.getY();
MouseHandler_lastPressedTimeMillis0 = DirectByteArrayCopier.currentTimeMs();
MouseHandler_lastButton0 = this.getButton(var1);
if (MouseHandler_lastButton0 != 0) {
MouseHandler_currentButton0 = MouseHandler_lastButton0;
MouseHandler_lastPressedXVolatile = var1.getX();
MouseHandler_lastPressedYVolatile = var1.getY();
MouseHandler_lastPressedTimeMillisVolatile = DirectByteArrayCopier.currentTimeMs();
MouseHandler_lastButtonVolatile = this.getButton(var1);
if (MouseHandler_lastButtonVolatile != 0) {
MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile;
}
}
@@ -196,7 +196,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
public final synchronized void mouseReleased(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
MouseHandler_currentButton0 = 0;
MouseHandler_currentButtonVolatile = 0;
}
if (var1.isPopupTrigger()) {
@@ -218,7 +218,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
public final synchronized void focusLost(FocusEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_currentButton0 = 0;
MouseHandler_currentButtonVolatile = 0;
}
}
@@ -226,9 +226,9 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
public final synchronized void mouseExited(MouseEvent var1) {
if (MouseHandler_instance != null) {
MouseHandler_idleCycles = 0;
MouseHandler_x0 = -1;
MouseHandler_y0 = -1;
MouseHandler_millis0 = var1.getWhen();
MouseHandler_xVolatile = -1;
MouseHandler_yVolatile = -1;
MouseHandler_lastMovedVolatile = var1.getWhen();
}
}
@@ -45,7 +45,7 @@ public class MouseRecorder implements Runnable {
}
public void run() {
for (; this.isRunning; EnumDefinition.method4550(50L)) {
for (; this.isRunning; EnumDefinition.sleepMillis(50L)) {
synchronized(this.lock) {
if (this.index < 500) {
this.xs[this.index] = MouseHandler.MouseHandler_x;
@@ -214,11 +214,11 @@ public class MusicPatchPcmStream extends PcmStream {
if (var0.isMembersOnly() != Client.isMembersWorld) {
Client.isMembersWorld = var0.isMembersOnly();
boolean var1 = var0.isMembersOnly();
if (var1 != ModelData0.inMembersWorld) {
if (var1 != ModelData0.ItemDefinition_inMembersWorld) {
ItemDefinition.ItemDefinition_cached.clear();
ItemDefinition.ItemDefinition_cachedModels.clear();
ItemDefinition.ItemDefinition_cachedSprites.clear();
ModelData0.inMembersWorld = var1;
ModelData0.ItemDefinition_inMembersWorld = var1;
}
}
@@ -34,19 +34,20 @@ public class NanoClock extends Clock {
garbageValue = "-333181863"
)
@Export("wait")
public int wait(int var1, int var2) {
long var3 = 1000000L * (long)var2;
public int wait(int tickLength, int fiveOrOne) {
long var3 = 1000000L * (long)fiveOrOne;
long var5 = this.lastTimeNano - System.nanoTime();
if (var5 < var3) {
var5 = var3;
}
EnumDefinition.method4550(var5 / 1000000L);
EnumDefinition.sleepMillis(var5 / 1000000L);
long var7 = System.nanoTime();
int var9;
for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) {
int var9 = 0;
while (var9 < 10 && (var9 < 1 || this.lastTimeNano < var7)) {
++var9;
this.lastTimeNano += (long)tickLength * 1000000L;
}
if (this.lastTimeNano < var7) {
+1 -1
View File
@@ -144,7 +144,7 @@ public class NetCache {
int var3;
int var4;
for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) {
var4 = WorldMapIcon_1.fontBold12.stringWidth(WorldMapLabel.method417(var3));
var4 = WorldMapIcon_1.fontBold12.stringWidth(WorldMapLabel.getMenuText(var3));
if (var4 > var2) {
var2 = var4;
}
@@ -102,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if (this.task != null) {
while (this.task.status == 0) {
EnumDefinition.method4550(1L);
EnumDefinition.sleepMillis(1L);
}
if (this.task.status == 1) {
+3 -2
View File
@@ -25,13 +25,14 @@ public class Node {
@ObfuscatedName("fz")
@Export("remove")
public void remove() {
if (this.next != null) {
if (this.next == null) {
return;
}
this.next.previous = this.previous;
this.previous.next = this.next;
this.previous = null;
this.next = null;
}
}
@ObfuscatedName("fn")
@Export("hasNext")
@@ -248,7 +248,8 @@ public class ObjectDefinition extends DualNode {
@Export("int6")
public int int6;
@ObfuscatedName("ay")
public int[] field3367;
@Export("soundEffectIds")
public int[] soundEffectIds;
@ObfuscatedName("af")
@ObfuscatedSignature(
signature = "Lla;"
@@ -472,10 +473,10 @@ public class ObjectDefinition extends DualNode {
this.int6 = var1.readUnsignedShort();
this.int4 = var1.readUnsignedByte();
var3 = var1.readUnsignedByte();
this.field3367 = new int[var3];
this.soundEffectIds = new int[var3];
for (var4 = 0; var4 < var3; ++var4) {
this.field3367[var4] = var1.readUnsignedShort();
this.soundEffectIds[var4] = var1.readUnsignedShort();
}
} else if (var2 == 81) {
this.clipType = var1.readUnsignedByte() * 65536;
@@ -889,14 +890,15 @@ public class ObjectDefinition extends DualNode {
signature = "(I)Z",
garbageValue = "-2033078684"
)
public boolean method4598() {
@Export("hasSound")
public boolean hasSound() {
if (this.transforms == null) {
return this.ambientSoundId != -1 || this.field3367 != null;
return this.ambientSoundId != -1 || this.soundEffectIds != null;
}
for (int var1 = 0; var1 < this.transforms.length; ++var1) {
if (this.transforms[var1] != -1) {
ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]);
if (var2.ambientSoundId != -1 || var2.field3367 != null) {
if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) {
return true;
}
}
@@ -23,17 +23,20 @@ public final class ObjectSound extends Node {
@ObfuscatedGetter(
intValue = 621824935
)
int field1078;
@Export("plane")
int plane;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = 1620734975
)
int field1083;
@Export("x")
int x;
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -1755977344
)
int field1090;
@Export("y")
int y;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = 75852160
@@ -113,7 +116,7 @@ public final class ObjectSound extends Node {
this.field1091 = var2.int4 * 128;
this.field1086 = var2.int5;
this.field1081 = var2.int6;
this.soundEffectIds = var2.field3367;
this.soundEffectIds = var2.soundEffectIds;
} else {
this.soundEffectId = -1;
this.field1091 = 0;
@@ -29,7 +29,7 @@ public class PacketBuffer extends Buffer {
int bitIndex;
static {
field3724 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
field3724 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 0xffffff, 33554431, 67108863, 134217727, 0xfffffff, 536870911, 1073741823, Integer.MAX_VALUE, -1};
}
public PacketBuffer(int var1) {
@@ -247,10 +247,10 @@ public class PacketBufferNode extends Node {
FaceNormal.field1887 = new int[4][105][105];
class32.field282 = new byte[4][105][105];
Tiles.field515 = new int[105][105];
ServerBuild.field3103 = new int[104];
Tiles.field508 = new int[104];
Tiles.field507 = new int[104];
DynamicObject.field1301 = new int[104];
ServerBuild.Tiles_hue = new int[104];
Tiles.Tiles_saturation = new int[104];
Tiles.Tiles_lightness = new int[104];
DynamicObject.Tiles_hueMultiplier = new int[104];
Fonts.field3689 = new int[104];
var1 = class13.regionLandArchives.length;
@@ -411,7 +411,9 @@ public class PacketBufferNode extends Node {
label447:
for (var4 = 0; var4 < 13; ++var4) {
var51 = Client.instanceChunkTemplates[var49][var3][var4];
if (var51 != -1) {
if (var51 == -1) {
continue;
}
var6 = var51 >> 24 & 3;
var7 = var51 >> 1 & 3;
var52 = var51 >> 14 & 1023;
@@ -419,7 +421,9 @@ public class PacketBufferNode extends Node {
var10 = (var52 / 8 << 8) + var9 / 8;
for (var11 = 0; var11 < DirectByteArrayCopier.regions.length; ++var11) {
if (DirectByteArrayCopier.regions[var11] == var10 && class80.regionMapArchives[var11] != null) {
if (DirectByteArrayCopier.regions[var11] != var10 || class80.regionMapArchives[var11] == null) {
continue;
}
byte[] var54 = class80.regionMapArchives[var11];
int var13 = var3 * 8;
int var14 = var4 * 8;
@@ -452,7 +456,9 @@ public class PacketBufferNode extends Node {
int var27 = var19.readUnsignedByte();
int var28 = var27 >> 2;
int var29 = var27 & 3;
if (var6 == var26 && var25 >= var15 && var25 < var15 + 8 && var24 >= var16 && var24 < var16 + 8) {
if (var6 != var26 || var25 < var15 || var25 >= var15 + 8 || var24 < var16 || var24 >= var16 + 8) {
continue;
}
ObjectDefinition var30 = ViewportMouse.getObjectDefinition(var20);
int var33 = var25 & 7;
int var34 = var24 & 7;
@@ -502,7 +508,9 @@ public class PacketBufferNode extends Node {
}
var46 = var40 + var14;
if (var38 > 0 && var46 > 0 && var38 < 103 && var46 < 103) {
if (var38 <= 0 || var46 <= 0 || var38 >= 103 || var46 >= 103) {
continue;
}
int var47 = var49;
if ((Tiles.Tiles_renderFlags[1][var38][var46] & 2) == 2) {
var47 = var49 - 1;
@@ -521,10 +529,6 @@ public class PacketBufferNode extends Node {
}
}
}
}
}
}
}
WorldMapElement.method4368(true);
class186.playPcmPlayers();
@@ -112,7 +112,9 @@ public class PacketWriter {
garbageValue = "294803591"
)
final void method2234() throws IOException {
if (this.socket != null && this.bufferSize > 0) {
if (this.socket == null || this.bufferSize <= 0) {
return;
}
this.buffer.offset = 0;
while (true) {
@@ -129,7 +131,6 @@ public class PacketWriter {
var1.packetBuffer.method5477();
var1.method3620();
}
}
}
@@ -174,7 +174,9 @@ public class PcmPlayer {
)
@Export("run")
public final synchronized void run() {
if (this.samples != null) {
if (this.samples == null) {
return;
}
long var1 = DirectByteArrayCopier.currentTimeMs();
try {
@@ -258,7 +260,6 @@ public class PcmPlayer {
}
}
}
@ObfuscatedName("aw")
@ObfuscatedSignature(
@@ -473,7 +474,8 @@ public class PcmPlayer {
signature = "(B)[Lll;",
garbageValue = "69"
)
public static FillMode[] method2405() {
@Export("FillMode_values")
public static FillMode[] FillMode_values() {
return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENTALPHA};
}
@@ -117,10 +117,10 @@ public final class PendingSpawn extends Node {
Client.interfaceParents.put(var3, (long)var0);
GrandExchangeOfferAgeComparator.method146(var1);
Widget var4 = class80.getWidget(var0);
Strings.method4120(var4);
if (Client.field850 != null) {
Strings.method4120(Client.field850);
Client.field850 = null;
Strings.invalidateWidget(var4);
if (Client.meslayerContinueWidget != null) {
Strings.invalidateWidget(Client.meslayerContinueWidget);
Client.meslayerContinueWidget = null;
}
for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
@@ -53,25 +53,25 @@ public class PlayerAppearance {
garbageValue = "646936980"
)
@Export("update")
public void update(int[] var1, int[] var2, boolean var3, int var4) {
if (var1 == null) {
var1 = new int[12];
public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) {
if (equipment == null) {
equipment = new int[12];
for (int var5 = 0; var5 < 7; ++var5) {
for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) {
KitDefinition var7 = ArchiveDiskAction.getKitDefinition(var6);
if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) {
var1[equipmentIndices[var5]] = var6 + 256;
if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (isFemale ? 7 : 0)) {
equipment[equipmentIndices[var5]] = var6 + 256;
break;
}
}
}
}
this.equipment = var1;
this.bodyColors = var2;
this.isFemale = var3;
this.npcTransformId = var4;
this.equipment = equipment;
this.bodyColors = bodyColors;
this.isFemale = isFemale;
this.npcTransformId = npcTransformId;
this.setHash();
}
@@ -81,9 +81,13 @@ public class PlayerAppearance {
garbageValue = "7431"
)
public void method3992(int var1, boolean var2) {
if (var1 != 1 || !this.isFemale) {
if (var1 == 1 && this.isFemale) {
return;
}
int var3 = this.equipment[equipmentIndices[var1]];
if (var3 != 0) {
if (var3 == 0) {
return;
}
var3 -= 256;
KitDefinition var4;
@@ -106,8 +110,6 @@ public class PlayerAppearance {
this.equipment[equipmentIndices[var1]] = var3 + 256;
this.setHash();
}
}
}
@ObfuscatedName("e")
@ObfuscatedSignature(
@@ -117,25 +119,19 @@ public class PlayerAppearance {
public void method3993(int var1, boolean var2) {
int var3 = this.bodyColors[var1];
boolean var4;
if (!var2) {
do {
if (var2) {
--var3;
if (var3 < 0) {
if (var3 < 0)
{
var3 = class247.field3291[var1].length - 1;
}
if (var1 == 4 && var3 >= 8) {
var4 = false;
} else {
var4 = true;
}
} while(!var4);
} else {
do {
++var3;
if (var3 >= class247.field3291[var1].length) {
var3 = 0;
}
}
if (var1 == 4 && var3 >= 8) {
var4 = false;
@@ -143,7 +139,7 @@ public class PlayerAppearance {
var4 = true;
}
} while(!var4);
}
this.bodyColors[var1] = var3;
this.setHash();
@@ -154,7 +150,8 @@ public class PlayerAppearance {
signature = "(ZI)V",
garbageValue = "-1889308905"
)
public void method4006(boolean var1) {
@Export("changeSex")
public void changeSex(boolean var1) {
if (this.isFemale != var1) {
this.update((int[])null, this.bodyColors, var1, -1);
}
@@ -165,7 +162,8 @@ public class PlayerAppearance {
signature = "(Lkf;I)V",
garbageValue = "318518244"
)
public void method3995(Buffer var1) {
@Export("write")
public void write(Buffer var1) {
var1.writeByte(this.isFemale ? 1 : 0);
int var2;
@@ -29,7 +29,7 @@ public final class RasterProvider extends AbstractRasterProvider {
super.height = var2;
super.pixels = new int[var2 * var1 + 1];
DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length);
DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255);
DirectColorModel var5 = new DirectColorModel(32, 0xff0000, 0xff00, 255);
WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null);
this.image = new BufferedImage(var5, var6, false, new Hashtable());
this.setComponent(var3);
@@ -370,7 +370,7 @@ public class Rasterizer2D extends DualNode {
var3 = Rasterizer2D_yClipEnd - var1;
}
var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280);
var4 = (var5 * (var4 & 0xff00ff) >> 8 & 0xff00ff) + (var5 * (var4 & 0xff00) >> 8 & 0xff00);
int var6 = 256 - var5;
int var7 = Rasterizer2D_width - var2;
int var8 = var0 + Rasterizer2D_width * var1;
@@ -378,7 +378,7 @@ public class Rasterizer2D extends DualNode {
for (int var9 = 0; var9 < var3; ++var9) {
for (int var10 = -var2; var10 < 0; ++var10) {
int var11 = Rasterizer2D_pixels[var8];
var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280);
var11 = ((var11 & 0xff00ff) * var6 >> 8 & 0xff00ff) + (var6 * (var11 & 0xff00) >> 8 & 0xff00);
Rasterizer2D_pixels[var8++] = var11 + var4;
}
@@ -452,7 +452,7 @@ public class Rasterizer2D extends DualNode {
for (int var10 = -var3; var10 < 0; ++var10) {
int var11 = 65536 - var6 >> 8;
int var12 = var6 >> 8;
int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8;
int var13 = (var12 * (var5 & 0xff00ff) + var11 * (var4 & 0xff00ff) & 0xff00ff00) + (var12 * (var5 & 0xff00) + var11 * (var4 & 0xff00) & 0xff0000) >>> 8;
for (int var14 = -var2; var14 < 0; ++var14) {
Rasterizer2D_pixels[var9++] = var13;
@@ -496,21 +496,21 @@ public class Rasterizer2D extends DualNode {
for (int var12 = -var3; var12 < 0; ++var12) {
int var13 = 65536 - var8 >> 8;
int var14 = var8 >> 8;
int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8;
int var15 = (var13 * var6 + var14 * var7 & 0xff00) >>> 8;
if (var15 == 0) {
var11 += Rasterizer2D_width;
var8 += var9;
} else {
int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8;
int var16 = (var14 * (var5 & 0xff00ff) + var13 * (var4 & 0xff00ff) & 0xff00ff00) + (var14 * (var5 & 0xff00) + var13 * (var4 & 0xff00) & 0xff0000) >>> 8;
int var17 = 255 - var15;
int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280);
int var18 = ((var16 & 0xff00ff) * var15 >> 8 & 0xff00ff) + (var15 * (var16 & 0xff00) >> 8 & 0xff00);
for (int var19 = -var2; var19 < 0; ++var19) {
int var20 = Rasterizer2D_pixels[var11];
if (var20 == 0) {
Rasterizer2D_pixels[var11++] = var18;
} else {
var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280);
var20 = ((var20 & 0xff00ff) * var17 >> 8 & 0xff00ff) + (var17 * (var20 & 0xff00) >> 8 & 0xff00);
Rasterizer2D_pixels[var11++] = var18 + var20;
}
}
@@ -592,7 +592,7 @@ public class Rasterizer2D extends DualNode {
int var20 = var19 >>> 24;
int var21 = 255 - var20;
int var22 = Rasterizer2D_pixels[var14];
int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8;
Rasterizer2D_pixels[var14++] = var23;
}
@@ -819,15 +819,15 @@ public class Rasterizer3D extends Rasterizer2D {
do {
var2 = Rasterizer3D_colorPalette[var6 >> 8];
var6 += var7;
var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935);
var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff);
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
--var3;
} while(var3 > 0);
}
@@ -835,11 +835,11 @@ public class Rasterizer3D extends Rasterizer2D {
var3 = var5 - var4 & 3;
if (var3 > 0) {
var2 = Rasterizer3D_colorPalette[var6 >> 8];
var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935);
var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff);
do {
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
--var3;
} while(var3 > 0);
}
@@ -860,9 +860,9 @@ public class Rasterizer3D extends Rasterizer2D {
do {
var2 = Rasterizer3D_colorPalette[var6 >> 8];
var6 += var7;
var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935);
var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff);
var10 = var0[var1];
var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280);
var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00);
--var3;
} while(var3 > 0);
}
@@ -1359,7 +1359,7 @@ public class Rasterizer3D extends Rasterizer2D {
}
int var6 = Rasterizer3D_alpha;
int var7 = 256 - Rasterizer3D_alpha;
var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935);
var2 = (var7 * (var2 & 0xff00) >> 8 & 0xff00) + (var7 * (var2 & 0xff00ff) >> 8 & 0xff00ff);
while (true) {
--var3;
@@ -1374,18 +1374,18 @@ public class Rasterizer3D extends Rasterizer2D {
}
var8 = var0[var1];
var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00);
}
}
var8 = var0[var1];
var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00);
var8 = var0[var1];
var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00);
var8 = var0[var1];
var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00);
var8 = var0[var1];
var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00);
}
}
while (true) {
@@ -2094,28 +2094,28 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var10000 = var16 + var2;
var18 = var20;
var19 = var21;
@@ -2148,7 +2148,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
--var17;
} while(var17 > 0);
@@ -2157,49 +2157,49 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -2235,7 +2235,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -2289,28 +2289,28 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var10000 = var16 + var2;
var18 = var20;
var19 = var21;
@@ -2343,7 +2343,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
--var17;
} while(var17 > 0);
@@ -2352,49 +2352,49 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -2430,7 +2430,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -3116,28 +3116,28 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var7 += var8;
var15 = var7 >> 8;
@@ -3149,7 +3149,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 >>> 26) + (var2 & 4032)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
--var17;
} while(var17 > 0);
@@ -3158,49 +3158,49 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -3215,7 +3215,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -3259,28 +3259,28 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
var7 += var8;
var15 = var7 >> 8;
@@ -3292,7 +3292,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
var3 = var1[(var2 & 16256) + (var2 >>> 25)];
var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
var2 += var16;
--var17;
} while(var17 > 0);
@@ -3301,49 +3301,49 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
var2 += var16;
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -3358,7 +3358,7 @@ public class Rasterizer3D extends Rasterizer2D {
if (var17 > 0) {
do {
if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8;
}
++var4;
@@ -55,7 +55,7 @@ public abstract class RouteStrategy {
)
static final void method3593() {
Client.packetWriter.close();
class197.FloorUnderlayDefinition_clearCached();
class197.FloorOverlayDefinition_clearCached();
FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
KitDefinition.KitDefinition_cached.clear();
TileItemPile.ObjectDefinition_clearCached();
+34 -31
View File
@@ -1058,37 +1058,37 @@ public class Scene {
@ObfuscatedName("ak")
@Export("draw")
public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
if (var1 < 0) {
var1 = 0;
} else if (var1 >= this.xSize * 128) {
var1 = this.xSize * 128 - 1;
public void draw(int camX, int camY, int camZ, int camPitch, int camYaw, int plane) {
if (camX < 0) {
camX = 0;
} else if (camX >= this.xSize * 128) {
camX = this.xSize * 128 - 1;
}
if (var3 < 0) {
var3 = 0;
} else if (var3 >= this.ySize * 128) {
var3 = this.ySize * 128 - 1;
if (camZ < 0) {
camZ = 0;
} else if (camZ >= this.ySize * 128) {
camZ = this.ySize * 128 - 1;
}
if (var4 < 128) {
var4 = 128;
} else if (var4 > 383) {
var4 = 383;
if (camPitch < 128) {
camPitch = 128;
} else if (camPitch > 383) {
camPitch = 383;
}
++Scene_drawnCount;
Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4];
Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4];
Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5];
Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5];
visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64];
Scene_cameraX = var1;
Scene_cameraY = var2;
Scene_cameraZ = var3;
Scene_cameraXTile = var1 / 128;
Scene_cameraYTile = var3 / 128;
Scene_plane = var6;
Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[camPitch];
Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[camPitch];
Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[camYaw];
Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[camYaw];
visibleTiles = visibilityMap[(camPitch - 128) / 32][camYaw / 64];
Scene_cameraX = camX;
Scene_cameraY = camY;
Scene_cameraZ = camZ;
Scene_cameraXTile = camX / 128;
Scene_cameraYTile = camZ / 128;
Scene_plane = plane;
Scene_cameraXTileMin = Scene_cameraXTile - 25;
if (Scene_cameraXTileMin < 0) {
Scene_cameraXTileMin = 0;
@@ -1122,8 +1122,10 @@ public class Scene {
for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) {
Tile var11 = var8[var9][var10];
if (var11 != null) {
if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) {
if (var11 == null) {
continue;
}
if (var11.minPlane > plane || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - camY < 2000) {
var11.drawPrimary = false;
var11.drawSecondary = false;
var11.drawGameObjectEdges = 0;
@@ -1141,7 +1143,6 @@ public class Scene {
}
}
}
}
int var12;
int var13;
@@ -1154,7 +1155,9 @@ public class Scene {
for (var9 = -25; var9 <= 0; ++var9) {
var10 = var9 + Scene_cameraXTile;
var16 = Scene_cameraXTile - var9;
if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
if (var10 < Scene_cameraXTileMin && var16 >= Scene_cameraXTileMax) {
continue;
}
for (var12 = -25; var12 <= 0; ++var12) {
var13 = var12 + Scene_cameraYTile;
var14 = Scene_cameraYTile - var12;
@@ -1197,7 +1200,6 @@ public class Scene {
}
}
}
}
for (var7 = this.minPlane; var7 < this.planes; ++var7) {
var8 = this.tiles[var7];
@@ -1205,7 +1207,9 @@ public class Scene {
for (var9 = -25; var9 <= 0; ++var9) {
var10 = var9 + Scene_cameraXTile;
var16 = Scene_cameraXTile - var9;
if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
if (var10 < Scene_cameraXTileMin && var16 >= Scene_cameraXTileMax) {
continue;
}
for (var12 = -25; var12 <= 0; ++var12) {
var13 = var12 + Scene_cameraYTile;
var14 = Scene_cameraYTile - var12;
@@ -1248,7 +1252,6 @@ public class Scene {
}
}
}
}
checkClick = false;
}
@@ -353,10 +353,10 @@ public class ScriptFrame {
signature = "(III)V",
garbageValue = "-881674814"
)
static void method1086(int var0, int var1) {
static void resumePauseWidget(int parentID, int childID) {
PacketBufferNode var2 = Archive.method4265(ClientPacket.field2273, Client.packetWriter.isaacCipher);
var2.packetBuffer.writeIntLE16(var0);
var2.packetBuffer.method5530(var1);
var2.packetBuffer.writeIntLE16(parentID);
var2.packetBuffer.method5530(childID);
Client.packetWriter.method2219(var2);
}
@@ -32,7 +32,7 @@ public class ServerBuild {
@Export("WIP")
static final ServerBuild WIP;
@ObfuscatedName("f")
static int[] field3103;
static int[] Tiles_hue;
@ObfuscatedName("k")
@Export("name")
public final String name;
+3 -3
View File
@@ -181,7 +181,7 @@ public class Skeleton extends Node {
Calendar.field2507 = var12;
}
Strings.method4120(var6);
Strings.invalidateWidget(var6);
return 1;
}
Widget var9;
@@ -189,13 +189,13 @@ public class Skeleton extends Node {
var9 = var2 ? Interpreter.field1111 : Calendar.field2507;
Widget var10 = class80.getWidget(var9.id);
var10.children[var9.childIndex] = null;
Strings.method4120(var10);
Strings.invalidateWidget(var10);
return 1;
}
if (var0 == ScriptOpcodes.CC_DELETEALL) {
var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
var9.children = null;
Strings.method4120(var9);
Strings.invalidateWidget(var9);
return 1;
}
if (var0 == ScriptOpcodes.CC_FIND) {
@@ -65,8 +65,7 @@ public class SoundSystem implements Runnable {
ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0;
} else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
} else {
if (class189.ByteArrayPool_arrays != null) {
} else if (class189.ByteArrayPool_arrays != null) {
for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) {
if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class43.ByteArrayPool_altSizeArrayCounts[var1] < class189.ByteArrayPool_arrays[var1].length) {
class189.ByteArrayPool_arrays[var1][class43.ByteArrayPool_altSizeArrayCounts[var1]++] = var0;
@@ -74,8 +73,6 @@ public class SoundSystem implements Runnable {
}
}
}
}
}
@ObfuscatedName("ac")
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -39,7 +40,8 @@ public class Strings {
signature = "(Lhj;I)V",
garbageValue = "-2041903885"
)
static void method4120(Widget var0) {
@Export("invalidateWidget")
static void invalidateWidget(Widget var0) {
if (var0.cycle == Client.field741) {
Client.field843[var0.rootIndex] = true;
}
+5 -5
View File
@@ -120,25 +120,25 @@ public class Texture extends Node {
byte[] var17 = var7.pixels;
int[] var11 = var7.palette;
int var12 = this.field1619[var6];
if ((var12 & -16777216) == 16777216) {
if ((var12 & 0xff000000) == 16777216) {
}
if ((var12 & -16777216) == 33554432) {
if ((var12 & 0xff000000) == 33554432) {
}
int var13;
int var14;
int var15;
int var16;
if ((var12 & -16777216) == 50331648) {
var13 = var12 & 16711935;
if ((var12 & 0xff000000) == 50331648) {
var13 = var12 & 0xff00ff;
var14 = var12 >> 8 & 255;
for (var15 = 0; var15 < var11.length; ++var15) {
var16 = var11[var15];
if (var16 >> 8 == (var16 & 65535)) {
var16 &= 255;
var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280;
var11[var15] = var13 * var16 >> 8 & 0xff00ff | var14 * var16 & 0xff00;
}
}
}
+3 -2
View File
@@ -49,7 +49,8 @@ public final class TileItem extends Entity {
signature = "(Lhp;B)V",
garbageValue = "97"
)
public static void method2054(AbstractArchive var0) {
@Export("StructDefinition_setArchives")
public static void StructDefinition_setArchives(AbstractArchive var0) {
StructDefinition.StructDefinition_archive = var0;
}
@@ -82,6 +83,6 @@ public final class TileItem extends Entity {
WorldMapEvent.field359 = var0;
Client.field848 = var1;
WorldMapCacheName.selectedSpellFlags = var2;
Strings.method4120(var4);
Strings.invalidateWidget(var4);
}
}
@@ -74,8 +74,8 @@ public final class TilePaint {
Sprite var6 = var4[var5] = new Sprite();
var6.width = SpriteBuffer.SpriteBuffer_spriteWidth;
var6.height = SpriteBuffer.SpriteBuffer_spriteHeight;
var6.yOffset = Varps.SpriteBuffer_xOffsets[var5];
var6.xOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5];
var6.xOffset = Varps.SpriteBuffer_xOffsets[var5];
var6.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5];
var6.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[var5];
var6.subHeight = class216.SpriteBuffer_spriteHeights[var5];
int var7 = var6.subHeight * var6.subWidth;
+2 -2
View File
@@ -33,9 +33,9 @@ public final class Tiles {
@ObfuscatedName("c")
static int[][] field515;
@ObfuscatedName("m")
static int[] field508;
static int[] Tiles_saturation;
@ObfuscatedName("u")
static int[] field507;
static int[] Tiles_lightness;
@ObfuscatedName("j")
static final int[] field512;
@ObfuscatedName("t")
+25 -10
View File
@@ -416,57 +416,71 @@ public class Timer {
Login.Login_loadingText = "Loading config - " + class215.archive2.loadPercent() + "%";
Login.Login_loadingPercent = 60;
} else {
// floorovl def inlined
Archive var31 = class215.archive2;
FloorOverlayDefinition.FloorOverlayDefinition_archive = var31;
WorldMapSprite.setFloorUnderlayDefinitionArchive(class215.archive2);
GrandExchangeEvents.method66(class215.archive2, NPCDefinition.archive7);
// ---
WorldMapSprite.FloorUnderlayDefinition_setArchives(class215.archive2);
GrandExchangeEvents.KitDefinition_setArchives(class215.archive2, NPCDefinition.archive7);
// object def inlined
var25 = class215.archive2;
var2 = NPCDefinition.archive7;
boolean var34 = Client.isLowDetail;
ObjectDefinition.ObjectDefinition_archive = var25;
ObjectDefinition.ObjectDefinition_modelsArchive = var2;
ObjectDefinition.ObjectDefinition_isLowDetail = var34;
FaceNormal.setNpcDefinitionArchives(class215.archive2, NPCDefinition.archive7);
TileItem.method2054(class215.archive2);
// ---
FaceNormal.NpcDefinition_setArchives(class215.archive2, NPCDefinition.archive7);
TileItem.StructDefinition_setArchives(class215.archive2);
// item def inlined
Archive var27 = class215.archive2;
Archive var5 = NPCDefinition.archive7;
boolean var6 = Client.isMembersWorld;
Font var7 = Coord.fontPlain11;
Messages.ItemDefinition_archive = var27;
ItemDefinition.ItemDefinition_modelArchive = var5;
ModelData0.inMembersWorld = var6;
ModelData0.ItemDefinition_inMembersWorld = var6;
ItemDefinition.ItemDefinition_fileCount = Messages.ItemDefinition_archive.getGroupFileCount(10);
HealthBar.ItemDefinition_fontPlain11 = var7;
// sequence def inlined
Archive var8 = class215.archive2;
Archive var9 = class197.archive0;
Archive var10 = class167.archive1;
SequenceDefinition.SequenceDefinition_archive = var8;
SequenceDefinition.SequenceDefinition_animationsArchive = var9;
SequenceDefinition.SequenceDefinition_skeletonsArchive = var10;
// spotanim def inlined
Archive var11 = class215.archive2;
Archive var12 = NPCDefinition.archive7;
SpotAnimationDefinition.SpotAnimationDefinition_archive = var11;
class43.SpotAnimationDefinition_modelArchive = var12;
// varbit def inlined
Archive var13 = class215.archive2;
VarbitDefinition.VarbitDefinition_archive = var13;
GrandExchangeEvents.method68(class215.archive2);
UrlRequest.method3317(class43.archive3, NPCDefinition.archive7, Client.archive8, class2.archive13);
WorldMapData_0.method173(class215.archive2);
// ---
GrandExchangeEvents.VarpDefinition_setArchives(class215.archive2);
UrlRequest.Widget_setArchives(class43.archive3, NPCDefinition.archive7, Client.archive8, class2.archive13);
WorldMapData_0.InvDefinition_setArchives(class215.archive2);
// enum def inlined
Archive var14 = class215.archive2;
EnumDefinition.EnumDefinition_archive = var14;
GrandExchangeOfferWorldComparator.setVarcIntArchive(class215.archive2);
KeyHandler.method794(class215.archive2);
// ---
GrandExchangeOfferWorldComparator.VarcInt_setArchives(class215.archive2);
KeyHandler.ParamDefinition_setArchives(class215.archive2);
Clock.varcs = new Varcs();
// hitsplat def inlined
Archive var15 = class215.archive2;
Archive var16 = Client.archive8;
Archive var17 = class2.archive13;
HitSplatDefinition.HitSplatDefinition_archive = var15;
HitSplatDefinition.HitSplatDefinition_spritesArchive = var16;
HitSplatDefinition.HitSplatDefinition_fontsArchive = var17;
// healthbar def inlined
Archive var18 = class215.archive2;
Archive var19 = Client.archive8;
HealthBarDefinition.HealthBarDefinition_archive = var18;
HealthBarDefinition.HealthBarDefinition_spritesArchive = var19;
// worldmap element inlined
Archive var20 = class215.archive2;
Archive var21 = Client.archive8;
WorldMapElement.WorldMapElement_archive = var21;
@@ -483,6 +497,7 @@ public class Timer {
}
}
}
// ---
Login.Login_loadingText = "Loaded config";
Login.Login_loadingPercent = 60;
+5 -4
View File
@@ -41,15 +41,17 @@ public class TriBool {
)
@Export("drawLoadingMessage")
static final void drawLoadingMessage(String var0, boolean var1) {
if (Client.showLoadingMessages) {
if (!Client.showLoadingMessages) {
return;
}
byte var2 = 4;
int var3 = var2 + 6;
int var4 = var2 + 6;
int var5 = class169.fontPlain12.lineWidth(var0, 250);
int var6 = class169.fontPlain12.lineCount(var0, 250) * 13;
Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0);
Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 16777215);
class169.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0xffffff);
class169.fontPlain12.drawLines(var0, var3, var4, var5, var6, 0xffffff, -1, 1, 1, 0);
ChatChannel.method2215(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2);
if (var1) {
MusicPatchPcmStream.rasterProvider.drawFull(0, 0);
@@ -67,5 +69,4 @@ public class TriBool {
}
}
}
}
@@ -46,13 +46,14 @@ public class UrlRequest {
signature = "(Lhp;Lhp;Lhp;Lhp;I)V",
garbageValue = "-354587299"
)
public static void method3317(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
@Export("Widget_setArchives")
public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
Widget.Widget_archive = var0;
ViewportMouse.Widget_modelsArchive = var1;
class216.Widget_spritesArchive = var2;
DirectByteArrayCopier.Widget_fontsArchive = var3;
Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][];
ViewportMouse.loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
ViewportMouse.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
}
@ObfuscatedName("e")
@@ -129,8 +130,8 @@ public class UrlRequest {
var9 = (var2 - var8) / 2;
if (var4) {
Rasterizer2D.Rasterizer2D_resetClip();
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, 0xff000000);
Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, 0xff000000);
}
var0 += var9;
@@ -145,8 +146,8 @@ public class UrlRequest {
var9 = (var3 - var8) / 2;
if (var4) {
Rasterizer2D.Rasterizer2D_resetClip();
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, 0xff000000);
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, 0xff000000);
}
var1 += var9;
+4 -3
View File
@@ -34,7 +34,8 @@ public class Varcs {
@ObfuscatedGetter(
longValue = -277979548816975331L
)
long field1272;
@Export("lastWrittenMs")
long lastWrittenMs;
Varcs() {
this.unwrittenChanges = false;
@@ -252,7 +253,7 @@ public class Varcs {
}
this.unwrittenChanges = false;
this.field1272 = DirectByteArrayCopier.currentTimeMs();
this.lastWrittenMs = DirectByteArrayCopier.currentTimeMs();
}
@ObfuscatedName("u")
@@ -354,7 +355,7 @@ public class Varcs {
)
@Export("tryWrite")
void tryWrite() {
if (this.unwrittenChanges && this.field1272 < DirectByteArrayCopier.currentTimeMs() - 60000L) {
if (this.unwrittenChanges && this.lastWrittenMs < DirectByteArrayCopier.currentTimeMs() - 60000L) {
this.write();
}
+3 -3
View File
@@ -38,7 +38,9 @@ public class Varps {
garbageValue = "1546167720"
)
static final int method3969(Widget var0, int var1) {
if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
if (var0.cs1Instructions == null || var1 >= var0.cs1Instructions.length) {
return -2;
}
try {
int[] var2 = var0.cs1Instructions[var1];
int var3 = 0;
@@ -191,6 +193,4 @@ public class Varps {
return -1;
}
}
return -2;
}
}
@@ -36,8 +36,8 @@ public class ViewportMouse {
)
static int field1746;
@ObfuscatedName("i")
@Export("loadedInterfaces")
public static boolean[] loadedInterfaces;
@Export("Widget_loadedInterfaces")
public static boolean[] Widget_loadedInterfaces;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lhp;"
+10 -8
View File
@@ -635,9 +635,11 @@ public class Widget extends Node {
@Export("children")
public Widget[] children;
@ObfuscatedName("fi")
public boolean field2642;
@Export("containsMouse")
public boolean containsMouse;
@ObfuscatedName("fk")
public boolean field2589;
@Export("isClicked")
public boolean isClicked;
@ObfuscatedName("fg")
@ObfuscatedGetter(
intValue = -1473790409
@@ -773,8 +775,8 @@ public class Widget extends Node {
this.itemQuantity = 0;
this.modelFrame = 0;
this.modelFrameCycle = 0;
this.field2642 = false;
this.field2589 = false;
this.containsMouse = false;
this.isClicked = false;
this.field2689 = -1;
this.field2592 = 0;
this.field2603 = 0;
@@ -1275,15 +1277,15 @@ public class Widget extends Node {
return null;
}
if (this.spriteFlipV) {
var5.method6128();
var5.flipVertically();
}
if (this.spriteFlipH) {
var5.method6117();
var5.flipHorizontally();
}
if (this.outline > 0) {
var5.method6115(this.outline);
var5.pad(this.outline);
}
if (this.outline >= 1) {
@@ -1291,7 +1293,7 @@ public class Widget extends Node {
}
if (this.outline >= 2) {
var5.outline(16777215);
var5.outline(0xffffff);
}
if (this.spriteShadow != 0) {
+71 -64
View File
@@ -237,7 +237,8 @@ public class WorldMap {
)
int field4011;
@ObfuscatedName("bi")
final int[] field4020;
@Export("menuOpcodes")
final int[] menuOpcodes;
@ObfuscatedName("bg")
List field3972;
@ObfuscatedName("bh")
@@ -314,7 +315,7 @@ public class WorldMap {
this.field3988 = new HashSet();
this.elementsDisabled = false;
this.field4011 = 0;
this.field4020 = new int[]{1008, 1009, 1010, 1011, 1012};
this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012};
this.field4005 = new HashSet();
this.mouseCoord = null;
this.showCoord = false;
@@ -373,14 +374,18 @@ public class WorldMap {
garbageValue = "-2047217979"
)
@Export("onCycle")
public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
if (this.cacheLoader.getIsLoaded()) {
public void onCycle(int mouseX, int mouseY, boolean mouseOver, int xOffset, int yOffset, int width, int height) {
if (!this.cacheLoader.isLoaded()) {
return;
}
this.smoothZoom();
this.scrollToTarget();
if (var3) {
int var8 = (int)Math.ceil((double)((float)var6 / this.zoom));
int var9 = (int)Math.ceil((double)((float)var7 / this.zoom));
List var10 = this.worldMapManager.method607(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2);
if (!mouseOver) {
return;
}
int var8 = (int)Math.ceil((double)((float)width / this.zoom));
int var9 = (int)Math.ceil((double)((float)height / this.zoom));
List var10 = this.worldMapManager.method607(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, xOffset, yOffset, width, height, mouseX, mouseY);
HashSet var11 = new HashSet();
Iterator var12;
@@ -392,7 +397,7 @@ public class WorldMap {
var11.add(var13);
var14 = new ScriptEvent();
var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
var14.setArgs(new Object[]{var15, var1, var2});
var14.setArgs(new Object[]{var15, mouseX, mouseY});
if (this.field4005.contains(var13)) {
var14.setType(17);
} else {
@@ -407,7 +412,7 @@ public class WorldMap {
if (!var11.contains(var13)) {
var14 = new ScriptEvent();
var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
var14.setArgs(new Object[]{var15, var1, var2});
var14.setArgs(new Object[]{var15, mouseX, mouseY});
var14.setType(16);
LoginPacket.runScriptEvent(var14);
}
@@ -415,19 +420,17 @@ public class WorldMap {
this.field4005 = var11;
}
}
}
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(IIZZB)V",
garbageValue = "24"
)
public void method6301(int var1, int var2, boolean var3, boolean var4) {
public void method6301(int var1, int var2, boolean isClicked, boolean wasClicked) {
long var5 = DirectByteArrayCopier.currentTimeMs();
this.method6302(var1, var2, var4, var5);
if (!this.hasTarget() && (var4 || var3)) {
if (var4) {
this.method6302(var1, var2, wasClicked, var5);
if (!this.hasTarget() && (wasClicked || isClicked)) {
if (wasClicked) {
this.field4001 = var1;
this.field3989 = var2;
this.field4006 = this.centerTileX;
@@ -443,7 +446,7 @@ public class WorldMap {
this.method6306();
}
if (var4) {
if (wasClicked) {
this.field3982 = var5;
this.field4000 = var1;
this.field4012 = var2;
@@ -460,7 +463,7 @@ public class WorldMap {
if (this.mouseCoord != null && var3) {
boolean var8 = Client.staffModLevel >= 2;
if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
WorldMapLabel.method418(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false);
WorldMapLabel.changePlane(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false);
} else {
boolean var9 = true;
if (this.field4013) {
@@ -729,15 +732,16 @@ public class WorldMap {
garbageValue = "-365948534"
)
@Export("draw")
public void draw(int var1, int var2, int var3, int var4, int var5) {
public void draw(int x, int y, int width, int height, int cycle) {
int[] var6 = new int[4];
Rasterizer2D.Rasterizer2D_getClipArray(var6);
Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4);
Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216);
Rasterizer2D.Rasterizer2D_setClip(x, y, width + x, y + height);
Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, 0xff000000);
int var7 = this.cacheLoader.getPercentLoaded();
if (var7 < 100) {
this.drawLoading(var1, var2, var3, var4, var7);
} else {
this.drawLoading(x, y, width, height, var7);
return;
}
if (!this.worldMapManager.isLoaded()) {
this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld);
if (!this.worldMapManager.isLoaded()) {
@@ -757,33 +761,32 @@ public class WorldMap {
}
}
int var8 = (int)Math.ceil((double)((float)var3 / this.zoom));
int var9 = (int)Math.ceil((double)((float)var4 / this.zoom));
this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4);
int var8 = (int)Math.ceil((double)((float)width / this.zoom));
int var9 = (int)Math.ceil((double)((float)height / this.zoom));
this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, x, y, width + x, y + height);
boolean var10;
if (!this.elementsDisabled) {
var10 = false;
if (var5 - this.field4011 > 100) {
this.field4011 = var5;
if (cycle - this.field4011 > 100) {
this.field4011 = cycle;
var10 = true;
}
this.worldMapManager.method605(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field3988, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10);
this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, x, y, width + x, y + height, this.field3988, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10);
}
this.method6319(var1, var2, var3, var4, var8, var9);
this.method6319(x, y, width, height, var8, var9);
var10 = Client.staffModLevel >= 2;
if (var10 && this.showCoord && this.mouseCoord != null) {
this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 0xffff00, -1);
}
this.worldMapDisplayWidth = var8;
this.worldMapDisplayHeight = var9;
this.worldMapDisplayX = var1;
this.worldMapDisplayY = var2;
this.worldMapDisplayX = x;
this.worldMapDisplayY = y;
Rasterizer2D.Rasterizer2D_setClipArray(var6);
}
}
@ObfuscatedName("z")
@ObfuscatedSignature(
@@ -794,7 +797,9 @@ public class WorldMap {
if (this.sprite == null) {
return true;
}
if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) {
if (this.sprite.subWidth != var1 || this.sprite.subHeight != var2) {
return true;
}
if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) {
return true;
}
@@ -806,8 +811,6 @@ public class WorldMap {
}
return true;
}
return true;
}
@ObfuscatedName("al")
@ObfuscatedSignature(
@@ -815,7 +818,9 @@ public class WorldMap {
garbageValue = "-125"
)
void method6319(int var1, int var2, int var3, int var4, int var5, int var6) {
if (PendingSpawn.field944 != null) {
if (PendingSpawn.field944 == null) {
return;
}
int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2);
int var8 = var3 + 512;
int var9 = var4 + 512;
@@ -848,7 +853,6 @@ public class WorldMap {
} else {
this.sprite.method6217(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192);
}
}
}
@@ -859,7 +863,7 @@ public class WorldMap {
)
@Export("drawOverview")
public void drawOverview(int var1, int var2, int var3, int var4) {
if (this.cacheLoader.getIsLoaded()) {
if (this.cacheLoader.isLoaded()) {
if (!this.worldMapManager.isLoaded()) {
this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld);
if (!this.worldMapManager.isLoaded()) {
@@ -887,13 +891,13 @@ public class WorldMap {
garbageValue = "1955930802"
)
@Export("drawLoading")
void drawLoading(int var1, int var2, int var3, int var4, int var5) {
void drawLoading(int x, int y, int width, int height, int percentLoaded) {
byte var6 = 20;
int var7 = var3 / 2 + var1;
int var8 = var4 / 2 + var2 - 18 - var6;
Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216);
int var7 = width / 2 + x;
int var8 = height / 2 + y - 18 - var6;
Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, 0xff000000);
Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536);
Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536);
Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, percentLoaded * 3, 30, -65536);
this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1);
}
@@ -958,7 +962,7 @@ public class WorldMap {
)
@Export("isCacheLoaded")
public boolean isCacheLoaded() {
return this.cacheLoader.getIsLoaded();
return this.cacheLoader.isLoaded();
}
@ObfuscatedName("az")
@@ -1168,8 +1172,8 @@ public class WorldMap {
this.flashCycle = 0;
for (int var2 = 0; var2 < UserComparator1.WorldMapElement_count; ++var2) {
if (class222.getWorldMapElement(var2) != null && class222.getWorldMapElement(var2).category == var1) {
this.flashingElements.add(class222.getWorldMapElement(var2).objectId);
if (class222.WorldMapElement_get(var2) != null && class222.WorldMapElement_get(var2).category == var1) {
this.flashingElements.add(class222.WorldMapElement_get(var2).objectId);
}
}
@@ -1225,8 +1229,8 @@ public class WorldMap {
}
for (int var3 = 0; var3 < UserComparator1.WorldMapElement_count; ++var3) {
if (class222.getWorldMapElement(var3) != null && class222.getWorldMapElement(var3).category == var1) {
int var4 = class222.getWorldMapElement(var3).objectId;
if (class222.WorldMapElement_get(var3) != null && class222.WorldMapElement_get(var3).category == var1) {
int var4 = class222.WorldMapElement_get(var3).objectId;
if (!var2) {
this.enabledElementIds.add(var4);
} else {
@@ -1284,12 +1288,17 @@ public class WorldMap {
signature = "(IIIIIII)V",
garbageValue = "90618974"
)
public void method6482(int var1, int var2, int var3, int var4, int var5, int var6) {
if (this.cacheLoader.getIsLoaded()) {
int var7 = (int)Math.ceil((double)((float)var3 / this.zoom));
int var8 = (int)Math.ceil((double)((float)var4 / this.zoom));
List var9 = this.worldMapManager.method607(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6);
if (!var9.isEmpty()) {
@Export("addElementMenuOptions")
public void addElementMenuOptions(int xOffset, int yOffset, int width, int height, int mouseX, int mouseY) {
if (!this.cacheLoader.isLoaded()) {
return;
}
int var7 = (int)Math.ceil((double)((float)width / this.zoom));
int var8 = (int)Math.ceil((double)((float)height / this.zoom));
List var9 = this.worldMapManager.method607(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, xOffset, yOffset, width, height, mouseX, mouseY);
if (var9.isEmpty()) {
return;
}
Iterator var10 = var9.iterator();
boolean var13;
@@ -1299,20 +1308,18 @@ public class WorldMap {
}
AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next();
WorldMapElement var12 = class222.getWorldMapElement(var11.getElement());
WorldMapElement var12 = class222.WorldMapElement_get(var11.getElement());
var13 = false;
for (int var14 = this.field4020.length - 1; var14 >= 0; --var14) {
if (var12.strings[var14] != null) {
class188.insertMenuItemNoShift(var12.strings[var14], var12.string1, this.field4020[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed());
for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) {
if (var12.menuActions[var14] != null) {
class188.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed());
var13 = true;
}
}
} while(!var13);
}
}
}
@ObfuscatedName("bx")
@ObfuscatedSignature(
@@ -1320,7 +1327,7 @@ public class WorldMap {
garbageValue = "719601861"
)
public Coord method6352(int var1, Coord var2) {
if (!this.cacheLoader.getIsLoaded()) {
if (!this.cacheLoader.isLoaded()) {
return null;
}
if (!this.worldMapManager.isLoaded()) {
@@ -1397,7 +1404,7 @@ public class WorldMap {
)
@Export("iconStart")
public AbstractWorldMapIcon iconStart() {
if (!this.cacheLoader.getIsLoaded()) {
if (!this.cacheLoader.isLoaded()) {
return null;
}
if (!this.worldMapManager.isLoaded()) {
@@ -23,15 +23,15 @@ public class WorldMapArchiveLoader {
@Export("percentLoaded")
int percentLoaded;
@ObfuscatedName("i")
@Export("isLoaded")
boolean isLoaded;
@Export("loaded")
boolean loaded;
@ObfuscatedSignature(
signature = "(Lhp;)V"
)
WorldMapArchiveLoader(AbstractArchive var1) {
this.percentLoaded = 0;
this.isLoaded = false;
this.loaded = false;
this.archive = var1;
}
@@ -46,7 +46,7 @@ public class WorldMapArchiveLoader {
if (var1 != this.cacheName) {
this.cacheName = var1;
this.percentLoaded = 0;
this.isLoaded = false;
this.loaded = false;
this.load();
}
}
@@ -81,7 +81,7 @@ public class WorldMapArchiveLoader {
}
this.percentLoaded = 100;
this.isLoaded = true;
this.loaded = true;
}
return this.percentLoaded;
@@ -92,9 +92,9 @@ public class WorldMapArchiveLoader {
signature = "(I)Z",
garbageValue = "1906092832"
)
@Export("getIsLoaded")
boolean getIsLoaded() {
return this.isLoaded;
@Export("isLoaded")
boolean isLoaded() {
return this.loaded;
}
@ObfuscatedName("p")
@@ -427,7 +427,7 @@ public class WorldMapArea {
var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder));
}
if (!ModelData0.inMembersWorld && var1.isMembersOnly) {
if (!ModelData0.ItemDefinition_inMembersWorld && var1.isMembersOnly) {
var1.name = "Members object";
var1.isTradable = false;
var1.groundActions = null;
@@ -608,7 +608,7 @@ public class WorldMapArea {
var22.offset += var7;
NetCache.field3175 += var7;
if (var6 == VarpDefinition.NetCache_responseArchiveBuffer.offset) {
if (16711935L == class226.NetCache_currentResponse.key) {
if (0xff00ffL == class226.NetCache_currentResponse.key) {
AbstractRasterProvider.NetCache_reference = VarpDefinition.NetCache_responseArchiveBuffer;
for (var8 = 0; var8 < 256; ++var8) {
@@ -638,7 +638,7 @@ public class WorldMapArea {
NetCache.NetCache_crcMismatches = 0;
NetCache.NetCache_ioExceptions = 0;
class226.NetCache_currentResponse.archive.write((int)(class226.NetCache_currentResponse.key & 65535L), VarpDefinition.NetCache_responseArchiveBuffer.array, (class226.NetCache_currentResponse.key & 16711680L) == 16711680L, class215.field2545);
class226.NetCache_currentResponse.archive.write((int)(class226.NetCache_currentResponse.key & 65535L), VarpDefinition.NetCache_responseArchiveBuffer.array, (class226.NetCache_currentResponse.key & 0xff0000L) == 0xff0000L, class215.field2545);
}
class226.NetCache_currentResponse.remove();
@@ -78,7 +78,8 @@ public class WorldMapData_0 extends AbstractWorldMapData {
signature = "(Lhp;I)V",
garbageValue = "-1590503408"
)
public static void method173(AbstractArchive var0) {
@Export("InvDefinition_setArchives")
public static void InvDefinition_setArchives(AbstractArchive var0) {
InvDefinition.InvDefinition_archive = var0;
}
}
@@ -52,7 +52,7 @@ public class WorldMapDecoration {
var3 = var2 ? Interpreter.field1111 : Calendar.field2507;
}
Strings.method4120(var3);
Strings.invalidateWidget(var3);
if (var0 == ScriptOpcodes.CC_SETOBJECT || var0 == ScriptOpcodes.CC_SETOBJECT_NONUM || var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
int var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
@@ -59,11 +59,11 @@ public class WorldMapElement extends DualNode {
@Export("textSize")
public int textSize;
@ObfuscatedName("u")
@Export("strings")
public String[] strings;
@Export("menuActions")
public String[] menuActions;
@ObfuscatedName("x")
@Export("string1")
public String string1;
@Export("menuTargetName")
public String menuTargetName;
@ObfuscatedName("r")
int[] field3221;
@ObfuscatedName("v")
@@ -117,7 +117,7 @@ public class WorldMapElement extends DualNode {
this.sprite1 = -1;
this.sprite2 = -1;
this.textSize = 0;
this.strings = new String[5];
this.menuActions = new String[5];
this.field3222 = Integer.MAX_VALUE;
this.field3223 = Integer.MAX_VALUE;
this.field3224 = Integer.MIN_VALUE;
@@ -164,21 +164,21 @@ public class WorldMapElement extends DualNode {
var1.readMedium();
} else if (var2 == 6) {
this.textSize = var1.readUnsignedByte();
} else {
int var3;
if (var2 == 7) {
var3 = var1.readUnsignedByte();
if ((var3 & 1) == 0) {
} else if (var2 == 7) {
int var3 = var1.readUnsignedByte();
if ((var3 & 1) == 0)
{
}
if ((var3 & 2) == 2) {
if ((var3 & 2) == 2)
{
}
} else if (var2 == 8) {
var1.readUnsignedByte();
} else if (var2 >= 10 && var2 <= 14) {
this.strings[var2 - 10] = var1.readStringCp1252NullTerminated();
this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated();
} else if (var2 == 15) {
var3 = var1.readUnsignedByte();
int var3 = var1.readUnsignedByte();
this.field3221 = new int[var3 * 2];
int var4;
@@ -200,9 +200,11 @@ public class WorldMapElement extends DualNode {
for (var5 = 0; var5 < var3; ++var5) {
this.field3214[var5] = var1.readByte();
}
} else if (var2 != 16) {
} else if (var2 == 16) {
return;
}
if (var2 == 17) {
this.string1 = var1.readStringCp1252NullTerminated();
this.menuTargetName = var1.readStringCp1252NullTerminated();
} else if (var2 == 18) {
var1.method5511();
} else if (var2 == 19) {
@@ -224,12 +226,10 @@ public class WorldMapElement extends DualNode {
var1.readUnsignedByte();
} else if (var2 == 29) {
HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3461, HorizontalAlignment.field3460, HorizontalAlignment.HorizontalAlignment_centered};
this.horizontalAlignment = (HorizontalAlignment)SoundSystem.findEnumerated(var6, var1.readUnsignedByte());
this.horizontalAlignment = (HorizontalAlignment) SoundSystem.findEnumerated(var6, var1.readUnsignedByte());
} else if (var2 == 30) {
VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3195, VerticalAlignment.field3194};
this.verticalAlignment = (VerticalAlignment)SoundSystem.findEnumerated(var7, var1.readUnsignedByte());
}
}
this.verticalAlignment = (VerticalAlignment) SoundSystem.findEnumerated(var7, var1.readUnsignedByte());
}
}
@@ -240,7 +240,9 @@ public class WorldMapElement extends DualNode {
garbageValue = "2017602837"
)
public void method4370() {
if (this.field3221 != null) {
if (this.field3221 == null) {
return;
}
for (int var1 = 0; var1 < this.field3221.length; var1 += 2) {
if (this.field3221[var1] < this.field3222) {
this.field3222 = this.field3221[var1];
@@ -254,7 +256,6 @@ public class WorldMapElement extends DualNode {
this.field3231 = this.field3221[var1 + 1];
}
}
}
}
@@ -309,9 +310,13 @@ public class WorldMapElement extends DualNode {
static final void method4368(boolean var0) {
class186.playPcmPlayers();
++Client.packetWriter.field1319;
if (Client.packetWriter.field1319 >= 50 || var0) {
if (Client.packetWriter.field1319 < 50 && !var0) {
return;
}
Client.packetWriter.field1319 = 0;
if (!Client.field701 && Client.packetWriter.getSocket() != null) {
if (Client.field701 || Client.packetWriter.getSocket() == null) {
return;
}
PacketBufferNode var1 = Archive.method4265(ClientPacket.field2225, Client.packetWriter.isaacCipher);
Client.packetWriter.method2219(var1);
@@ -320,8 +325,6 @@ public class WorldMapElement extends DualNode {
} catch (IOException var3) {
Client.field701 = true;
}
}
}
}
}
@@ -239,7 +239,7 @@ public class WorldMapID {
}
Client.isSpellSelected = false;
Strings.method4120(var0);
Strings.invalidateWidget(var0);
}
}
@@ -54,7 +54,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
super(var1, var2);
this.element = var3;
this.label = var4;
WorldMapElement var5 = class222.getWorldMapElement(this.getElement());
WorldMapElement var5 = class222.WorldMapElement_get(this.getElement());
Sprite var6 = var5.getSpriteBool(false);
if (var6 != null) {
this.subWidth = var6.subWidth;
@@ -123,8 +123,8 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
@Export("init")
void init() {
this.element = ViewportMouse.getObjectDefinition(this.objectDefId).transform().mapIconId;
this.label = this.region.createMapLabel(class222.getWorldMapElement(this.element));
WorldMapElement var1 = class222.getWorldMapElement(this.getElement());
this.label = this.region.createMapLabel(class222.WorldMapElement_get(this.element));
WorldMapElement var1 = class222.WorldMapElement_get(this.getElement());
Sprite var2 = var1.getSpriteBool(false);
if (var2 != null) {
this.subWidth = var2.subWidth;
@@ -115,7 +115,8 @@ public class WorldMapLabel {
signature = "(IB)Ljava/lang/String;",
garbageValue = "108"
)
static String method417(int var0) {
@Export("getMenuText")
static String getMenuText(int var0) {
if (var0 < 0) {
return "";
}
@@ -127,7 +128,8 @@ public class WorldMapLabel {
signature = "(IIIZI)V",
garbageValue = "-1379117889"
)
public static void method418(int var0, int var1, int var2, boolean var3) {
@Export("changePlane")
public static void changePlane(int var0, int var1, int var2, boolean var3) {
PacketBufferNode var4 = Archive.method4265(ClientPacket.field2296, Client.packetWriter.isaacCipher);
var4.packetBuffer.writeIntME(var3 ? Client.field855 : 0);
var4.packetBuffer.writeShortLE(var1);
@@ -240,7 +240,7 @@ public final class WorldMapManager {
for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) {
for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) {
this.regions[var21][var22].method506(var5 + var18 * (this.regions[var21][var22].regionx * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
this.regions[var21][var22].method506(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18);
}
}
@@ -251,12 +251,13 @@ public final class WorldMapManager {
signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
garbageValue = "-855095363"
)
public final void method605(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4);
float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
@Export("drawElements")
public final void drawElements(int minTileX, int minTileY, int maxTileX, int maxTileY, int x, int y, int endX, int endY, HashSet var9, HashSet flashingElements, int flashCycle, int cyclesPerFlash, boolean var13) {
WorldMapRectangle var14 = this.createWorldMapRectangle(minTileX, minTileY, maxTileX, maxTileY);
float var15 = this.getPixelsPerTile(endX - x, maxTileX - minTileX);
int var16 = (int)(var15 * 64.0F);
int var17 = this.tileX * 4096 + var1;
int var18 = this.tileY * 4096 + var2;
int var17 = this.tileX * 4096 + minTileX;
int var18 = this.tileY * 4096 + minTileY;
int var19;
int var20;
@@ -266,14 +267,14 @@ public final class WorldMapManager {
this.regions[var19][var20].initWorldMapIcon1s();
}
this.regions[var19][var20].method432(var5 + var16 * (this.regions[var19][var20].regionx * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9);
this.regions[var19][var20].method432(x + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, endY - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9);
}
}
if (var10 != null && var11 > 0) {
if (flashingElements != null && flashCycle > 0) {
for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) {
for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) {
this.regions[var19][var20].method433(var10, var11, var12);
this.regions[var19][var20].flashElements(flashingElements, flashCycle, cyclesPerFlash);
}
}
}
@@ -288,7 +289,7 @@ 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) {
this.compositeTextureSprite.method6125(var1, var2, var3, var4);
this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4);
if (var6 > 0 && var6 % var7 < var7 / 2) {
if (this.icons == null) {
this.buildIcons0();
@@ -313,7 +314,7 @@ public final class WorldMapManager {
AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 64);
int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 64);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 0xffff00, 256);
}
}
}
@@ -325,20 +326,20 @@ public final class WorldMapManager {
signature = "(IIIIIIIIIII)Ljava/util/List;",
garbageValue = "286331893"
)
public List method607(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
public List method607(int minTileX, int minTileY, int maxTileX, int maxTileY, int xOffset, int yOffset, int width, int height, int mouseX, int mouseY) {
LinkedList var11 = new LinkedList();
if (!this.loaded) {
return var11;
}
WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4);
float var13 = this.getPixelsPerTile(var7, var3 - var1);
WorldMapRectangle var12 = this.createWorldMapRectangle(minTileX, minTileY, maxTileX, maxTileY);
float var13 = this.getPixelsPerTile(width, maxTileX - minTileX);
int var14 = (int)(64.0F * var13);
int var15 = this.tileX * 4096 + var1;
int var16 = this.tileY * 4096 + var2;
int var15 = this.tileX * 4096 + minTileX;
int var16 = this.tileY * 4096 + minTileY;
for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) {
for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) {
List var19 = this.regions[var17][var18].method440(var5 + var14 * (this.regions[var17][var18].regionx * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10);
List var19 = this.regions[var17][var18].method440(xOffset + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, height + yOffset - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, mouseX, mouseY);
if (!var19.isEmpty()) {
var11.addAll(var19);
}
@@ -513,7 +514,7 @@ public final class WorldMapManager {
int var9 = var8 - var7;
String var6;
if (var9 < -9) {
var6 = ClientPreferences.colorStartTag(16711680);
var6 = ClientPreferences.colorStartTag(0xff0000);
} else if (var9 < -6) {
var6 = ClientPreferences.colorStartTag(16723968);
} else if (var9 < -3) {
@@ -521,7 +522,7 @@ public final class WorldMapManager {
} else if (var9 < 0) {
var6 = ClientPreferences.colorStartTag(16756736);
} else if (var9 > 9) {
var6 = ClientPreferences.colorStartTag(65280);
var6 = ClientPreferences.colorStartTag(0xff00);
} else if (var9 > 6) {
var6 = ClientPreferences.colorStartTag(4259584);
} else if (var9 > 3) {
@@ -529,7 +530,7 @@ public final class WorldMapManager {
} else if (var9 > 0) {
var6 = ClientPreferences.colorStartTag(12648192);
} else {
var6 = ClientPreferences.colorStartTag(16776960);
var6 = ClientPreferences.colorStartTag(0xffff00);
}
var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
@@ -539,10 +540,10 @@ public final class WorldMapManager {
int var10;
if (Client.isItemSelected == 1) {
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(16777215) + var4, 14, var1, var2, var3);
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffffff) + var4, 14, var1, var2, var3);
} else if (Client.isSpellSelected) {
if ((WorldMapCacheName.selectedSpellFlags & 8) == 8) {
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(16777215) + var4, 15, var1, var2, var3);
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffffff) + var4, 15, var1, var2, var3);
}
} else {
for (var10 = 7; var10 >= 0; --var10) {
@@ -570,14 +571,14 @@ public final class WorldMapManager {
boolean var12 = false;
var7 = Client.playerMenuOpcodes[var10] + var11;
class188.insertMenuItemNoShift(Client.playerMenuActions[var10], ClientPreferences.colorStartTag(16777215) + var4, var7, var1, var2, var3);
class188.insertMenuItemNoShift(Client.playerMenuActions[var10], ClientPreferences.colorStartTag(0xffffff) + var4, var7, var1, var2, var3);
}
}
}
for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
if (Client.menuOpcodes[var10] == 23) {
Client.menuTargetNames[var10] = ClientPreferences.colorStartTag(16777215) + var4;
Client.menuTargetNames[var10] = ClientPreferences.colorStartTag(0xffffff) + var4;
break;
}
}
@@ -38,8 +38,8 @@ public class WorldMapRegion {
@ObfuscatedGetter(
intValue = -862345975
)
@Export("regionx")
int regionx;
@Export("regionX")
int regionX;
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = -908569217
@@ -82,12 +82,12 @@ public class WorldMapRegion {
}
WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
this.regionx = var1;
this.regionX = var1;
this.regionY = var2;
this.worldMapData1List = new LinkedList();
this.icon0List = new LinkedList();
this.iconMap = new HashMap();
this.backgroundColor = var3 | -16777216;
this.backgroundColor = var3 | 0xff000000;
this.fonts = var4;
}
@@ -96,17 +96,18 @@ public class WorldMapRegion {
signature = "(IIII)V",
garbageValue = "1947241845"
)
void method506(int var1, int var2, int var3) {
Sprite var4 = PlayerType.getWorldMapRegionCachedSprite(this.regionx, this.regionY, this.pixelsPerTile);
if (var4 != null) {
if (var3 == this.pixelsPerTile * 64) {
var4.drawAt(var1, var2);
void method506(int x, int y, int size) {
Sprite var4 = PlayerType.getWorldMapRegionCachedSprite(this.regionX, this.regionY, this.pixelsPerTile);
if (var4 == null) {
return;
}
if (size == this.pixelsPerTile * 64) {
var4.drawAt(x, y);
} else {
var4.method6144(var1, var2, var3, var3);
var4.drawScaledWorldmap(x, y, size, size);
}
}
}
@ObfuscatedName("k")
@ObfuscatedSignature(
@@ -132,7 +133,7 @@ public class WorldMapRegion {
while (var3.hasNext()) {
WorldMapData_1 var4 = (WorldMapData_1)var3.next();
if (var4.getRegionX() == this.regionx && var4.getRegionY() == this.regionY) {
if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) {
this.worldMapData1List.add(var4);
}
}
@@ -199,7 +200,7 @@ public class WorldMapRegion {
)
@Export("getIcon")
void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
Coord var6 = new Coord(var2, var3 + this.regionx * 64, this.regionY * 64 + var4);
Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4);
Coord var7 = null;
if (this.worldMapData_0 != null) {
var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64);
@@ -212,7 +213,7 @@ public class WorldMapRegion {
if (var1.transforms != null) {
var10 = new WorldMapIcon_1(var7, var6, var1.id, this);
} else {
WorldMapElement var9 = class222.getWorldMapElement(var1.mapIconId);
WorldMapElement var9 = class222.WorldMapElement_get(var1.mapIconId);
var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9));
}
@@ -248,7 +249,7 @@ public class WorldMapRegion {
while (var2.hasNext()) {
WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next();
if (var3.coord2.x >> 6 == this.regionx && var3.coord2.y >> 6 == this.regionY) {
if (var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) {
WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method502(var3.element));
this.icon0List.add(var4);
}
@@ -321,7 +322,7 @@ public class WorldMapRegion {
void drawTile(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
this.pixelsPerTile = var1;
if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) {
if (PlayerType.getWorldMapRegionCachedSprite(this.regionx, this.regionY, var1) == null) {
if (PlayerType.getWorldMapRegionCachedSprite(this.regionX, this.regionY, var1) == null) {
boolean var6 = true;
var6 &= this.loadGeography(var4);
int var8;
@@ -349,7 +350,7 @@ public class WorldMapRegion {
this.method435(var2, var3, var9);
}
int var12 = this.regionx;
int var12 = this.regionX;
int var13 = this.regionY;
int var14 = this.pixelsPerTile;
WorldMapRegion_cachedSprites.put(var11, Widget.getWorldMapSpriteHash(var12, var13, var14), var11.pixels.length * 4);
@@ -378,21 +379,23 @@ public class WorldMapRegion {
signature = "(Ljava/util/HashSet;IIB)V",
garbageValue = "82"
)
void method433(HashSet var1, int var2, int var3) {
@Export("flashElements")
void flashElements(HashSet flashingElements, int flashCycle, int cyclesPerFlash) {
Iterator var4 = this.iconMap.values().iterator();
while (var4.hasNext()) {
AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
if (var5.hasValidElement()) {
int var6 = var5.getElement();
if (var1.contains(var6)) {
WorldMapElement var7 = class222.getWorldMapElement(var6);
this.method493(var7, var5.screenX, var5.screenY, var2, var3);
if (!var5.hasValidElement()) {
continue;
}
int var6 = var5.getElement();
if (flashingElements.contains(var6)) {
WorldMapElement var7 = class222.WorldMapElement_get(var6);
this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, flashCycle, cyclesPerFlash);
}
}
this.method443(var1, var2, var3);
this.method443(flashingElements, flashCycle, cyclesPerFlash);
}
@ObfuscatedName("a")
@@ -477,7 +480,7 @@ public class WorldMapRegion {
Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor);
}
int var8 = 16711935;
int var8 = 0xff00ff;
int var9;
if (var7 != -1) {
int var10 = this.backgroundColor;
@@ -500,7 +503,7 @@ public class WorldMapRegion {
if (var11 == null) {
var9 = var10;
} else if (var11.secondaryRgb >= 0) {
var9 = var11.secondaryRgb | -16777216;
var9 = var11.secondaryRgb | 0xff000000;
} else {
int var14;
byte var15;
@@ -531,8 +534,8 @@ public class WorldMapRegion {
var17 = var18 + (var14 & 65408);
}
var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216;
} else if (var11.primaryRgb == 16711935) {
var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | 0xff000000;
} else if (var11.primaryRgb == 0xff00ff) {
var9 = var10;
} else {
var17 = class192.method3679(var11.hue, var11.saturation, var11.lightness);
@@ -559,7 +562,7 @@ public class WorldMapRegion {
var14 = var18 + (var17 & 65408);
}
var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | -16777216;
var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | 0xff000000;
}
}
@@ -586,7 +589,9 @@ public class WorldMapRegion {
void method520(int var1, int var2, AbstractWorldMapData var3, class40 var4) {
for (int var5 = 1; var5 < var3.planes; ++var5) {
int var6 = var3.floorOverlayIds[var5][var1][var2] - 1;
if (var6 > -1) {
if (var6 <= -1) {
continue;
}
int var8 = this.backgroundColor;
FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6);
FloorOverlayDefinition var9;
@@ -608,7 +613,7 @@ public class WorldMapRegion {
if (var9 == null) {
var7 = var8;
} else if (var9.secondaryRgb >= 0) {
var7 = var9.secondaryRgb | -16777216;
var7 = var9.secondaryRgb | 0xff000000;
} else {
int var12;
byte var13;
@@ -639,8 +644,8 @@ public class WorldMapRegion {
var16 = var17 + (var12 & 65408);
}
var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
} else if (var9.primaryRgb == 16711935) {
var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | 0xff000000;
} else if (var9.primaryRgb == 0xff00ff) {
var7 = var8;
} else {
var16 = class192.method3679(var9.hue, var9.saturation, var9.lightness);
@@ -667,7 +672,7 @@ public class WorldMapRegion {
var12 = var17 + (var16 & 65408);
}
var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216;
var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | 0xff000000;
}
}
@@ -677,7 +682,6 @@ public class WorldMapRegion {
var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field165[var5][var1][var2], var3.field166[var5][var1][var2]);
}
}
}
}
@@ -812,7 +816,7 @@ public class WorldMapRegion {
if (var12 != null && var12.hasValidElement()) {
var12.screenX = var10;
var12.screenY = var11;
WorldMapElement var13 = class222.getWorldMapElement(var12.getElement());
WorldMapElement var13 = class222.WorldMapElement_get(var12.getElement());
if (!var3.contains(var13.getObjectId())) {
this.method445(var12, var10, var11, var5);
}
@@ -832,9 +836,9 @@ public class WorldMapRegion {
while (var4.hasNext()) {
AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
if (var5.hasValidElement()) {
WorldMapElement var6 = class222.getWorldMapElement(var5.getElement());
WorldMapElement var6 = class222.WorldMapElement_get(var5.getElement());
if (var6 != null && var1.contains(var6.getObjectId())) {
this.method493(var6, var5.screenX, var5.screenY, var2, var3);
this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3);
}
}
}
@@ -846,17 +850,19 @@ public class WorldMapRegion {
signature = "(Liw;IIIIB)V",
garbageValue = "14"
)
void method493(WorldMapElement var1, int var2, int var3, int var4, int var5) {
@Export("drawBackgroundCircle")
void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) {
Sprite var6 = var1.getSpriteBool(false);
if (var6 != null) {
var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2);
if (var6 == null) {
return;
}
var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2);
if (var4 % var5 < var5 / 2) {
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 0xffff00, 128);
Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 0xffffff, 256);
}
}
}
@ObfuscatedName("ag")
@ObfuscatedSignature(
@@ -864,7 +870,7 @@ public class WorldMapRegion {
garbageValue = "-89"
)
void method445(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
WorldMapElement var5 = class222.getWorldMapElement(var1.getElement());
WorldMapElement var5 = class222.WorldMapElement_get(var1.getElement());
this.method446(var5, var2, var3);
this.method447(var1, var5, var2, var3, var4);
}
@@ -879,7 +885,7 @@ public class WorldMapRegion {
if (var4 != null) {
int var5 = this.method455(var4, var1.horizontalAlignment);
int var6 = this.method450(var4, var1.verticalAlignment);
var4.drawAt2(var5 + var2, var3 + var6);
var4.drawTransBgAt(var5 + var2, var3 + var6);
}
}
@@ -891,11 +897,12 @@ public class WorldMapRegion {
)
void method447(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
WorldMapLabel var6 = var1.getLabel();
if (var6 != null) {
if (var6 == null) {
return;
}
if (var6.size.method184(var5)) {
Font var7 = (Font)this.fonts.get(var6.size);
var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3217, 0, 1, 0, var7.ascent / 2);
}
var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, 0xff000000 | var2.field3217, 0, 1, 0, var7.ascent / 2);
}
}
@@ -962,7 +969,7 @@ public class WorldMapRegion {
garbageValue = "1732767815"
)
WorldMapLabel method502(int var1) {
WorldMapElement var2 = class222.getWorldMapElement(var1);
WorldMapElement var2 = class222.WorldMapElement_get(var1);
return this.createMapLabel(var2);
}
@@ -1009,8 +1016,12 @@ public class WorldMapRegion {
)
List method440(int var1, int var2, int var3, int var4, int var5) {
LinkedList var6 = new LinkedList();
if (var4 >= var1 && var5 >= var2) {
if (var4 < var3 + var1 && var5 < var3 + var2) {
if (var4 < var1 || var5 < var2) {
return var6;
}
if (var4 >= var3 + var1 || var5 >= var3 + var2) {
return var6;
}
Iterator var7 = this.iconMap.values().iterator();
AbstractWorldMapIcon var8;
@@ -1032,10 +1043,6 @@ public class WorldMapRegion {
return var6;
}
return var6;
}
return var6;
}
@ObfuscatedName("ap")
@ObfuscatedSignature(
@@ -351,7 +351,7 @@ public class WorldMapSection0 implements WorldMapSection {
Rasterizer3D.method2976(16, 16);
Rasterizer3D.field1768 = false;
if (var9.placeholderTemplate != -1) {
var22.drawAt2(0, 0);
var22.drawTransBgAt(0, 0);
}
int var16 = var9.zoom2d;
@@ -366,7 +366,7 @@ public class WorldMapSection0 implements WorldMapSection {
var21.calculateBoundsCylinder();
var21.method2866(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
if (var9.notedId != -1) {
var22.drawAt2(0, 0);
var22.drawTransBgAt(0, 0);
}
if (var2 >= 1) {
@@ -374,7 +374,7 @@ public class WorldMapSection0 implements WorldMapSection {
}
if (var2 >= 2) {
var8.outline(16777215);
var8.outline(0xffffff);
}
if (var3 != 0) {
@@ -383,7 +383,7 @@ public class WorldMapSection0 implements WorldMapSection {
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
if (var9.noteTemplate != -1) {
var22.drawAt2(0, 0);
var22.drawTransBgAt(0, 0);
}
if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
@@ -397,7 +397,7 @@ public class WorldMapSection0 implements WorldMapSection {
var20 = "<col=00ff80>" + var1 / 1000000 + "M" + "</col>";
}
var19.draw(var20, 0, 9, 16776960, 1);
var19.draw(var20, 0, 9, 0xffff00, 1);
}
if (!var5) {
@@ -418,10 +418,16 @@ public class WorldMapSection0 implements WorldMapSection {
)
@Export("addSequenceSoundEffect")
static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) {
if (Client.soundEffectCount < 50 && Client.field892 != 0) {
if (var0.soundEffects != null && var1 < var0.soundEffects.length) {
if (Client.soundEffectCount >= 50 || Client.field892 == 0) {
return;
}
if (var0.soundEffects == null || var1 >= var0.soundEffects.length) {
return;
}
int var4 = var0.soundEffects[var1];
if (var4 != 0) {
if (var4 == 0) {
return;
}
int var5 = var4 >> 8;
int var6 = var4 >> 4 & 7;
int var7 = var4 & 15;
@@ -434,7 +440,4 @@ public class WorldMapSection0 implements WorldMapSection {
Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
++Client.soundEffectCount;
}
}
}
}
}
@@ -166,7 +166,9 @@ public class WorldMapSection1 implements WorldMapSection {
)
@Export("parseIntCustomRadix")
static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) {
if (var1 >= 2 && var1 <= 36) {
if (var1 < 2 || var1 > 36) {
throw new IllegalArgumentException("" + var1);
}
boolean var3 = false;
boolean var4 = false;
int var5 = 0;
@@ -190,12 +192,10 @@ public class WorldMapSection1 implements WorldMapSection {
var10 = var8 - '0';
} else if (var8 >= 'A' && var8 <= 'Z') {
var10 = var8 - '7';
} else {
if (var8 < 'a' || var8 > 'z') {
throw new NumberFormatException();
}
} else if (var8 >= 'a' && var8 <= 'z') {
var10 = var8 - 'W';
} else {
throw new NumberFormatException();
}
if (var10 >= var1) {
@@ -220,6 +220,4 @@ public class WorldMapSection1 implements WorldMapSection {
}
return var5;
}
throw new IllegalArgumentException("" + var1);
}
}
@@ -45,8 +45,8 @@ public final class WorldMapSprite {
signature = "(Lhp;I)V",
garbageValue = "-2096884458"
)
@Export("setFloorUnderlayDefinitionArchive")
public static void setFloorUnderlayDefinitionArchive(AbstractArchive var0) {
@Export("FloorUnderlayDefinition_setArchives")
public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) {
FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
}
@@ -57,8 +57,12 @@ public final class WorldMapSprite {
)
@Export("drawMenuActionTextAt")
static final void drawMenuActionTextAt(int var0, int var1) {
if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
if (Client.showMouseOverText) {
if (Client.menuOptionsCount < 2 && Client.isItemSelected == 0 && !Client.isSpellSelected) {
return;
}
if (!Client.showMouseOverText) {
return;
}
int var2 = class13.method151();
String var3;
if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
@@ -66,16 +70,14 @@ public final class WorldMapSprite {
} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
} else {
var3 = WorldMapLabel.method417(var2);
var3 = WorldMapLabel.getMenuText(var2);
}
if (Client.menuOptionsCount > 2) {
var3 = var3 + ClientPreferences.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
var3 = var3 + ClientPreferences.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
}
WorldMapIcon_1.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
}
}
WorldMapIcon_1.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000);
}
@ObfuscatedName("id")
@@ -87,14 +89,14 @@ public final class WorldMapSprite {
static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width;
int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height;
class13.resizeWidget(var0, var1.id, var3, var4, var2);
class13.resizeInterface(var0, var1.id, var3, var4, var2);
if (var1.children != null) {
class13.resizeWidget(var1.children, var1.id, var3, var4, var2);
class13.resizeInterface(var1.children, var1.id, var3, var4, var2);
}
InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
if (var5 != null) {
method416(var5.group, var3, var4, var2);
resizeComponents(var5.group, var3, var4, var2);
}
if (var1.contentType == 1337) {
@@ -107,9 +109,10 @@ public final class WorldMapSprite {
signature = "(IIIZI)V",
garbageValue = "-2115353122"
)
static final void method416(int var0, int var1, int var2, boolean var3) {
@Export("resizeComponents")
static final void resizeComponents(int var0, int var1, int var2, boolean var3) {
if (class162.loadInterface(var0)) {
class13.resizeWidget(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
class13.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
}
}
+4 -4
View File
@@ -369,7 +369,7 @@ final class class1 implements class0 {
if (var5 == 0) {
BoundaryObject var36 = GrandExchangeOfferWorldComparator.scene.method3088(class42.plane, var7, var8);
if (var36 != null) {
var39 = class43.method770(var36.tag);
var39 = class43.getObjectIdFromTag(var36.tag);
if (var3 == 2) {
var36.entity1 = new DynamicObject(var39, 2, var4 + 4, class42.plane, var7, var8, var9, false, var36.entity1);
var36.entity2 = new DynamicObject(var39, 2, var4 + 1 & 3, class42.plane, var7, var8, var9, false, var36.entity2);
@@ -382,7 +382,7 @@ final class class1 implements class0 {
if (var5 == 1) {
WallDecoration var43 = GrandExchangeOfferWorldComparator.scene.method3118(class42.plane, var7, var8);
if (var43 != null) {
var39 = class43.method770(var43.tag);
var39 = class43.getObjectIdFromTag(var43.tag);
if (var3 != 4 && var3 != 5) {
if (var3 == 6) {
var43.entity1 = new DynamicObject(var39, 4, var4 + 4, class42.plane, var7, var8, var9, false, var43.entity1);
@@ -405,14 +405,14 @@ final class class1 implements class0 {
}
if (var44 != null) {
var44.entity = new DynamicObject(class43.method770(var44.tag), var3, var4, class42.plane, var7, var8, var9, false, var44.entity);
var44.entity = new DynamicObject(class43.getObjectIdFromTag(var44.tag), var3, var4, class42.plane, var7, var8, var9, false, var44.entity);
}
}
if (var5 == 3) {
FloorDecoration var45 = GrandExchangeOfferWorldComparator.scene.getFloorDecoration(class42.plane, var7, var8);
if (var45 != null) {
var45.entity = new DynamicObject(class43.method770(var45.tag), 22, var4, class42.plane, var7, var8, var9, false, var45.entity);
var45.entity = new DynamicObject(class43.getObjectIdFromTag(var45.tag), 22, var4, class42.plane, var7, var8, var9, false, var45.entity);
}
}
}

Some files were not shown because too many files have changed in this diff Show More