2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-11 17:10:24 -07:00
Code Issues Projects Releases Packages Wiki Activity

Refactored Rasterizer, renamed GlTextureProvider to TextureProvider

Browse source
This commit is contained in:
Pazaz 2022-04-22 22:02:17 -04:00
parent f65909dc06
commit bed0932fc5
49 changed files with 3168 additions and 2885 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/Class3_Sub14.java
View file

@ -280,7 +280,7 @@ public final class Class3_Sub14 extends Node {
GlRenderer.setTextureId(-1); GlRenderer.setTextureId(-1);
Static27.setMaterial(0, 0); Static27.setMaterial(0, 0);
} else { } else {
Rasteriser.anInterface1_2.method3227(this.anInt2485); Rasteriser.textureProvider.method3227(this.anInt2485);
} }
@Pc(282) int local282 = this.aBoolean139 ? 40 : 36; @Pc(282) int local282 = this.aBoolean139 ? 40 : 36;
if (this.aClass155_3 == null) { if (this.aClass155_3 == null) {

28
client/src/main/java/GlModel.java
View file

@ -140,7 +140,7 @@ public final class GlModel extends Model {
@Pc(23) int[] local23 = new int[arg0.anInt2136]; @Pc(23) int[] local23 = new int[arg0.anInt2136];
this.anIntArray462 = new int[arg0.anInt2139 + 1]; this.anIntArray462 = new int[arg0.anInt2139 + 1];
for (@Pc(32) int local32 = 0; local32 < arg0.anInt2136; local32++) { for (@Pc(32) int local32 = 0; local32 < arg0.anInt2136; local32++) {
if ((arg0.aByteArray30 == null || arg0.aByteArray30[local32] != 2) && (arg0.aShortArray23 == null || arg0.aShortArray23[local32] == -1 || !Rasteriser.anInterface1_2.method3231(arg0.aShortArray23[local32] & 0xFFFF))) { if ((arg0.aByteArray30 == null || arg0.aByteArray30[local32] != 2) && (arg0.aShortArray23 == null || arg0.aShortArray23[local32] == -1 || !Rasteriser.textureProvider.method3231(arg0.aShortArray23[local32] & 0xFFFF))) {
local23[this.anInt5297++] = local32; local23[this.anInt5297++] = local32;
this.anIntArray462[arg0.anIntArray197[local32]]++; this.anIntArray462[arg0.anIntArray197[local32]]++;
this.anIntArray462[arg0.anIntArray200[local32]]++; this.anIntArray462[arg0.anIntArray200[local32]]++;
@ -162,11 +162,11 @@ public final class GlModel extends Model {
if (arg0.aShortArray23 != null) { if (arg0.aShortArray23 != null) {
local135 = arg0.aShortArray23[local125]; local135 = arg0.aShortArray23[local125];
if (local135 != -1) { if (local135 != -1) {
local131 = Rasteriser.anInterface1_2.method3237(local135 & 0xFFFF); local131 = Rasteriser.textureProvider.method3237(local135 & 0xFFFF);
local133 = Rasteriser.anInterface1_2.method3228(local135 & 0xFFFF); local133 = Rasteriser.textureProvider.method3228(local135 & 0xFFFF);
} }
} }
@Pc(182) boolean local182 = arg0.aByteArray26 != null && arg0.aByteArray26[local125] != 0 || local135 != -1 && !Rasteriser.anInterface1_2.method3226(local135 & 0xFFFF); @Pc(182) boolean local182 = arg0.aByteArray26 != null && arg0.aByteArray26[local125] != 0 || local135 != -1 && !Rasteriser.textureProvider.isOpaque(local135 & 0xFFFF);
if ((arg3 || local182) && arg0.aByteArray35 != null) { if ((arg3 || local182) && arg0.aByteArray35 != null) {
local127 += arg0.aByteArray35[local125] << 17; local127 += arg0.aByteArray35[local125] << 17;
} }
@ -648,20 +648,20 @@ public final class GlModel extends Model {
} }
@Pc(84) int local84 = arg7 * arg3 + arg5 * arg4 >> 16; @Pc(84) int local84 = arg7 * arg3 + arg5 * arg4 >> 16;
@Pc(90) int local90 = local84 + local13 << 9; @Pc(90) int local90 = local84 + local13 << 9;
if (local90 / local53 <= Static240.anInt5334) { if (local90 / local53 <= Static240.screenLowerX) {
return; return;
} }
@Pc(102) int local102 = local84 - local13 << 9; @Pc(102) int local102 = local84 - local13 << 9;
if (local102 / local53 >= Static247.anInt5405) { if (local102 / local53 >= Static247.screenUpperX) {
return; return;
} }
@Pc(118) int local118 = arg6 * arg2 - local31 * arg1 >> 16; @Pc(118) int local118 = arg6 * arg2 - local31 * arg1 >> 16;
@Pc(132) int local132 = local118 + (local13 * arg1 + local21 * arg2 >> 16) << 9; @Pc(132) int local132 = local118 + (local13 * arg1 + local21 * arg2 >> 16) << 9;
if (local132 / local53 <= Static1.anInt4) { if (local132 / local53 <= Static1.screenLowerY) {
return; return;
} }
@Pc(153) int local153 = local118 + (-local13 * arg1 + local17 * arg2 >> 16) << 9; @Pc(153) int local153 = local118 + (-local13 * arg1 + local17 * arg2 >> 16) << 9;
if (local153 / local53 >= Static148.anInt3535) { if (local153 / local53 >= Static148.screenUpperY) {
return; return;
} }
@Pc(161) int local161 = 0; @Pc(161) int local161 = 0;
@ -1745,14 +1745,14 @@ public final class GlModel extends Model {
local1 = 0; local1 = 0;
@Pc(22) int local22 = 0; @Pc(22) int local22 = 0;
if (arg0 != -1) { if (arg0 != -1) {
local1 = Rasteriser.anInterface1_2.method3238(arg0 & 0xFFFF); local1 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF);
local22 = Rasteriser.anInterface1_2.method3229(arg0 & 0xFFFF); local22 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF);
} }
@Pc(41) int local41 = 0; @Pc(41) int local41 = 0;
@Pc(43) int local43 = 0; @Pc(43) int local43 = 0;
if (arg1 != -1) { if (arg1 != -1) {
local41 = Rasteriser.anInterface1_2.method3238(arg1 & 0xFFFF); local41 = Rasteriser.textureProvider.method3238(arg1 & 0xFFFF);
local43 = Rasteriser.anInterface1_2.method3229(arg1 & 0xFFFF); local43 = Rasteriser.textureProvider.method3229(arg1 & 0xFFFF);
} }
if (local1 != local41 || local22 != local43) { if (local1 != local41 || local22 != local43) {
this.aClass127_1.aBoolean235 = false; this.aClass127_1.aBoolean235 = false;
@ -3072,7 +3072,7 @@ public final class GlModel extends Model {
GlRenderer.setTextureId(-1); GlRenderer.setTextureId(-1);
Static27.setMaterial(0, 0); Static27.setMaterial(0, 0);
} else { } else {
Rasteriser.anInterface1_2.method3227(local439 & 0xFFFF); Rasteriser.textureProvider.method3227(local439 & 0xFFFF);
} }
if (this.aClass127_5.aClass155_4 == null) { if (this.aClass127_5.aClass155_4 == null) {
this.aClass127_5.aByteBuffer8.position(local427 * 12); this.aClass127_5.aByteBuffer8.position(local427 * 12);
@ -3233,7 +3233,7 @@ public final class GlModel extends Model {
@Pc(322) int local322 = Static237.anIntArray467[local297]; @Pc(322) int local322 = Static237.anIntArray467[local297];
@Pc(326) int local326 = Static237.anIntArray467[local302]; @Pc(326) int local326 = Static237.anIntArray467[local302];
if ((local246 - local248) * (local322 - local326) - (local322 - local318) * (local258 - local248) > 0) { if ((local246 - local248) * (local322 - local326) - (local322 - local318) * (local258 - local248) > 0) {
Rasteriser.method1921(local151.aByteArray18, local318, local322, local326, local246, local248, local258, local134); Rasteriser.fillSpriteTriangle(local151.aByteArray18, local318, local322, local326, local246, local248, local258, local134);
} }
} }
} }

10
client/src/main/java/GlRenderer.java
View file

@ -544,10 +544,10 @@ public final class GlRenderer {
gl.glRotatef(arg7, 0.0F, 1.0F, 0.0F); gl.glRotatef(arg7, 0.0F, 1.0F, 0.0F);
} }
aBoolean266 = false; aBoolean266 = false;
Static240.anInt5334 = local7; Static240.screenLowerX = local7;
Static247.anInt5405 = local17; Static247.screenUpperX = local17;
Static1.anInt4 = local25; Static1.screenLowerY = local25;
Static148.anInt3535 = local35; Static148.screenUpperY = local35;
} }
@OriginalMember(owner = "client!tf", name = "d", descriptor = "(Z)V") @OriginalMember(owner = "client!tf", name = "d", descriptor = "(Z)V")
@ -658,7 +658,7 @@ public final class GlRenderer {
@Pc(8) GLCapabilities capabilities = new GLCapabilities(profile); @Pc(8) GLCapabilities capabilities = new GLCapabilities(profile);
if (numSamples > 0) { if (numSamples > 0) {
capabilities.setSampleBuffers(true); capabilities.setSampleBuffers(true);
capabilities.setNumSamples(numSamples); capabilities.setNumSamples(numSamples * 4);
} }
@Pc(18) GLDrawableFactory factory = GLDrawableFactory.getFactory(profile); @Pc(18) GLDrawableFactory factory = GLDrawableFactory.getFactory(profile);
AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), capabilities, capabilities); AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), capabilities, capabilities);

2
client/src/main/java/GlSolidColorTexture.java
View file

@ -25,7 +25,7 @@ public final class GlSolidColorTexture extends SecondaryNode {
this.anInt5058 = local12[0]; this.anInt5058 = local12[0];
this.anInt5059 = Static63.contextId; this.anInt5059 = Static63.contextId;
GlRenderer.setTextureId(this.anInt5058); GlRenderer.setTextureId(this.anInt5058);
@Pc(32) int local32 = Rasteriser.anIntArray220[arg0]; @Pc(32) int local32 = Rasteriser.palette[arg0];
@Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 }; @Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 };
@Pc(61) ByteBuffer local61 = ByteBuffer.wrap(local58); @Pc(61) ByteBuffer local61 = ByteBuffer.wrap(local58);
local9.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local61); local9.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local61);

10
client/src/main/java/GlTexture.java
View file

@ -78,7 +78,7 @@ public final class GlTexture extends SecondaryNode {
} }
@OriginalMember(owner = "client!uh", name = "a", descriptor = "(Lclient!m;IFLclient!ve;Z)[I") @OriginalMember(owner = "client!uh", name = "a", descriptor = "(Lclient!m;IFLclient!ve;Z)[I")
public final int[] method4295(@OriginalArg(0) GlTextureProvider arg0, @OriginalArg(2) float arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) boolean arg3) { public final int[] method4295(@OriginalArg(0) TextureProvider arg0, @OriginalArg(2) float arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) boolean arg3) {
if (this.anIntArray481 == null || this.aFloat35 != arg1) { if (this.anIntArray481 == null || this.aFloat35 != arg1) {
if (!this.aClass88_1.method2729(arg0, arg2)) { if (!this.aClass88_1.method2729(arg0, arg2)) {
return null; return null;
@ -167,7 +167,7 @@ public final class GlTexture extends SecondaryNode {
} }
@OriginalMember(owner = "client!uh", name = "a", descriptor = "(Lclient!ve;Lclient!m;IZ)Z") @OriginalMember(owner = "client!uh", name = "a", descriptor = "(Lclient!ve;Lclient!m;IZ)Z")
public final boolean method4296(@OriginalArg(0) Js5 arg0, @OriginalArg(1) GlTextureProvider arg1, @OriginalArg(3) boolean arg2) { public final boolean method4296(@OriginalArg(0) Js5 arg0, @OriginalArg(1) TextureProvider arg1, @OriginalArg(3) boolean arg2) {
if (!this.aClass88_1.method2729(arg1, arg0)) { if (!this.aClass88_1.method2729(arg1, arg0)) {
return false; return false;
} }
@ -189,7 +189,7 @@ public final class GlTexture extends SecondaryNode {
// gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR_MIPMAP_LINEAR); // gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR_MIPMAP_LINEAR);
// gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); // gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
// New code (OpenGL 3.0+) w/ texStorage // New code (OpenGL 4+?) w/ texStorage
int num_mipmaps = 4; int num_mipmaps = 4;
gl.glTexStorage2D(GL2.GL_TEXTURE_2D, num_mipmaps, GL2.GL_RGBA8, size, size); gl.glTexStorage2D(GL2.GL_TEXTURE_2D, num_mipmaps, GL2.GL_RGBA8, size, size);
gl.glTexSubImage2D(GL2.GL_TEXTURE_2D, 0, 0, 0, size, size, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, pixels); gl.glTexSubImage2D(GL2.GL_TEXTURE_2D, 0, 0, 0, size, size, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, pixels);
@ -263,7 +263,7 @@ public final class GlTexture extends SecondaryNode {
} }
@OriginalMember(owner = "client!uh", name = "a", descriptor = "(ZZLclient!m;Lclient!ve;)[I") @OriginalMember(owner = "client!uh", name = "a", descriptor = "(ZZLclient!m;Lclient!ve;)[I")
public final int[] method4297(@OriginalArg(1) boolean arg0, @OriginalArg(2) GlTextureProvider arg1, @OriginalArg(3) Js5 arg2) { public final int[] method4297(@OriginalArg(1) boolean arg0, @OriginalArg(2) TextureProvider arg1, @OriginalArg(3) Js5 arg2) {
if (this.aClass88_1.method2729(arg1, arg2)) { if (this.aClass88_1.method2729(arg1, arg2)) {
@Pc(24) int local24 = arg0 ? 64 : 128; @Pc(24) int local24 = arg0 ? 64 : 128;
return this.aClass88_1.method2725(local24, this.aBoolean288, local24, 1.0D, arg2, arg1, false); return this.aClass88_1.method2725(local24, this.aBoolean288, local24, 1.0D, arg2, arg1, false);
@ -273,7 +273,7 @@ public final class GlTexture extends SecondaryNode {
} }
@OriginalMember(owner = "client!uh", name = "a", descriptor = "(ILclient!m;Lclient!ve;)Z") @OriginalMember(owner = "client!uh", name = "a", descriptor = "(ILclient!m;Lclient!ve;)Z")
public final boolean method4299(@OriginalArg(1) GlTextureProvider arg0, @OriginalArg(2) Js5 arg1) { public final boolean method4299(@OriginalArg(1) TextureProvider arg0, @OriginalArg(2) Js5 arg1) {
return this.aClass88_1.method2729(arg0, arg1); return this.aClass88_1.method2729(arg0, arg1);
} }

8
client/src/main/java/Js5GlTextureProvider.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!nk") @OriginalClass("client!nk")
public final class Js5GlTextureProvider implements GlTextureProvider { public final class Js5GlTextureProvider implements TextureProvider {
@OriginalMember(owner = "client!nk", name = "z", descriptor = "Z") @OriginalMember(owner = "client!nk", name = "z", descriptor = "Z")
private boolean aBoolean200 = false; private boolean aBoolean200 = false;
@ -198,7 +198,7 @@ public final class Js5GlTextureProvider implements GlTextureProvider {
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(BI)Z") @OriginalMember(owner = "client!nk", name = "a", descriptor = "(BI)Z")
@Override @Override
public final boolean method3226(@OriginalArg(1) int arg0) { public final boolean isOpaque(@OriginalArg(1) int arg0) {
return this.aBooleanArray91[arg0]; return this.aBooleanArray91[arg0];
} }
@ -249,13 +249,13 @@ public final class Js5GlTextureProvider implements GlTextureProvider {
@OriginalMember(owner = "client!nk", name = "d", descriptor = "(II)I") @OriginalMember(owner = "client!nk", name = "d", descriptor = "(II)I")
@Override @Override
public final int method3234(@OriginalArg(0) int arg0) { public final int getAverageColor(@OriginalArg(0) int arg0) {
return this.aShortArray59[arg0] & 0xFFFF; return this.aShortArray59[arg0] & 0xFFFF;
} }
@OriginalMember(owner = "client!nk", name = "b", descriptor = "(BI)Z") @OriginalMember(owner = "client!nk", name = "b", descriptor = "(BI)Z")
@Override @Override
public final boolean method3233(@OriginalArg(1) int arg0) { public final boolean isLowDetail(@OriginalArg(1) int arg0) {
return this.aBoolean200 || this.aBooleanArray89[arg0]; return this.aBoolean200 || this.aBooleanArray89[arg0];
} }

2
client/src/main/java/Light.java
View file

@ -85,7 +85,7 @@ public final class Light {
for (local87 = 0; local87 < this.aShortArray30.length; local87++) { for (local87 = 0; local87 < this.aShortArray30.length; local87++) {
this.aShortArray30[local87] = (short) arg0.g2(); this.aShortArray30[local87] = (short) arg0.g2();
} }
this.anInt2247 = Rasteriser.anIntArray220[arg0.g2()]; this.anInt2247 = Rasteriser.palette[arg0.g2()];
local87 = arg0.g1(); local87 = arg0.g1();
this.anInt2249 = (local87 & 0xE0) << 3; this.anInt2249 = (local87 & 0xE0) << 3;
this.anInt2243 = local87 & 0x1F; this.anInt2243 = local87 & 0x1F;

4519
client/src/main/java/Rasteriser.java
View file

File diff suppressed because it is too large Load diff

256
client/src/main/java/SoftwareAlphaSprite.java
View file

@ -21,23 +21,23 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(33) int local33 = local21 * 256 >> 8; @Pc(33) int local33 = local21 * 256 >> 8;
@Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040; @Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040;
@Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10; @Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10;
@Pc(63) int local63 = arg0 + arg1 * Static129.anInt3144; @Pc(63) int local63 = arg0 + arg1 * Static129.width;
for (@Pc(65) int local65 = 0; local65 < 20; local65++) { for (@Pc(65) int local65 = 0; local65 < 20; local65++) {
@Pc(70) int local70 = local63; @Pc(70) int local70 = local63;
@Pc(72) int local72 = local45; @Pc(72) int local72 = local45;
@Pc(74) int local74 = local57; @Pc(74) int local74 = local57;
for (@Pc(77) int local77 = -20; local77 < 0; local77++) { for (@Pc(77) int local77 = -20; local77 < 0; local77++) {
@Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867]; @Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867];
@Pc(97) int local97 = Static129.anIntArray297[local70]; @Pc(97) int local97 = Static129.pixels[local70];
@Pc(101) int local101 = local93 >>> 24; @Pc(101) int local101 = local93 >>> 24;
@Pc(105) int local105 = 256 - local101; @Pc(105) int local105 = 256 - local101;
Static129.anIntArray297[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8; Static129.pixels[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8;
local72 += local33; local72 += local33;
local74 -= local27; local74 -= local27;
} }
local45 += local27; local45 += local27;
local57 += local33; local57 += local33;
local63 += Static129.anInt3144; local63 += Static129.width;
} }
} catch (@Pc(164) Exception local164) { } catch (@Pc(164) Exception local164) {
} }
@ -48,40 +48,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method319(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
} }
} }
@ -90,40 +90,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method319(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
} }
} }
@ -200,17 +200,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local166 = local166 + 15 >> 4; local166 = local166 + 15 >> 4;
local196 >>= 0x4; local196 >>= 0x4;
local198 = local198 + 15 >> 4; local198 = local198 + 15 >> 4;
if (local164 < Static129.anInt3145) { if (local164 < Static129.clipLeft) {
local164 = Static129.anInt3145; local164 = Static129.clipLeft;
} }
if (local166 > Static129.anInt3148) { if (local166 > Static129.clipRight) {
local166 = Static129.anInt3148; local166 = Static129.clipRight;
} }
if (local196 < Static129.anInt3147) { if (local196 < Static129.clipTop) {
local196 = Static129.anInt3147; local196 = Static129.clipTop;
} }
if (local198 > Static129.anInt3149) { if (local198 > Static129.clipBottom) {
local198 = Static129.anInt3149; local198 = Static129.clipBottom;
} }
local166 = local164 - local166; local166 = local164 - local166;
if (local166 >= 0) { if (local166 >= 0) {
@ -220,7 +220,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local198 >= 0) { if (local198 >= 0) {
return; return;
} }
@Pc(319) int local319 = local196 * Static129.anInt3144 + local164; @Pc(319) int local319 = local196 * Static129.width + local164;
@Pc(324) double local324 = 1.6777216E7D / (double) arg5; @Pc(324) double local324 = 1.6777216E7D / (double) arg5;
@Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D); @Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D);
@Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D); @Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D);
@ -260,17 +260,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local394++; local394++;
} }
} }
local384++; local384++;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -305,10 +305,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local504 += local333; local504 += local333;
local394++; local394++;
@ -316,7 +316,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -350,10 +350,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local504 += local333; local504 += local333;
local394++; local394++;
@ -361,7 +361,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} else if (local333 == 0) { } else if (local333 == 0) {
@ -383,17 +383,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local394++; local394++;
} }
} }
local384++; local384++;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -427,10 +427,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local504 += local333; local504 += local333;
local394++; local394++;
@ -438,7 +438,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -471,10 +471,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local802 += local342; local802 += local342;
local504 += local333; local504 += local333;
local394++; local394++;
@ -482,7 +482,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} else if (local333 == 0) { } else if (local333 == 0) {
@ -493,15 +493,15 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) { if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) {
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local394++; local394++;
} }
} }
local384++; local384++;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -523,17 +523,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local504 += local333; local504 += local333;
local394++; local394++;
} }
} }
local384++; local384++;
local368 -= local333; local368 -= local333;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -554,17 +554,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
} }
while (local394 < 0) { while (local394 < 0) {
local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)];
local436 = Static129.anIntArray297[local388]; local436 = Static129.pixels[local388];
local440 = local432 >>> 24; local440 = local432 >>> 24;
local444 = 256 - local440; local444 = 256 - local440;
Static129.anIntArray297[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8;
local504 += local333; local504 += local333;
local394++; local394++;
} }
} }
local384++; local384++;
local368 -= local333; local368 -= local333;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} }
@ -581,7 +581,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(39) int local39 = local27 * arg7 >> 8; @Pc(39) int local39 = local27 * arg7 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.anInt3144; @Pc(69) int local69 = arg0 + arg1 * Static129.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg8[local71]; @Pc(78) int local78 = arg8[local71];
@Pc(82) int local82 = local69 + local78; @Pc(82) int local82 = local69 + local78;
@ -589,16 +589,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; @Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = Static129.anIntArray297[local82]; @Pc(119) int local119 = Static129.pixels[local82];
@Pc(123) int local123 = local115 >>> 24; @Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123; @Pc(127) int local127 = 256 - local123;
Static129.anIntArray297[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
local88 += local39; local88 += local39;
local94 -= local33; local94 -= local33;
} }
local51 += local33; local51 += local33;
local63 += local39; local63 += local39;
local69 += Static129.anInt3144; local69 += Static129.width;
} }
} catch (@Pc(186) Exception local186) { } catch (@Pc(186) Exception local186) {
} }
@ -616,7 +616,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(39) int local39 = local27 * 256 >> 8; @Pc(39) int local39 = local27 * 256 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.anInt3144; @Pc(69) int local69 = arg0 + arg1 * Static129.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg7[local71]; @Pc(78) int local78 = arg7[local71];
@Pc(82) int local82 = local69 + local78; @Pc(82) int local82 = local69 + local78;
@ -624,16 +624,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) {
@Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; @Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
@Pc(119) int local119 = Static129.anIntArray297[local82]; @Pc(119) int local119 = Static129.pixels[local82];
@Pc(123) int local123 = local115 >>> 24; @Pc(123) int local123 = local115 >>> 24;
@Pc(127) int local127 = 256 - local123; @Pc(127) int local127 = 256 - local123;
Static129.anIntArray297[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8;
local88 += local39; local88 += local39;
local94 -= local33; local94 -= local33;
} }
local51 += local33; local51 += local33;
local63 += local39; local63 += local39;
local69 += Static129.anInt3144; local69 += Static129.width;
} }
} catch (@Pc(186) Exception local186) { } catch (@Pc(186) Exception local186) {
} }
@ -670,31 +670,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local10 < local20) { if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
} }
local46 = arg0 + arg1 * Static129.anInt3144; local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.anInt3144 - arg2; @Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(150) int local150; @Pc(150) int local150;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local150 = Static129.anInt3147 - arg1; local150 = Static129.clipTop - arg1;
arg3 -= local150; arg3 -= local150;
local46 += local150 * Static129.anInt3144; local46 += local150 * Static129.width;
local14 += local32 * local150; local14 += local32 * local150;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.anInt3148; local150 = arg0 + arg2 - Static129.clipRight;
arg2 -= local150; arg2 -= local150;
local130 += local150; local130 += local150;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local150 = Static129.anInt3145 - arg0; local150 = Static129.clipLeft - arg0;
arg2 -= local150; arg2 -= local150;
local46 += local150; local46 += local150;
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static283.method317(Static129.anIntArray297, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); Static283.method317(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
} }
@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V") @OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V")
@ -728,31 +728,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
if (local10 < local20) { if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
} }
local46 = arg0 + arg1 * Static129.anInt3144; local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.anInt3144 - arg2; @Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(150) int local150; @Pc(150) int local150;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local150 = Static129.anInt3147 - arg1; local150 = Static129.clipTop - arg1;
arg3 -= local150; arg3 -= local150;
local46 += local150 * Static129.anInt3144; local46 += local150 * Static129.width;
local14 += local32 * local150; local14 += local32 * local150;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.anInt3148; local150 = arg0 + arg2 - Static129.clipRight;
arg2 -= local150; arg2 -= local150;
local130 += local150; local130 += local150;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local150 = Static129.anInt3145 - arg0; local150 = Static129.clipLeft - arg0;
arg2 -= local150; arg2 -= local150;
local46 += local150; local46 += local150;
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static283.method321(Static129.anIntArray297, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); Static283.method321(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
} }
@OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V") @OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V")
@ -760,40 +760,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863; arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(21) int local21 = arg0 + arg1 * Static129.anInt3144; @Pc(21) int local21 = arg0 + arg1 * Static129.width;
@Pc(26) int local26 = this.anInt1867 - 1; @Pc(26) int local26 = this.anInt1867 - 1;
@Pc(29) int local29 = this.anInt1859; @Pc(29) int local29 = this.anInt1859;
@Pc(32) int local32 = this.anInt1867; @Pc(32) int local32 = this.anInt1867;
@Pc(36) int local36 = Static129.anInt3144 - local32; @Pc(36) int local36 = Static129.width - local32;
@Pc(40) int local40 = local32 + local32; @Pc(40) int local40 = local32 + local32;
@Pc(47) int local47; @Pc(47) int local47;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local47 = Static129.anInt3147 - arg1; local47 = Static129.clipTop - arg1;
local29 -= local47; local29 -= local47;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local26 += local47 * local32; local26 += local47 * local32;
local21 += local47 * Static129.anInt3144; local21 += local47 * Static129.width;
} }
if (arg1 + local29 > Static129.anInt3149) { if (arg1 + local29 > Static129.clipBottom) {
local29 -= arg1 + local29 - Static129.anInt3149; local29 -= arg1 + local29 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local47 = Static129.anInt3145 - arg0; local47 = Static129.clipLeft - arg0;
local32 -= local47; local32 -= local47;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local26 -= local47; local26 -= local47;
local21 += local47; local21 += local47;
local40 -= local47; local40 -= local47;
local36 += local47; local36 += local47;
} }
if (arg0 + local32 > Static129.anInt3148) { if (arg0 + local32 > Static129.clipRight) {
local47 = arg0 + local32 - Static129.anInt3148; local47 = arg0 + local32 - Static129.clipRight;
local32 -= local47; local32 -= local47;
local40 -= local47; local40 -= local47;
local36 += local47; local36 += local47;
} }
if (local32 > 0 && local29 > 0) { if (local32 > 0 && local29 > 0) {
Static283.method318(Static129.anIntArray297, this.anIntArray20, local26, local21, local32, local29, local36, local40); Static283.method318(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
} }
} }
@ -802,40 +802,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
public final void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public final void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static283.method320(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); Static283.method320(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
} }
} }
} }

58
client/src/main/java/SoftwareFont.java
View file

@ -23,70 +23,70 @@ public final class SoftwareFont extends Font {
@OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIIZ)V") @OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIIZ)V")
@Override @Override
protected final void renderGlyphTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { protected final void renderGlyphTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(5) int local5 = arg1 + arg2 * Static129.anInt3144; @Pc(5) int local5 = arg1 + arg2 * Static129.width;
@Pc(9) int local9 = Static129.anInt3144 - arg3; @Pc(9) int local9 = Static129.width - arg3;
@Pc(11) int local11 = 0; @Pc(11) int local11 = 0;
@Pc(13) int local13 = 0; @Pc(13) int local13 = 0;
@Pc(20) int local20; @Pc(20) int local20;
if (arg2 < Static129.anInt3147) { if (arg2 < Static129.clipTop) {
local20 = Static129.anInt3147 - arg2; local20 = Static129.clipTop - arg2;
arg4 -= local20; arg4 -= local20;
arg2 = Static129.anInt3147; arg2 = Static129.clipTop;
local13 = local20 * arg3; local13 = local20 * arg3;
local5 += local20 * Static129.anInt3144; local5 += local20 * Static129.width;
} }
if (arg2 + arg4 > Static129.anInt3149) { if (arg2 + arg4 > Static129.clipBottom) {
arg4 -= arg2 + arg4 - Static129.anInt3149; arg4 -= arg2 + arg4 - Static129.clipBottom;
} }
if (arg1 < Static129.anInt3145) { if (arg1 < Static129.clipLeft) {
local20 = Static129.anInt3145 - arg1; local20 = Static129.clipLeft - arg1;
arg3 -= local20; arg3 -= local20;
arg1 = Static129.anInt3145; arg1 = Static129.clipLeft;
local13 += local20; local13 += local20;
local5 += local20; local5 += local20;
local11 = local20; local11 = local20;
local9 += local20; local9 += local20;
} }
if (arg1 + arg3 > Static129.anInt3148) { if (arg1 + arg3 > Static129.clipRight) {
local20 = arg1 + arg3 - Static129.anInt3148; local20 = arg1 + arg3 - Static129.clipRight;
arg3 -= local20; arg3 -= local20;
local11 += local20; local11 += local20;
local9 += local20; local9 += local20;
} }
if (arg3 > 0 && arg4 > 0) { if (arg3 > 0 && arg4 > 0) {
Static285.method1139(Static129.anIntArray297, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6); Static285.method1139(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6);
} }
} }
@OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIZ)V") @OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIZ)V")
@Override @Override
protected final void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { protected final void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
@Pc(5) int local5 = arg1 + arg2 * Static129.anInt3144; @Pc(5) int local5 = arg1 + arg2 * Static129.width;
@Pc(9) int local9 = Static129.anInt3144 - arg3; @Pc(9) int local9 = Static129.width - arg3;
@Pc(11) int local11 = 0; @Pc(11) int local11 = 0;
@Pc(13) int local13 = 0; @Pc(13) int local13 = 0;
@Pc(20) int local20; @Pc(20) int local20;
if (arg2 < Static129.anInt3147) { if (arg2 < Static129.clipTop) {
local20 = Static129.anInt3147 - arg2; local20 = Static129.clipTop - arg2;
arg4 -= local20; arg4 -= local20;
arg2 = Static129.anInt3147; arg2 = Static129.clipTop;
local13 = local20 * arg3; local13 = local20 * arg3;
local5 += local20 * Static129.anInt3144; local5 += local20 * Static129.width;
} }
if (arg2 + arg4 > Static129.anInt3149) { if (arg2 + arg4 > Static129.clipBottom) {
arg4 -= arg2 + arg4 - Static129.anInt3149; arg4 -= arg2 + arg4 - Static129.clipBottom;
} }
if (arg1 < Static129.anInt3145) { if (arg1 < Static129.clipLeft) {
local20 = Static129.anInt3145 - arg1; local20 = Static129.clipLeft - arg1;
arg3 -= local20; arg3 -= local20;
arg1 = Static129.anInt3145; arg1 = Static129.clipLeft;
local13 += local20; local13 += local20;
local5 += local20; local5 += local20;
local11 = local20; local11 = local20;
local9 += local20; local9 += local20;
} }
if (arg1 + arg3 > Static129.anInt3148) { if (arg1 + arg3 > Static129.clipRight) {
local20 = arg1 + arg3 - Static129.anInt3148; local20 = arg1 + arg3 - Static129.clipRight;
arg3 -= local20; arg3 -= local20;
local11 += local20; local11 += local20;
local9 += local20; local9 += local20;
@ -95,9 +95,9 @@ public final class SoftwareFont extends Font {
return; return;
} }
if (Static129.anIntArray295 == null) { if (Static129.anIntArray295 == null) {
Static285.method1137(Static129.anIntArray297, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11); Static285.method1137(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11);
} else { } else {
Static285.method1138(Static129.anIntArray297, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, Static129.anIntArray295, Static129.anIntArray296); Static285.method1138(Static129.pixels, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, Static129.anIntArray295, Static129.anIntArray296);
} }
} }
} }

104
client/src/main/java/SoftwareIndexedSprite.java
View file

@ -88,31 +88,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
if (local5 < local15) { if (local5 < local15) {
arg3 = ((local5 << 16) + local27 - local9 - 1) / local27; arg3 = ((local5 << 16) + local27 - local9 - 1) / local27;
} }
local41 = arg0 + arg1 * Static129.anInt3144; local41 = arg0 + arg1 * Static129.width;
@Pc(125) int local125 = Static129.anInt3144 - arg2; @Pc(125) int local125 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(145) int local145; @Pc(145) int local145;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local145 = Static129.anInt3147 - arg1; local145 = Static129.clipTop - arg1;
arg3 -= local145; arg3 -= local145;
local41 += local145 * Static129.anInt3144; local41 += local145 * Static129.width;
local9 += local27 * local145; local9 += local27 * local145;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local145 = arg0 + arg2 - Static129.anInt3148; local145 = arg0 + arg2 - Static129.clipRight;
arg2 -= local145; arg2 -= local145;
local125 += local145; local125 += local145;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local145 = Static129.anInt3145 - arg0; local145 = Static129.clipLeft - arg0;
arg2 -= local145; arg2 -= local145;
local41 += local145; local41 += local145;
local7 += local21 * local145; local7 += local21 * local145;
local125 += local145; local125 += local145;
} }
Static286.method1394(Static129.anIntArray297, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4); Static286.method1394(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4);
} }
@OriginalMember(owner = "client!ek", name = "a", descriptor = "()V") @OriginalMember(owner = "client!ek", name = "a", descriptor = "()V")
@ -162,40 +162,40 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
public final void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public final void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt4280; arg0 += this.anInt4280;
arg1 += this.anInt4273; arg1 += this.anInt4273;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt4278; @Pc(20) int local20 = this.anInt4278;
@Pc(23) int local23 = this.anInt4270; @Pc(23) int local23 = this.anInt4270;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static286.method1397(Static129.anIntArray297, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2); Static286.method1397(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2);
} }
} }
@ -245,31 +245,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
if (local5 < local15) { if (local5 < local15) {
arg3 = ((local5 << 16) + local27 - local9 - 1) / local27; arg3 = ((local5 << 16) + local27 - local9 - 1) / local27;
} }
local41 = arg0 + arg1 * Static129.anInt3144; local41 = arg0 + arg1 * Static129.width;
@Pc(125) int local125 = Static129.anInt3144 - arg2; @Pc(125) int local125 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(145) int local145; @Pc(145) int local145;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local145 = Static129.anInt3147 - arg1; local145 = Static129.clipTop - arg1;
arg3 -= local145; arg3 -= local145;
local41 += local145 * Static129.anInt3144; local41 += local145 * Static129.width;
local9 += local27 * local145; local9 += local27 * local145;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local145 = arg0 + arg2 - Static129.anInt3148; local145 = arg0 + arg2 - Static129.clipRight;
arg2 -= local145; arg2 -= local145;
local125 += local145; local125 += local145;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local145 = Static129.anInt3145 - arg0; local145 = Static129.clipLeft - arg0;
arg2 -= local145; arg2 -= local145;
local41 += local145; local41 += local145;
local7 += local21 * local145; local7 += local21 * local145;
local125 += local145; local125 += local145;
} }
Static286.method1391(Static129.anIntArray297, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2); Static286.method1391(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2);
} }
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(II)V") @OriginalMember(owner = "client!ek", name = "a", descriptor = "(II)V")
@ -277,40 +277,40 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
public final void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public final void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt4280; arg0 += this.anInt4280;
arg1 += this.anInt4273; arg1 += this.anInt4273;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt4278; @Pc(20) int local20 = this.anInt4278;
@Pc(23) int local23 = this.anInt4270; @Pc(23) int local23 = this.anInt4270;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static286.method1393(Static129.anIntArray297, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29); Static286.method1393(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29);
} }
} }
} }

84
client/src/main/java/SoftwareModel.java
View file

@ -159,7 +159,7 @@ public final class SoftwareModel extends Model {
this.aShortArray92 = new short[this.anInt5787]; this.aShortArray92 = new short[this.anInt5787];
for (local133 = 0; local133 < this.anInt5787; local133++) { for (local133 = 0; local133 < this.anInt5787; local133++) {
@Pc(142) short local142 = arg0.aShortArray23[local133]; @Pc(142) short local142 = arg0.aShortArray23[local133];
if (local142 != -1 && Rasteriser.anInterface1_2.method3236(local142)) { if (local142 != -1 && Rasteriser.textureProvider.method3236(local142)) {
this.aShortArray92[local133] = local142; this.aShortArray92[local133] = local142;
} else { } else {
this.aShortArray92[local133] = -1; this.aShortArray92[local133] = -1;
@ -429,11 +429,11 @@ public final class SoftwareModel extends Model {
@Pc(12) int local12 = this.anIntArray534[arg0]; @Pc(12) int local12 = this.anIntArray534[arg0];
@Pc(17) int local17 = this.anIntArray524[arg0]; @Pc(17) int local17 = this.anIntArray524[arg0];
@Pc(22) int local22 = this.anIntArray529[arg0]; @Pc(22) int local22 = this.anIntArray529[arg0];
Rasteriser.aBoolean138 = Static268.aBooleanArray133[arg0]; Rasteriser.testX = Static268.aBooleanArray133[arg0];
if (this.aByteArray75 == null) { if (this.aByteArray75 == null) {
Rasteriser.anInt2473 = 0; Rasteriser.alpha = 0;
} else { } else {
Rasteriser.anInt2473 = this.aByteArray75[arg0] & 0xFF; Rasteriser.alpha = this.aByteArray75[arg0] & 0xFF;
} }
if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) {
@Pc(141) int local141; @Pc(141) int local141;
@ -450,14 +450,14 @@ public final class SoftwareModel extends Model {
local151 = this.anIntArray525[local136]; local151 = this.anIntArray525[local136];
} }
if (this.anIntArray532[arg0] == -1) { if (this.anIntArray532[arg0] == -1) {
Rasteriser.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); Rasteriser.fillTexturedAlphaTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]);
} else { } else {
Rasteriser.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); Rasteriser.fillTexturedAlphaTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]);
} }
} else if (this.anIntArray532[arg0] == -1) { } else if (this.anIntArray532[arg0] == -1) {
Rasteriser.method1918(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); Rasteriser.fillTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF]);
} else { } else {
Rasteriser.method1928(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF); Rasteriser.fillGouraudTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF);
} }
} }
@ -631,27 +631,27 @@ public final class SoftwareModel extends Model {
} }
@Pc(71) int local71 = arg7 * arg3 + arg5 * arg4 >> 16; @Pc(71) int local71 = arg7 * arg3 + arg5 * arg4 >> 16;
@Pc(78) int local78 = local71 + this.aShort34 << 9; @Pc(78) int local78 = local71 + this.aShort34 << 9;
if (local78 / local38 <= Static240.anInt5334) { if (local78 / local38 <= Static240.screenLowerX) {
return; return;
} }
@Pc(91) int local91 = local71 - this.aShort34 << 9; @Pc(91) int local91 = local71 - this.aShort34 << 9;
if (local91 / local38 >= Static247.anInt5405) { if (local91 / local38 >= Static247.screenUpperX) {
return; return;
} }
@Pc(107) int local107 = arg6 * arg2 - local14 * arg1 >> 16; @Pc(107) int local107 = arg6 * arg2 - local14 * arg1 >> 16;
@Pc(123) int local123 = local107 + (this.aShort34 * arg1 + this.aShort37 * arg2 >> 16) << 9; @Pc(123) int local123 = local107 + (this.aShort34 * arg1 + this.aShort37 * arg2 >> 16) << 9;
if (local123 / local38 <= Static1.anInt4) { if (local123 / local38 <= Static1.screenLowerY) {
return; return;
} }
@Pc(146) int local146 = local107 + (-this.aShort34 * arg1 + this.aShort38 * arg2 >> 16) << 9; @Pc(146) int local146 = local107 + (-this.aShort34 * arg1 + this.aShort38 * arg2 >> 16) << 9;
if (local146 / local38 >= Static148.anInt3535) { if (local146 / local38 >= Static148.screenUpperY) {
return; return;
} }
@Pc(154) boolean local154 = false; @Pc(154) boolean local154 = false;
@Pc(161) boolean local161 = local53 <= 50; @Pc(161) boolean local161 = local53 <= 50;
@Pc(170) boolean local170 = local161 || this.anInt5789 > 0; @Pc(170) boolean local170 = local161 || this.anInt5789 > 0;
@Pc(172) int local172 = Rasteriser.anInt2471; @Pc(172) int local172 = Rasteriser.centerX;
@Pc(174) int local174 = Rasteriser.anInt2469; @Pc(174) int local174 = Rasteriser.centerY;
@Pc(176) int local176 = 0; @Pc(176) int local176 = 0;
@Pc(178) int local178 = 0; @Pc(178) int local178 = 0;
if (arg0 != 0) { if (arg0 != 0) {
@ -937,8 +937,8 @@ public final class SoftwareModel extends Model {
if (!this.aBoolean305) { if (!this.aBoolean305) {
this.method4592(); this.method4592();
} }
@Pc(6) int local6 = Rasteriser.anInt2471; @Pc(6) int local6 = Rasteriser.centerX;
@Pc(8) int local8 = Rasteriser.anInt2469; @Pc(8) int local8 = Rasteriser.centerY;
@Pc(12) int local12 = MathUtils.anIntArray223[0]; @Pc(12) int local12 = MathUtils.anIntArray223[0];
@Pc(16) int local16 = MathUtils.anIntArray225[0]; @Pc(16) int local16 = MathUtils.anIntArray225[0];
@Pc(20) int local20 = MathUtils.anIntArray223[arg0]; @Pc(20) int local20 = MathUtils.anIntArray223[arg0];
@ -984,8 +984,8 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "g", descriptor = "(I)V") @OriginalMember(owner = "client!w", name = "g", descriptor = "(I)V")
private void method4587(@OriginalArg(0) int arg0) { private void method4587(@OriginalArg(0) int arg0) {
@Pc(1) int local1 = Rasteriser.anInt2471; @Pc(1) int local1 = Rasteriser.centerX;
@Pc(3) int local3 = Rasteriser.anInt2469; @Pc(3) int local3 = Rasteriser.centerY;
@Pc(5) int local5 = 0; @Pc(5) int local5 = 0;
@Pc(10) int local10 = this.anIntArray534[arg0]; @Pc(10) int local10 = this.anIntArray534[arg0];
@Pc(15) int local15 = this.anIntArray524[arg0]; @Pc(15) int local15 = this.anIntArray524[arg0];
@ -994,9 +994,9 @@ public final class SoftwareModel extends Model {
@Pc(28) int local28 = Static268.anIntArray544[local15]; @Pc(28) int local28 = Static268.anIntArray544[local15];
@Pc(32) int local32 = Static268.anIntArray544[local20]; @Pc(32) int local32 = Static268.anIntArray544[local20];
if (this.aByteArray75 == null) { if (this.aByteArray75 == null) {
Rasteriser.anInt2473 = 0; Rasteriser.alpha = 0;
} else { } else {
Rasteriser.anInt2473 = this.aByteArray75[arg0] & 0xFF; Rasteriser.alpha = this.aByteArray75[arg0] & 0xFF;
} }
@Pc(75) int local75; @Pc(75) int local75;
@Pc(79) int local79; @Pc(79) int local79;
@ -1073,14 +1073,14 @@ public final class SoftwareModel extends Model {
local99 = Static268.anIntArray547[0]; local99 = Static268.anIntArray547[0];
@Pc(614) int local614 = Static268.anIntArray547[1]; @Pc(614) int local614 = Static268.anIntArray547[1];
@Pc(618) int local618 = Static268.anIntArray547[2]; @Pc(618) int local618 = Static268.anIntArray547[2];
Rasteriser.aBoolean138 = false; Rasteriser.testX = false;
@Pc(709) int local709; @Pc(709) int local709;
@Pc(714) int local714; @Pc(714) int local714;
@Pc(719) int local719; @Pc(719) int local719;
@Pc(704) int local704; @Pc(704) int local704;
if (local5 == 3) { if (local5 == 3) {
if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.anInt2472 || local79 > Rasteriser.anInt2472 || local86 > Rasteriser.anInt2472) { if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.width || local79 > Rasteriser.width || local86 > Rasteriser.width) {
Rasteriser.aBoolean138 = true; Rasteriser.testX = true;
} }
if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) {
if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) { if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) {
@ -1094,21 +1094,21 @@ public final class SoftwareModel extends Model {
local719 = this.anIntArray525[local704]; local719 = this.anIntArray525[local704];
} }
if (this.anIntArray532[arg0] == -1) { if (this.anIntArray532[arg0] == -1) {
Rasteriser.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]);
} else { } else {
Rasteriser.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]);
} }
} else if (this.anIntArray532[arg0] == -1) { } else if (this.anIntArray532[arg0] == -1) {
Rasteriser.method1918(local99, local614, local618, local75, local79, local86, Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); Rasteriser.fillTriangle(local99, local614, local618, local75, local79, local86, Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF]);
} else { } else {
Rasteriser.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]);
} }
} }
if (local5 != 4) { if (local5 != 4) {
return; return;
} }
if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.anInt2472 || local79 > Rasteriser.anInt2472 || local86 > Rasteriser.anInt2472 || Static268.anIntArray542[3] < 0 || Static268.anIntArray542[3] > Rasteriser.anInt2472) { if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.width || local79 > Rasteriser.width || local86 > Rasteriser.width || Static268.anIntArray542[3] < 0 || Static268.anIntArray542[3] > Rasteriser.width) {
Rasteriser.aBoolean138 = true; Rasteriser.testX = true;
} }
if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) {
if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) { if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) {
@ -1123,19 +1123,19 @@ public final class SoftwareModel extends Model {
} }
@Pc(984) short local984 = this.aShortArray92[arg0]; @Pc(984) short local984 = this.aShortArray92[arg0];
if (this.anIntArray532[arg0] == -1) { if (this.anIntArray532[arg0] == -1) {
Rasteriser.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
Rasteriser.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); Rasteriser.fillTexturedAlphaTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
} else { } else {
Rasteriser.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
Rasteriser.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); Rasteriser.fillTexturedAlphaTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
} }
} else if (this.anIntArray532[arg0] == -1) { } else if (this.anIntArray532[arg0] == -1) {
local709 = Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]; local709 = Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF];
Rasteriser.method1918(local99, local614, local618, local75, local79, local86, local709); Rasteriser.fillTriangle(local99, local614, local618, local75, local79, local86, local709);
Rasteriser.method1918(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], local709); Rasteriser.fillTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], local709);
} else { } else {
Rasteriser.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]);
Rasteriser.method1928(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3]); Rasteriser.fillGouraudTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3]);
} }
} }
@ -1487,13 +1487,13 @@ public final class SoftwareModel extends Model {
} }
} }
} else { } else {
if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.anInt2471, Static34.anInt1053 + Rasteriser.anInt2469, Static268.anIntArray551[local51], Static268.anIntArray551[local56], Static268.anIntArray551[local61], local65, local69, local73)) { if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, Static268.anIntArray551[local51], Static268.anIntArray551[local56], Static268.anIntArray551[local61], local65, local69, local73)) {
Static259.aLongArray11[Static2.anInt7++] = arg2; Static259.aLongArray11[Static2.anInt7++] = arg2;
arg1 = false; arg1 = false;
} }
if ((local65 - local69) * (Static268.anIntArray551[local61] - Static268.anIntArray551[local56]) - (Static268.anIntArray551[local51] - Static268.anIntArray551[local56]) * (local73 - local69) > 0) { if ((local65 - local69) * (Static268.anIntArray551[local61] - Static268.anIntArray551[local56]) - (Static268.anIntArray551[local51] - Static268.anIntArray551[local56]) * (local73 - local69) > 0) {
Static268.aBooleanArray132[local11] = false; Static268.aBooleanArray132[local11] = false;
if (local65 >= 0 && local69 >= 0 && local73 >= 0 && local65 <= Rasteriser.anInt2472 && local69 <= Rasteriser.anInt2472 && local73 <= Rasteriser.anInt2472) { if (local65 >= 0 && local69 >= 0 && local73 >= 0 && local65 <= Rasteriser.width && local69 <= Rasteriser.width && local73 <= Rasteriser.width) {
Static268.aBooleanArray133[local11] = false; Static268.aBooleanArray133[local11] = false;
} else { } else {
Static268.aBooleanArray133[local11] = true; Static268.aBooleanArray133[local11] = true;
@ -1739,8 +1739,8 @@ public final class SoftwareModel extends Model {
if (!this.aBoolean305) { if (!this.aBoolean305) {
this.method4592(); this.method4592();
} }
@Pc(6) int local6 = Rasteriser.anInt2471; @Pc(6) int local6 = Rasteriser.centerX;
@Pc(8) int local8 = Rasteriser.anInt2469; @Pc(8) int local8 = Rasteriser.centerY;
@Pc(12) int local12 = MathUtils.anIntArray223[0]; @Pc(12) int local12 = MathUtils.anIntArray223[0];
@Pc(16) int local16 = MathUtils.anIntArray225[0]; @Pc(16) int local16 = MathUtils.anIntArray225[0];
@Pc(20) int local20 = MathUtils.anIntArray223[arg0]; @Pc(20) int local20 = MathUtils.anIntArray223[arg0];

266
client/src/main/java/SoftwareSprite.java
View file

@ -82,40 +82,40 @@ public class SoftwareSprite extends Sprite {
public void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method305(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static290.method305(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
} }
} }
@ -206,17 +206,17 @@ public class SoftwareSprite extends Sprite {
local166 = local166 + 15 >> 4; local166 = local166 + 15 >> 4;
local196 >>= 0x4; local196 >>= 0x4;
local198 = local198 + 15 >> 4; local198 = local198 + 15 >> 4;
if (local164 < Static129.anInt3145) { if (local164 < Static129.clipLeft) {
local164 = Static129.anInt3145; local164 = Static129.clipLeft;
} }
if (local166 > Static129.anInt3148) { if (local166 > Static129.clipRight) {
local166 = Static129.anInt3148; local166 = Static129.clipRight;
} }
if (local196 < Static129.anInt3147) { if (local196 < Static129.clipTop) {
local196 = Static129.anInt3147; local196 = Static129.clipTop;
} }
if (local198 > Static129.anInt3149) { if (local198 > Static129.clipBottom) {
local198 = Static129.anInt3149; local198 = Static129.clipBottom;
} }
local166 = local164 - local166; local166 = local164 - local166;
if (local166 >= 0) { if (local166 >= 0) {
@ -226,7 +226,7 @@ public class SoftwareSprite extends Sprite {
if (local198 >= 0) { if (local198 >= 0) {
return; return;
} }
@Pc(319) int local319 = local196 * Static129.anInt3144 + local164; @Pc(319) int local319 = local196 * Static129.width + local164;
@Pc(324) double local324 = 1.6777216E7D / (double) arg5; @Pc(324) double local324 = 1.6777216E7D / (double) arg5;
@Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D); @Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D);
@Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D); @Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D);
@ -266,7 +266,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local394++; local394++;
@ -274,7 +274,7 @@ public class SoftwareSprite extends Sprite {
} }
local384++; local384++;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -312,7 +312,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local468 += local333; local468 += local333;
@ -321,7 +321,7 @@ public class SoftwareSprite extends Sprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -358,7 +358,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local468 += local333; local468 += local333;
@ -367,7 +367,7 @@ public class SoftwareSprite extends Sprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} else if (local333 == 0) { } else if (local333 == 0) {
@ -392,7 +392,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local394++; local394++;
@ -400,7 +400,7 @@ public class SoftwareSprite extends Sprite {
} }
local384++; local384++;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -437,7 +437,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local468 += local333; local468 += local333;
@ -446,7 +446,7 @@ public class SoftwareSprite extends Sprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -482,7 +482,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local694 += local342; local694 += local342;
local468 += local333; local468 += local333;
@ -491,7 +491,7 @@ public class SoftwareSprite extends Sprite {
local384++; local384++;
local368 -= local333; local368 -= local333;
local378 += local342; local378 += local342;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} else if (local333 == 0) { } else if (local333 == 0) {
@ -505,13 +505,13 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local394++; local394++;
} }
} }
local384++; local384++;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else if (local333 < 0) { } else if (local333 < 0) {
local384 = local198; local384 = local198;
@ -536,7 +536,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local468 += local333; local468 += local333;
local394++; local394++;
@ -544,7 +544,7 @@ public class SoftwareSprite extends Sprite {
} }
local384++; local384++;
local368 -= local333; local368 -= local333;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} else { } else {
local384 = local198; local384 = local198;
@ -568,7 +568,7 @@ public class SoftwareSprite extends Sprite {
if (local432 == 0) { if (local432 == 0) {
local388++; local388++;
} else { } else {
Static129.anIntArray297[local388++] = local432; Static129.pixels[local388++] = local432;
} }
local468 += local333; local468 += local333;
local394++; local394++;
@ -576,7 +576,7 @@ public class SoftwareSprite extends Sprite {
} }
local384++; local384++;
local368 -= local333; local368 -= local333;
local319 += Static129.anInt3144; local319 += Static129.width;
} }
} }
} }
@ -619,7 +619,7 @@ public class SoftwareSprite extends Sprite {
@Pc(33) int local33 = local21 * 256 >> 8; @Pc(33) int local33 = local21 * 256 >> 8;
@Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040; @Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040;
@Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10; @Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10;
@Pc(63) int local63 = arg0 + arg1 * Static129.anInt3144; @Pc(63) int local63 = arg0 + arg1 * Static129.width;
for (@Pc(65) int local65 = 0; local65 < 20; local65++) { for (@Pc(65) int local65 = 0; local65 < 20; local65++) {
@Pc(70) int local70 = local63; @Pc(70) int local70 = local63;
@Pc(72) int local72 = local45; @Pc(72) int local72 = local45;
@ -629,14 +629,14 @@ public class SoftwareSprite extends Sprite {
if (local93 == 0) { if (local93 == 0) {
local70++; local70++;
} else { } else {
Static129.anIntArray297[local70++] = local93; Static129.pixels[local70++] = local93;
} }
local72 += local33; local72 += local33;
local74 -= local27; local74 -= local27;
} }
local45 += local27; local45 += local27;
local57 += local33; local57 += local33;
local63 += Static129.anInt3144; local63 += Static129.width;
} }
} catch (@Pc(128) Exception local128) { } catch (@Pc(128) Exception local128) {
} }
@ -647,40 +647,40 @@ public class SoftwareSprite extends Sprite {
public void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863; arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(21) int local21 = arg0 + arg1 * Static129.anInt3144; @Pc(21) int local21 = arg0 + arg1 * Static129.width;
@Pc(26) int local26 = this.anInt1867 - 1; @Pc(26) int local26 = this.anInt1867 - 1;
@Pc(29) int local29 = this.anInt1859; @Pc(29) int local29 = this.anInt1859;
@Pc(32) int local32 = this.anInt1867; @Pc(32) int local32 = this.anInt1867;
@Pc(36) int local36 = Static129.anInt3144 - local32; @Pc(36) int local36 = Static129.width - local32;
@Pc(40) int local40 = local32 + local32; @Pc(40) int local40 = local32 + local32;
@Pc(47) int local47; @Pc(47) int local47;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local47 = Static129.anInt3147 - arg1; local47 = Static129.clipTop - arg1;
local29 -= local47; local29 -= local47;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local26 += local47 * local32; local26 += local47 * local32;
local21 += local47 * Static129.anInt3144; local21 += local47 * Static129.width;
} }
if (arg1 + local29 > Static129.anInt3149) { if (arg1 + local29 > Static129.clipBottom) {
local29 -= arg1 + local29 - Static129.anInt3149; local29 -= arg1 + local29 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local47 = Static129.anInt3145 - arg0; local47 = Static129.clipLeft - arg0;
local32 -= local47; local32 -= local47;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local26 -= local47; local26 -= local47;
local21 += local47; local21 += local47;
local40 -= local47; local40 -= local47;
local36 += local47; local36 += local47;
} }
if (arg0 + local32 > Static129.anInt3148) { if (arg0 + local32 > Static129.clipRight) {
local47 = arg0 + local32 - Static129.anInt3148; local47 = arg0 + local32 - Static129.clipRight;
local32 -= local47; local32 -= local47;
local40 -= local47; local40 -= local47;
local36 += local47; local36 += local47;
} }
if (local32 > 0 && local29 > 0) { if (local32 > 0 && local29 > 0) {
Static290.method302(Static129.anIntArray297, this.anIntArray20, local26, local21, local32, local29, local36, local40); Static290.method302(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40);
} }
} }
@ -689,40 +689,40 @@ public class SoftwareSprite extends Sprite {
public void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method308(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); Static290.method308(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2);
} }
} }
@ -731,40 +731,40 @@ public class SoftwareSprite extends Sprite {
public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt1863; arg0 += this.anInt1863;
arg1 += this.anInt1861; arg1 += this.anInt1861;
@Pc(15) int local15 = arg0 + arg1 * Static129.anInt3144; @Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0; @Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt1859; @Pc(20) int local20 = this.anInt1859;
@Pc(23) int local23 = this.anInt1867; @Pc(23) int local23 = this.anInt1867;
@Pc(27) int local27 = Static129.anInt3144 - local23; @Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0; @Pc(29) int local29 = 0;
@Pc(36) int local36; @Pc(36) int local36;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local36 = Static129.anInt3147 - arg1; local36 = Static129.clipTop - arg1;
local20 -= local36; local20 -= local36;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local17 = local36 * local23; local17 = local36 * local23;
local15 += local36 * Static129.anInt3144; local15 += local36 * Static129.width;
} }
if (arg1 + local20 > Static129.anInt3149) { if (arg1 + local20 > Static129.clipBottom) {
local20 -= arg1 + local20 - Static129.anInt3149; local20 -= arg1 + local20 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local36 = Static129.anInt3145 - arg0; local36 = Static129.clipLeft - arg0;
local23 -= local36; local23 -= local36;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local17 += local36; local17 += local36;
local15 += local36; local15 += local36;
local29 = local36; local29 = local36;
local27 += local36; local27 += local36;
} }
if (arg0 + local23 > Static129.anInt3148) { if (arg0 + local23 > Static129.clipRight) {
local36 = arg0 + local23 - Static129.anInt3148; local36 = arg0 + local23 - Static129.clipRight;
local23 -= local36; local23 -= local36;
local29 += local36; local29 += local36;
local27 += local36; local27 += local36;
} }
if (local23 > 0 && local20 > 0) { if (local23 > 0 && local20 > 0) {
Static290.method300(Static129.anIntArray297, this.anIntArray20, local17, local15, local23, local20, local27, local29); Static290.method300(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29);
} }
} }
@ -792,20 +792,20 @@ public class SoftwareSprite extends Sprite {
@Pc(39) int local39 = local27 * arg7 >> 8; @Pc(39) int local39 = local27 * arg7 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.anInt3144; @Pc(69) int local69 = arg0 + arg1 * Static129.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg8[local71]; @Pc(78) int local78 = arg8[local71];
@Pc(82) int local82 = local69 + local78; @Pc(82) int local82 = local69 + local78;
@Pc(88) int local88 = local51 + local39 * local78; @Pc(88) int local88 = local51 + local39 * local78;
@Pc(94) int local94 = local63 - local33 * local78; @Pc(94) int local94 = local63 - local33 * local78;
for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) {
Static129.anIntArray297[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; Static129.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867];
local88 += local39; local88 += local39;
local94 -= local33; local94 -= local33;
} }
local51 += local33; local51 += local33;
local63 += local39; local63 += local39;
local69 += Static129.anInt3144; local69 += Static129.width;
} }
} catch (@Pc(144) Exception local144) { } catch (@Pc(144) Exception local144) {
} }
@ -831,7 +831,7 @@ public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(II[I[I)V") @OriginalMember(owner = "client!mm", name = "a", descriptor = "(II[I[I)V")
public final void method312(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3) { public final void method312(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3) {
if (Static129.anInt3149 - Static129.anInt3147 != arg2.length) { if (Static129.clipBottom - Static129.clipTop != arg2.length) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
arg0 += this.anInt1863; arg0 += this.anInt1863;
@ -839,31 +839,31 @@ public class SoftwareSprite extends Sprite {
@Pc(21) int local21 = 0; @Pc(21) int local21 = 0;
@Pc(24) int local24 = this.anInt1859; @Pc(24) int local24 = this.anInt1859;
@Pc(27) int local27 = this.anInt1867; @Pc(27) int local27 = this.anInt1867;
@Pc(31) int local31 = Static129.anInt3144 - local27; @Pc(31) int local31 = Static129.width - local27;
@Pc(33) int local33 = 0; @Pc(33) int local33 = 0;
@Pc(39) int local39 = arg0 + arg1 * Static129.anInt3144; @Pc(39) int local39 = arg0 + arg1 * Static129.width;
@Pc(46) int local46; @Pc(46) int local46;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local46 = Static129.anInt3147 - arg1; local46 = Static129.clipTop - arg1;
local24 -= local46; local24 -= local46;
arg1 = Static129.anInt3147; arg1 = Static129.clipTop;
local21 = local46 * local27; local21 = local46 * local27;
local39 += local46 * Static129.anInt3144; local39 += local46 * Static129.width;
} }
if (arg1 + local24 > Static129.anInt3149) { if (arg1 + local24 > Static129.clipBottom) {
local24 -= arg1 + local24 - Static129.anInt3149; local24 -= arg1 + local24 - Static129.clipBottom;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local46 = Static129.anInt3145 - arg0; local46 = Static129.clipLeft - arg0;
local27 -= local46; local27 -= local46;
arg0 = Static129.anInt3145; arg0 = Static129.clipLeft;
local21 += local46; local21 += local46;
local39 += local46; local39 += local46;
local33 = local46; local33 = local46;
local31 += local46; local31 += local46;
} }
if (arg0 + local27 > Static129.anInt3148) { if (arg0 + local27 > Static129.clipRight) {
local46 = arg0 + local27 - Static129.anInt3148; local46 = arg0 + local27 - Static129.clipRight;
local27 -= local46; local27 -= local46;
local33 += local46; local33 += local46;
local31 += local46; local31 += local46;
@ -871,8 +871,8 @@ public class SoftwareSprite extends Sprite {
if (local27 <= 0 || local24 <= 0) { if (local27 <= 0 || local24 <= 0) {
return; return;
} }
local46 = arg0 - Static129.anInt3145; local46 = arg0 - Static129.clipLeft;
@Pc(142) int local142 = arg1 - Static129.anInt3147; @Pc(142) int local142 = arg1 - Static129.clipTop;
for (@Pc(144) int local144 = local142; local144 < local142 + local24; local144++) { for (@Pc(144) int local144 = local142; local144 < local142 + local24; local144++) {
@Pc(153) int local153 = arg2[local144]; @Pc(153) int local153 = arg2[local144];
@Pc(157) int local157 = arg3[local144]; @Pc(157) int local157 = arg3[local144];
@ -908,7 +908,7 @@ public class SoftwareSprite extends Sprite {
if (local242 == 0) { if (local242 == 0) {
local39++; local39++;
} else { } else {
Static129.anIntArray297[local39++] = local242; Static129.pixels[local39++] = local242;
} }
} }
local21 += local166 + local33; local21 += local166 + local33;
@ -927,7 +927,7 @@ public class SoftwareSprite extends Sprite {
@Pc(39) int local39 = local27 * 256 >> 8; @Pc(39) int local39 = local27 * 256 >> 8;
@Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39;
@Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33);
@Pc(69) int local69 = arg0 + arg1 * Static129.anInt3144; @Pc(69) int local69 = arg0 + arg1 * Static129.width;
for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { for (@Pc(71) int local71 = 0; local71 < arg3; local71++) {
@Pc(78) int local78 = arg7[local71]; @Pc(78) int local78 = arg7[local71];
@Pc(82) int local82 = local69 + local78; @Pc(82) int local82 = local69 + local78;
@ -938,14 +938,14 @@ public class SoftwareSprite extends Sprite {
if (local115 == 0) { if (local115 == 0) {
local82++; local82++;
} else { } else {
Static129.anIntArray297[local82++] = local115; Static129.pixels[local82++] = local115;
} }
local88 += local39; local88 += local39;
local94 -= local33; local94 -= local33;
} }
local51 += local33; local51 += local33;
local63 += local39; local63 += local39;
local69 += Static129.anInt3144; local69 += Static129.width;
} }
} catch (@Pc(150) Exception local150) { } catch (@Pc(150) Exception local150) {
} }
@ -994,31 +994,31 @@ public class SoftwareSprite extends Sprite {
if (local10 < local20) { if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
} }
local46 = arg0 + arg1 * Static129.anInt3144; local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.anInt3144 - arg2; @Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(150) int local150; @Pc(150) int local150;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local150 = Static129.anInt3147 - arg1; local150 = Static129.clipTop - arg1;
arg3 -= local150; arg3 -= local150;
local46 += local150 * Static129.anInt3144; local46 += local150 * Static129.width;
local14 += local32 * local150; local14 += local32 * local150;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.anInt3148; local150 = arg0 + arg2 - Static129.clipRight;
arg2 -= local150; arg2 -= local150;
local130 += local150; local130 += local150;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local150 = Static129.anInt3145 - arg0; local150 = Static129.clipLeft - arg0;
arg2 -= local150; arg2 -= local150;
local46 += local150; local46 += local150;
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static290.method307(Static129.anIntArray297, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); Static290.method307(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4);
} }
@OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V") @OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V")
@ -1083,30 +1083,30 @@ public class SoftwareSprite extends Sprite {
if (local10 < local20) { if (local10 < local20) {
arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; arg3 = ((local10 << 16) + local32 - local14 - 1) / local32;
} }
local46 = arg0 + arg1 * Static129.anInt3144; local46 = arg0 + arg1 * Static129.width;
@Pc(130) int local130 = Static129.anInt3144 - arg2; @Pc(130) int local130 = Static129.width - arg2;
if (arg1 + arg3 > Static129.anInt3149) { if (arg1 + arg3 > Static129.clipBottom) {
arg3 -= arg1 + arg3 - Static129.anInt3149; arg3 -= arg1 + arg3 - Static129.clipBottom;
} }
@Pc(150) int local150; @Pc(150) int local150;
if (arg1 < Static129.anInt3147) { if (arg1 < Static129.clipTop) {
local150 = Static129.anInt3147 - arg1; local150 = Static129.clipTop - arg1;
arg3 -= local150; arg3 -= local150;
local46 += local150 * Static129.anInt3144; local46 += local150 * Static129.width;
local14 += local32 * local150; local14 += local32 * local150;
} }
if (arg0 + arg2 > Static129.anInt3148) { if (arg0 + arg2 > Static129.clipRight) {
local150 = arg0 + arg2 - Static129.anInt3148; local150 = arg0 + arg2 - Static129.clipRight;
arg2 -= local150; arg2 -= local150;
local130 += local150; local130 += local150;
} }
if (arg0 < Static129.anInt3145) { if (arg0 < Static129.clipLeft) {
local150 = Static129.anInt3145 - arg0; local150 = Static129.clipLeft - arg0;
arg2 -= local150; arg2 -= local150;
local46 += local150; local46 += local150;
local12 += local26 * local150; local12 += local26 * local150;
local130 += local150; local130 += local150;
} }
Static290.method316(Static129.anIntArray297, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); Static290.method316(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7);
} }
} }

4
client/src/main/java/Static1.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static1 { public final class Static1 {
@OriginalMember(owner = "client!a", name = "g", descriptor = "I") @OriginalMember(owner = "client!a", name = "g", descriptor = "I")
public static int anInt4; public static int screenLowerY;
@OriginalMember(owner = "client!a", name = "h", descriptor = "I") @OriginalMember(owner = "client!a", name = "h", descriptor = "I")
public static int anInt5; public static int anInt5;
@ -555,7 +555,7 @@ public final class Static1 {
Static70.aClass3_Sub2_Sub1_2 = local63; Static70.aClass3_Sub2_Sub1_2 = local63;
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static129.anIntArray297 = null; Static129.pixels = null;
} else { } else {
Static260.frameBuffer.makeTarget(); Static260.frameBuffer.makeTarget();
} }

348
client/src/main/java/Static129.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static129 { public final class Static129 {
@OriginalMember(owner = "client!kb", name = "a", descriptor = "I") @OriginalMember(owner = "client!kb", name = "a", descriptor = "I")
public static int anInt3144; public static int width;
@OriginalMember(owner = "client!kb", name = "c", descriptor = "I") @OriginalMember(owner = "client!kb", name = "c", descriptor = "I")
public static int anInt3146; public static int anInt3146;
@ -17,19 +17,19 @@ public final class Static129 {
public static int[] anIntArray296; public static int[] anIntArray296;
@OriginalMember(owner = "client!kb", name = "i", descriptor = "[I") @OriginalMember(owner = "client!kb", name = "i", descriptor = "[I")
public static int[] anIntArray297; public static int[] pixels;
@OriginalMember(owner = "client!kb", name = "b", descriptor = "I") @OriginalMember(owner = "client!kb", name = "b", descriptor = "I")
public static int anInt3145 = 0; public static int clipLeft = 0;
@OriginalMember(owner = "client!kb", name = "d", descriptor = "I") @OriginalMember(owner = "client!kb", name = "d", descriptor = "I")
public static int anInt3147 = 0; public static int clipTop = 0;
@OriginalMember(owner = "client!kb", name = "e", descriptor = "I") @OriginalMember(owner = "client!kb", name = "e", descriptor = "I")
public static int anInt3148 = 0; public static int clipRight = 0;
@OriginalMember(owner = "client!kb", name = "h", descriptor = "I") @OriginalMember(owner = "client!kb", name = "h", descriptor = "I")
public static int anInt3149 = 0; public static int clipBottom = 0;
@OriginalMember(owner = "client!kb", name = "a", descriptor = "()V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "()V")
public static void method2482() { public static void method2482() {
@ -47,29 +47,29 @@ public final class Static129 {
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIIII)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIIII)V")
public static void method2484(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { public static void method2484(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
if (arg0 < anInt3145) { if (arg0 < clipLeft) {
arg2 -= anInt3145 - arg0; arg2 -= clipLeft - arg0;
arg0 = anInt3145; arg0 = clipLeft;
} }
if (arg1 < anInt3147) { if (arg1 < clipTop) {
arg3 -= anInt3147 - arg1; arg3 -= clipTop - arg1;
arg1 = anInt3147; arg1 = clipTop;
} }
if (arg0 + arg2 > anInt3148) { if (arg0 + arg2 > clipRight) {
arg2 = anInt3148 - arg0; arg2 = clipRight - arg0;
} }
if (arg1 + arg3 > anInt3149) { if (arg1 + arg3 > clipBottom) {
arg3 = anInt3149 - arg1; arg3 = clipBottom - arg1;
} }
@Pc(59) int local59 = ((arg4 & 0xFF00FF) * arg5 >> 8 & 0xFF00FF) + ((arg4 & 0xFF00) * arg5 >> 8 & 0xFF00); @Pc(59) int local59 = ((arg4 & 0xFF00FF) * arg5 >> 8 & 0xFF00FF) + ((arg4 & 0xFF00) * arg5 >> 8 & 0xFF00);
@Pc(63) int local63 = 256 - arg5; @Pc(63) int local63 = 256 - arg5;
@Pc(67) int local67 = anInt3144 - arg2; @Pc(67) int local67 = width - arg2;
@Pc(73) int local73 = arg0 + arg1 * anInt3144; @Pc(73) int local73 = arg0 + arg1 * width;
for (@Pc(75) int local75 = 0; local75 < arg3; local75++) { for (@Pc(75) int local75 = 0; local75 < arg3; local75++) {
for (@Pc(81) int local81 = -arg2; local81 < 0; local81++) { for (@Pc(81) int local81 = -arg2; local81 < 0; local81++) {
@Pc(87) int local87 = anIntArray297[local73]; @Pc(87) int local87 = pixels[local73];
@Pc(107) int local107 = ((local87 & 0xFF00FF) * local63 >> 8 & 0xFF00FF) + ((local87 & 0xFF00) * local63 >> 8 & 0xFF00); @Pc(107) int local107 = ((local87 & 0xFF00FF) * local63 >> 8 & 0xFF00FF) + ((local87 & 0xFF00) * local63 >> 8 & 0xFF00);
anIntArray297[local73++] = local59 + local107; pixels[local73++] = local59 + local107;
} }
local73 += local67; local73 += local67;
} }
@ -77,14 +77,14 @@ public final class Static129 {
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(III)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "(III)V")
private static void method2485(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { private static void method2485(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (arg0 >= anInt3145 && arg1 >= anInt3147 && arg0 < anInt3148 && arg1 < anInt3149) { if (arg0 >= clipLeft && arg1 >= clipTop && arg0 < clipRight && arg1 < clipBottom) {
anIntArray297[arg0 + arg1 * anInt3144] = 16776960; pixels[arg0 + arg1 * width] = 16776960;
} }
} }
@OriginalMember(owner = "client!kb", name = "a", descriptor = "([I[I)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "([I[I)V")
public static void method2486(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1) { public static void method2486(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1) {
if (arg0.length != anInt3149 - anInt3147 || arg1.length != anInt3149 - anInt3147) { if (arg0.length != clipBottom - clipTop || arg1.length != clipBottom - clipTop) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
anIntArray295 = arg0; anIntArray295 = arg0;
@ -103,53 +103,53 @@ public final class Static129 {
@OriginalMember(owner = "client!kb", name = "a", descriptor = "([I)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "([I)V")
public static void method2488(@OriginalArg(0) int[] arg0) { public static void method2488(@OriginalArg(0) int[] arg0) {
anInt3145 = arg0[0]; clipLeft = arg0[0];
anInt3147 = arg0[1]; clipTop = arg0[1];
anInt3148 = arg0[2]; clipRight = arg0[2];
anInt3149 = arg0[3]; clipBottom = arg0[3];
method2482(); method2482();
} }
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIII)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIII)V")
public static void method2489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg1 < anInt3147 || arg1 >= anInt3149) { if (arg1 < clipTop || arg1 >= clipBottom) {
return; return;
} }
if (arg0 < anInt3145) { if (arg0 < clipLeft) {
arg2 -= anInt3145 - arg0; arg2 -= clipLeft - arg0;
arg0 = anInt3145; arg0 = clipLeft;
} }
if (arg0 + arg2 > anInt3148) { if (arg0 + arg2 > clipRight) {
arg2 = anInt3148 - arg0; arg2 = clipRight - arg0;
} }
@Pc(32) int local32 = arg0 + arg1 * anInt3144; @Pc(32) int local32 = arg0 + arg1 * width;
for (@Pc(34) int local34 = 0; local34 < arg2; local34++) { for (@Pc(34) int local34 = 0; local34 < arg2; local34++) {
anIntArray297[local32 + local34] = arg3; pixels[local32 + local34] = arg3;
} }
} }
@OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIII)V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIII)V")
public static void method2490(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2490(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg0 < anInt3145 || arg0 >= anInt3148) { if (arg0 < clipLeft || arg0 >= clipRight) {
return; return;
} }
if (arg1 < anInt3147) { if (arg1 < clipTop) {
arg2 -= anInt3147 - arg1; arg2 -= clipTop - arg1;
arg1 = anInt3147; arg1 = clipTop;
} }
if (arg1 + arg2 > anInt3149) { if (arg1 + arg2 > clipBottom) {
arg2 = anInt3149 - arg1; arg2 = clipBottom - arg1;
} }
@Pc(32) int local32 = arg0 + arg1 * anInt3144; @Pc(32) int local32 = arg0 + arg1 * width;
for (@Pc(34) int local34 = 0; local34 < arg2; local34++) { for (@Pc(34) int local34 = 0; local34 < arg2; local34++) {
anIntArray297[local32 + local34 * anInt3144] = arg3; pixels[local32 + local34 * width] = arg3;
} }
} }
@OriginalMember(owner = "client!kb", name = "a", descriptor = "([III)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "([III)V")
public static void method2491(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static void method2491(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
anIntArray297 = arg0; pixels = arg0;
anInt3144 = arg1; width = arg1;
anInt3146 = arg2; anInt3146 = arg2;
method2496(0, 0, arg1, arg2); method2496(0, 0, arg1, arg2);
} }
@ -157,46 +157,46 @@ public final class Static129 {
@OriginalMember(owner = "client!kb", name = "b", descriptor = "()V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "()V")
public static void method2492() { public static void method2492() {
@Pc(1) int local1 = 0; @Pc(1) int local1 = 0;
@Pc(7) int local7 = anInt3144 * anInt3146 - 7; @Pc(7) int local7 = width * anInt3146 - 7;
while (local1 < local7) { while (local1 < local7) {
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
anIntArray297[local1++] = 0; pixels[local1++] = 0;
} }
local7 += 7; local7 += 7;
while (local1 < local7) { while (local1 < local7) {
anIntArray297[local1++] = 0; pixels[local1++] = 0;
} }
} }
@OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIIII)V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIIII)V")
private static void method2493(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { private static void method2493(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg1 < anInt3147 || arg1 >= anInt3149) { if (arg1 < clipTop || arg1 >= clipBottom) {
return; return;
} }
if (arg0 < anInt3145) { if (arg0 < clipLeft) {
arg2 -= anInt3145 - arg0; arg2 -= clipLeft - arg0;
arg0 = anInt3145; arg0 = clipLeft;
} }
if (arg0 + arg2 > anInt3148) { if (arg0 + arg2 > clipRight) {
arg2 = anInt3148 - arg0; arg2 = clipRight - arg0;
} }
@Pc(30) int local30 = 256 - arg4; @Pc(30) int local30 = 256 - arg4;
@Pc(38) int local38 = (arg3 >> 16 & 0xFF) * arg4; @Pc(38) int local38 = (arg3 >> 16 & 0xFF) * arg4;
@Pc(46) int local46 = (arg3 >> 8 & 0xFF) * arg4; @Pc(46) int local46 = (arg3 >> 8 & 0xFF) * arg4;
@Pc(52) int local52 = (arg3 & 0xFF) * arg4; @Pc(52) int local52 = (arg3 & 0xFF) * arg4;
@Pc(58) int local58 = arg0 + arg1 * anInt3144; @Pc(58) int local58 = arg0 + arg1 * width;
for (@Pc(60) int local60 = 0; local60 < arg2; local60++) { for (@Pc(60) int local60 = 0; local60 < arg2; local60++) {
@Pc(73) int local73 = (anIntArray297[local58] >> 16 & 0xFF) * local30; @Pc(73) int local73 = (pixels[local58] >> 16 & 0xFF) * local30;
@Pc(83) int local83 = (anIntArray297[local58] >> 8 & 0xFF) * local30; @Pc(83) int local83 = (pixels[local58] >> 8 & 0xFF) * local30;
@Pc(91) int local91 = (anIntArray297[local58] & 0xFF) * local30; @Pc(91) int local91 = (pixels[local58] & 0xFF) * local30;
@Pc(113) int local113 = (local38 + local73 >> 8 << 16) + (local46 + local83 >> 8 << 8) + (local52 + local91 >> 8); @Pc(113) int local113 = (local38 + local73 >> 8 << 16) + (local46 + local83 >> 8 << 8) + (local52 + local91 >> 8);
anIntArray297[local58++] = local113; pixels[local58++] = local113;
} }
} }
@ -224,8 +224,8 @@ public final class Static129 {
@Pc(67) int local67 = arg5 * local43 + 1 >> 17; @Pc(67) int local67 = arg5 * local43 + 1 >> 17;
@Pc(73) int local73 = arg5 * local37 >> 17; @Pc(73) int local73 = arg5 * local37 >> 17;
@Pc(81) int local81 = arg5 * local37 + 1 >> 17; @Pc(81) int local81 = arg5 * local37 + 1 >> 17;
@Pc(85) int local85 = arg0 - Rasteriser.method1913(); @Pc(85) int local85 = arg0 - Rasteriser.getOffsetRemainder();
@Pc(89) int local89 = arg1 - Rasteriser.method1927(); @Pc(89) int local89 = arg1 - Rasteriser.getOffset();
@Pc(93) int local93 = local85 + local59; @Pc(93) int local93 = local85 + local59;
@Pc(97) int local97 = local85 - local67; @Pc(97) int local97 = local85 - local67;
@Pc(103) int local103 = local85 + local3 - local67; @Pc(103) int local103 = local85 + local3 - local67;
@ -234,33 +234,33 @@ public final class Static129 {
@Pc(117) int local117 = local89 - local81; @Pc(117) int local117 = local89 - local81;
@Pc(123) int local123 = local89 + local7 - local81; @Pc(123) int local123 = local89 + local7 - local81;
@Pc(129) int local129 = local89 + local7 + local73; @Pc(129) int local129 = local89 + local7 + local73;
Rasteriser.method1922(local93, local97, local103); Rasteriser.testPoints(local93, local97, local103);
Rasteriser.method1918(local113, local117, local123, local93, local97, local103, arg4); Rasteriser.fillTriangle(local113, local117, local123, local93, local97, local103, arg4);
Rasteriser.method1922(local93, local103, local109); Rasteriser.testPoints(local93, local103, local109);
Rasteriser.method1918(local113, local123, local129, local93, local103, local109, arg4); Rasteriser.fillTriangle(local113, local123, local129, local93, local103, local109, arg4);
} }
@OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIIII)V") @OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIIII)V")
public static void method2495(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { public static void method2495(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 < anInt3145) { if (arg0 < clipLeft) {
arg2 -= anInt3145 - arg0; arg2 -= clipLeft - arg0;
arg0 = anInt3145; arg0 = clipLeft;
} }
if (arg1 < anInt3147) { if (arg1 < clipTop) {
arg3 -= anInt3147 - arg1; arg3 -= clipTop - arg1;
arg1 = anInt3147; arg1 = clipTop;
} }
if (arg0 + arg2 > anInt3148) { if (arg0 + arg2 > clipRight) {
arg2 = anInt3148 - arg0; arg2 = clipRight - arg0;
} }
if (arg1 + arg3 > anInt3149) { if (arg1 + arg3 > clipBottom) {
arg3 = anInt3149 - arg1; arg3 = clipBottom - arg1;
} }
@Pc(43) int local43 = anInt3144 - arg2; @Pc(43) int local43 = width - arg2;
@Pc(49) int local49 = arg0 + arg1 * anInt3144; @Pc(49) int local49 = arg0 + arg1 * width;
for (@Pc(52) int local52 = -arg3; local52 < 0; local52++) { for (@Pc(52) int local52 = -arg3; local52 < 0; local52++) {
for (@Pc(57) int local57 = -arg2; local57 < 0; local57++) { for (@Pc(57) int local57 = -arg2; local57 < 0; local57++) {
anIntArray297[local49++] = arg4; pixels[local49++] = arg4;
} }
local49 += local43; local49 += local43;
} }
@ -274,68 +274,68 @@ public final class Static129 {
if (arg1 < 0) { if (arg1 < 0) {
arg1 = 0; arg1 = 0;
} }
if (arg2 > anInt3144) { if (arg2 > width) {
arg2 = anInt3144; arg2 = width;
} }
if (arg3 > anInt3146) { if (arg3 > anInt3146) {
arg3 = anInt3146; arg3 = anInt3146;
} }
anInt3145 = arg0; clipLeft = arg0;
anInt3147 = arg1; clipTop = arg1;
anInt3148 = arg2; clipRight = arg2;
anInt3149 = arg3; clipBottom = arg3;
method2482(); method2482();
} }
@OriginalMember(owner = "client!kb", name = "b", descriptor = "([I)V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "([I)V")
public static void method2497(@OriginalArg(0) int[] arg0) { public static void method2497(@OriginalArg(0) int[] arg0) {
arg0[0] = anInt3145; arg0[0] = clipLeft;
arg0[1] = anInt3147; arg0[1] = clipTop;
arg0[2] = anInt3148; arg0[2] = clipRight;
arg0[3] = anInt3149; arg0[3] = clipBottom;
} }
@OriginalMember(owner = "client!kb", name = "d", descriptor = "(IIII)V") @OriginalMember(owner = "client!kb", name = "d", descriptor = "(IIII)V")
public static void method2498(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2498(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (anInt3145 < arg0) { if (clipLeft < arg0) {
anInt3145 = arg0; clipLeft = arg0;
} }
if (anInt3147 < arg1) { if (clipTop < arg1) {
anInt3147 = arg1; clipTop = arg1;
} }
if (anInt3148 > arg2) { if (clipRight > arg2) {
anInt3148 = arg2; clipRight = arg2;
} }
if (anInt3149 > arg3) { if (clipBottom > arg3) {
anInt3149 = arg3; clipBottom = arg3;
} }
method2482(); method2482();
} }
@OriginalMember(owner = "client!kb", name = "d", descriptor = "(IIIII)V") @OriginalMember(owner = "client!kb", name = "d", descriptor = "(IIIII)V")
private static void method2499(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { private static void method2499(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 < anInt3145 || arg0 >= anInt3148) { if (arg0 < clipLeft || arg0 >= clipRight) {
return; return;
} }
if (arg1 < anInt3147) { if (arg1 < clipTop) {
arg2 -= anInt3147 - arg1; arg2 -= clipTop - arg1;
arg1 = anInt3147; arg1 = clipTop;
} }
if (arg1 + arg2 > anInt3149) { if (arg1 + arg2 > clipBottom) {
arg2 = anInt3149 - arg1; arg2 = clipBottom - arg1;
} }
@Pc(30) int local30 = 256 - arg4; @Pc(30) int local30 = 256 - arg4;
@Pc(38) int local38 = (arg3 >> 16 & 0xFF) * arg4; @Pc(38) int local38 = (arg3 >> 16 & 0xFF) * arg4;
@Pc(46) int local46 = (arg3 >> 8 & 0xFF) * arg4; @Pc(46) int local46 = (arg3 >> 8 & 0xFF) * arg4;
@Pc(52) int local52 = (arg3 & 0xFF) * arg4; @Pc(52) int local52 = (arg3 & 0xFF) * arg4;
@Pc(58) int local58 = arg0 + arg1 * anInt3144; @Pc(58) int local58 = arg0 + arg1 * width;
for (@Pc(60) int local60 = 0; local60 < arg2; local60++) { for (@Pc(60) int local60 = 0; local60 < arg2; local60++) {
@Pc(73) int local73 = (anIntArray297[local58] >> 16 & 0xFF) * local30; @Pc(73) int local73 = (pixels[local58] >> 16 & 0xFF) * local30;
@Pc(83) int local83 = (anIntArray297[local58] >> 8 & 0xFF) * local30; @Pc(83) int local83 = (pixels[local58] >> 8 & 0xFF) * local30;
@Pc(91) int local91 = (anIntArray297[local58] & 0xFF) * local30; @Pc(91) int local91 = (pixels[local58] & 0xFF) * local30;
@Pc(113) int local113 = (local38 + local73 >> 8 << 16) + (local46 + local83 >> 8 << 8) + (local52 + local91 >> 8); @Pc(113) int local113 = (local38 + local73 >> 8 << 16) + (local46 + local83 >> 8 << 8) + (local52 + local91 >> 8);
anIntArray297[local58] = local113; pixels[local58] = local113;
local58 += anInt3144; local58 += width;
} }
} }
@ -364,17 +364,17 @@ public final class Static129 {
@Pc(86) int local86 = arg3 << 16; @Pc(86) int local86 = arg3 << 16;
local96 = (int) Math.floor((double) local86 / (double) arg2 + 0.5D); local96 = (int) Math.floor((double) local86 / (double) arg2 + 0.5D);
arg2 += arg0; arg2 += arg0;
if (arg0 < anInt3145) { if (arg0 < clipLeft) {
arg1 += local96 * (anInt3145 - arg0); arg1 += local96 * (clipLeft - arg0);
arg0 = anInt3145; arg0 = clipLeft;
} }
if (arg2 >= anInt3148) { if (arg2 >= clipRight) {
arg2 = anInt3148 - 1; arg2 = clipRight - 1;
} }
while (arg0 <= arg2) { while (arg0 <= arg2) {
local127 = arg1 >> 16; local127 = arg1 >> 16;
if (local127 >= anInt3147 && local127 < anInt3149) { if (local127 >= clipTop && local127 < clipBottom) {
anIntArray297[arg0 + local127 * anInt3144] = arg4; pixels[arg0 + local127 * width] = arg4;
} }
arg1 += local96; arg1 += local96;
arg0++; arg0++;
@ -385,17 +385,17 @@ public final class Static129 {
@Pc(160) int local160 = arg2 << 16; @Pc(160) int local160 = arg2 << 16;
local96 = (int) Math.floor((double) local160 / (double) arg3 + 0.5D); local96 = (int) Math.floor((double) local160 / (double) arg3 + 0.5D);
arg3 += arg1; arg3 += arg1;
if (arg1 < anInt3147) { if (arg1 < clipTop) {
arg0 += local96 * (anInt3147 - arg1); arg0 += local96 * (clipTop - arg1);
arg1 = anInt3147; arg1 = clipTop;
} }
if (arg3 >= anInt3149) { if (arg3 >= clipBottom) {
arg3 = anInt3149 - 1; arg3 = clipBottom - 1;
} }
while (arg1 <= arg3) { while (arg1 <= arg3) {
local127 = arg0 >> 16; local127 = arg0 >> 16;
if (local127 >= anInt3145 && local127 < anInt3148) { if (local127 >= clipLeft && local127 < clipRight) {
anIntArray297[local127 + arg1 * anInt3144] = arg4; pixels[local127 + arg1 * width] = arg4;
} }
arg0 += local96; arg0 += local96;
arg1++; arg1++;
@ -418,12 +418,12 @@ public final class Static129 {
arg2 = -arg2; arg2 = -arg2;
} }
@Pc(15) int local15 = arg1 - arg2; @Pc(15) int local15 = arg1 - arg2;
if (local15 < anInt3147) { if (local15 < clipTop) {
local15 = anInt3147; local15 = clipTop;
} }
@Pc(26) int local26 = arg1 + arg2 + 1; @Pc(26) int local26 = arg1 + arg2 + 1;
if (local26 > anInt3149) { if (local26 > clipBottom) {
local26 = anInt3149; local26 = clipBottom;
} }
@Pc(33) int local33 = local15; @Pc(33) int local33 = local15;
@Pc(37) int local37 = arg2 * arg2; @Pc(37) int local37 = arg2 * arg2;
@ -444,16 +444,16 @@ public final class Static129 {
local51 += local39++ + local39; local51 += local39++ + local39;
} }
local85 = arg0 + 1 - local39; local85 = arg0 + 1 - local39;
if (local85 < anInt3145) { if (local85 < clipLeft) {
local85 = anInt3145; local85 = clipLeft;
} }
local94 = arg0 + local39; local94 = arg0 + local39;
if (local94 > anInt3148) { if (local94 > clipRight) {
local94 = anInt3148; local94 = clipRight;
} }
local105 = local85 + local33 * anInt3144; local105 = local85 + local33 * width;
for (local107 = local85; local107 < local94; local107++) { for (local107 = local85; local107 < local94; local107++) {
anIntArray297[local105++] = 16776960; pixels[local105++] = 16776960;
} }
local33++; local33++;
local47 -= local43-- + local43; local47 -= local43-- + local43;
@ -470,16 +470,16 @@ public final class Static129 {
local47 -= local39 + local39; local47 -= local39 + local39;
} }
local85 = arg0 - local39; local85 = arg0 - local39;
if (local85 < anInt3145) { if (local85 < clipLeft) {
local85 = anInt3145; local85 = clipLeft;
} }
local94 = arg0 + local39; local94 = arg0 + local39;
if (local94 > anInt3148 - 1) { if (local94 > clipRight - 1) {
local94 = anInt3148 - 1; local94 = clipRight - 1;
} }
local105 = local85 + local33 * anInt3144; local105 = local85 + local33 * width;
for (local107 = local85; local107 <= local94; local107++) { for (local107 = local85; local107 <= local94; local107++) {
anIntArray297[local105++] = 16776960; pixels[local105++] = 16776960;
} }
local33++; local33++;
local51 += local43 + local43; local51 += local43 + local43;
@ -501,12 +501,12 @@ public final class Static129 {
@Pc(36) int local36 = arg3 * 255; @Pc(36) int local36 = arg3 * 255;
@Pc(42) int local42 = arg3 * 0; @Pc(42) int local42 = arg3 * 0;
@Pc(46) int local46 = arg1 - arg2; @Pc(46) int local46 = arg1 - arg2;
if (local46 < anInt3147) { if (local46 < clipTop) {
local46 = anInt3147; local46 = clipTop;
} }
@Pc(57) int local57 = arg1 + arg2 + 1; @Pc(57) int local57 = arg1 + arg2 + 1;
if (local57 > anInt3149) { if (local57 > clipBottom) {
local57 = anInt3149; local57 = clipBottom;
} }
@Pc(64) int local64 = local46; @Pc(64) int local64 = local46;
@Pc(68) int local68 = arg2 * arg2; @Pc(68) int local68 = arg2 * arg2;
@ -531,20 +531,20 @@ public final class Static129 {
local82 += local70++ + local70; local82 += local70++ + local70;
} }
local116 = arg0 + 1 - local70; local116 = arg0 + 1 - local70;
if (local116 < anInt3145) { if (local116 < clipLeft) {
local116 = anInt3145; local116 = clipLeft;
} }
local125 = arg0 + local70; local125 = arg0 + local70;
if (local125 > anInt3148) { if (local125 > clipRight) {
local125 = anInt3148; local125 = clipRight;
} }
local136 = local116 + local64 * anInt3144; local136 = local116 + local64 * width;
for (local138 = local116; local138 < local125; local138++) { for (local138 = local116; local138 < local125; local138++) {
local151 = (anIntArray297[local136] >> 16 & 0xFF) * local20; local151 = (pixels[local136] >> 16 & 0xFF) * local20;
local161 = (anIntArray297[local136] >> 8 & 0xFF) * local20; local161 = (pixels[local136] >> 8 & 0xFF) * local20;
local169 = (anIntArray297[local136] & 0xFF) * local20; local169 = (pixels[local136] & 0xFF) * local20;
local191 = (local28 + local151 >> 8 << 16) + (local36 + local161 >> 8 << 8) + (local42 + local169 >> 8); local191 = (local28 + local151 >> 8 << 16) + (local36 + local161 >> 8 << 8) + (local42 + local169 >> 8);
anIntArray297[local136++] = local191; pixels[local136++] = local191;
} }
local64++; local64++;
local78 -= local74-- + local74; local78 -= local74-- + local74;
@ -561,20 +561,20 @@ public final class Static129 {
local78 -= local70 + local70; local78 -= local70 + local70;
} }
local116 = arg0 - local70; local116 = arg0 - local70;
if (local116 < anInt3145) { if (local116 < clipLeft) {
local116 = anInt3145; local116 = clipLeft;
} }
local125 = arg0 + local70; local125 = arg0 + local70;
if (local125 > anInt3148 - 1) { if (local125 > clipRight - 1) {
local125 = anInt3148 - 1; local125 = clipRight - 1;
} }
local136 = local116 + local64 * anInt3144; local136 = local116 + local64 * width;
for (local138 = local116; local138 <= local125; local138++) { for (local138 = local116; local138 <= local125; local138++) {
local151 = (anIntArray297[local136] >> 16 & 0xFF) * local20; local151 = (pixels[local136] >> 16 & 0xFF) * local20;
local161 = (anIntArray297[local136] >> 8 & 0xFF) * local20; local161 = (pixels[local136] >> 8 & 0xFF) * local20;
local169 = (anIntArray297[local136] & 0xFF) * local20; local169 = (pixels[local136] & 0xFF) * local20;
local191 = (local28 + local151 >> 8 << 16) + (local36 + local161 >> 8 << 8) + (local42 + local169 >> 8); local191 = (local28 + local151 >> 8 << 16) + (local36 + local161 >> 8 << 8) + (local42 + local169 >> 8);
anIntArray297[local136++] = local191; pixels[local136++] = local191;
} }
local64++; local64++;
local82 += local74 + local74; local82 += local74 + local74;
@ -584,22 +584,22 @@ public final class Static129 {
@OriginalMember(owner = "client!kb", name = "c", descriptor = "()V") @OriginalMember(owner = "client!kb", name = "c", descriptor = "()V")
public static void method2503() { public static void method2503() {
anInt3145 = 0; clipLeft = 0;
anInt3147 = 0; clipTop = 0;
anInt3148 = anInt3144; clipRight = width;
anInt3149 = anInt3146; clipBottom = anInt3146;
method2482(); method2482();
} }
@OriginalMember(owner = "client!kb", name = "a", descriptor = "(III[I[I)V") @OriginalMember(owner = "client!kb", name = "a", descriptor = "(III[I[I)V")
public static void method2504(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { public static void method2504(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
@Pc(5) int local5 = arg0 + arg1 * anInt3144; @Pc(5) int local5 = arg0 + arg1 * width;
for (@Pc(7) int local7 = 0; local7 < arg2.length; local7++) { for (@Pc(7) int local7 = 0; local7 < arg2.length; local7++) {
@Pc(17) int local17 = local5 + arg2[local7]; @Pc(17) int local17 = local5 + arg2[local7];
for (@Pc(22) int local22 = -arg3[local7]; local22 < 0; local22++) { for (@Pc(22) int local22 = -arg3[local7]; local22 < 0; local22++) {
anIntArray297[local17++] = 0; pixels[local17++] = 0;
} }
local5 += anInt3144; local5 += width;
} }
} }
} }

52
client/src/main/java/Static132.java
View file

@ -136,63 +136,63 @@ public final class Static132 {
if (local261 < 50) { if (local261 < 50) {
return; return;
} }
@Pc(275) int local275 = Rasteriser.anInt2471 + (local97 << 9) / local117; @Pc(275) int local275 = Rasteriser.centerX + (local97 << 9) / local117;
@Pc(283) int local283 = Rasteriser.anInt2469 + (local119 << 9) / local117; @Pc(283) int local283 = Rasteriser.centerY + (local119 << 9) / local117;
@Pc(291) int local291 = Rasteriser.anInt2471 + (local21 << 9) / local165; @Pc(291) int local291 = Rasteriser.centerX + (local21 << 9) / local165;
@Pc(299) int local299 = Rasteriser.anInt2469 + (local49 << 9) / local165; @Pc(299) int local299 = Rasteriser.centerY + (local49 << 9) / local165;
@Pc(307) int local307 = Rasteriser.anInt2471 + (local193 << 9) / local27; @Pc(307) int local307 = Rasteriser.centerX + (local193 << 9) / local27;
@Pc(315) int local315 = Rasteriser.anInt2469 + (local63 << 9) / local27; @Pc(315) int local315 = Rasteriser.centerY + (local63 << 9) / local27;
@Pc(323) int local323 = Rasteriser.anInt2471 + (local241 << 9) / local261; @Pc(323) int local323 = Rasteriser.centerX + (local241 << 9) / local261;
@Pc(331) int local331 = Rasteriser.anInt2469 + (local85 << 9) / local261; @Pc(331) int local331 = Rasteriser.centerY + (local85 << 9) / local261;
Rasteriser.anInt2473 = 0; Rasteriser.alpha = 0;
@Pc(475) int local475; @Pc(475) int local475;
if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) { if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) {
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local315, local331, local299, local307, local323, local291)) { if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
Static56.anInt1742 = arg6; Static56.anInt1742 = arg6;
Static116.anInt2954 = arg7; Static116.anInt2954 = arg7;
} }
if (!GlRenderer.enabled && !arg8) { if (!GlRenderer.enabled && !arg8) {
Rasteriser.aBoolean138 = false; Rasteriser.testX = false;
if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.anInt2472 || local323 > Rasteriser.anInt2472 || local291 > Rasteriser.anInt2472) { if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.width || local323 > Rasteriser.width || local291 > Rasteriser.width) {
Rasteriser.aBoolean138 = true; Rasteriser.testX = true;
} }
if (arg0.anInt4869 == -1) { if (arg0.anInt4869 == -1) {
if (arg0.anInt4865 != 12345678) { if (arg0.anInt4865 != 12345678) {
Rasteriser.method1928(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867);
} }
} else if (!Static159.aBoolean189) { } else if (!Static159.aBoolean189) {
local475 = Rasteriser.anInterface1_2.method3234(arg0.anInt4869); local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
Rasteriser.method1928(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867)); Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867));
} else if (arg0.aBoolean241) { } else if (arg0.aBoolean241) {
Rasteriser.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869);
} else { } else {
Rasteriser.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869); Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869);
} }
} }
} }
if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) { if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) {
return; return;
} }
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local283, local299, local331, local275, local291, local323)) { if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
Static56.anInt1742 = arg6; Static56.anInt1742 = arg6;
Static116.anInt2954 = arg7; Static116.anInt2954 = arg7;
} }
if (GlRenderer.enabled || arg8) { if (GlRenderer.enabled || arg8) {
return; return;
} }
Rasteriser.aBoolean138 = false; Rasteriser.testX = false;
if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.anInt2472 || local291 > Rasteriser.anInt2472 || local323 > Rasteriser.anInt2472) { if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.width || local291 > Rasteriser.width || local323 > Rasteriser.width) {
Rasteriser.aBoolean138 = true; Rasteriser.testX = true;
} }
if (arg0.anInt4869 == -1) { if (arg0.anInt4869 == -1) {
if (arg0.anInt4872 != 12345678) { if (arg0.anInt4872 != 12345678) {
Rasteriser.method1928(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864);
} }
} else if (Static159.aBoolean189) { } else if (Static159.aBoolean189) {
Rasteriser.method1909(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869);
} else { } else {
local475 = Rasteriser.anInterface1_2.method3234(arg0.anInt4869); local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
Rasteriser.method1928(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864));
} }
} }
} }

6
client/src/main/java/Static137.java
View file

@ -103,7 +103,7 @@ public final class Static137 {
for (local76 = 1; local76 < 103; local76++) { for (local76 = 1; local76 < 103; local76++) {
if ((Static12.aByteArrayArrayArray2[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) { if ((Static12.aByteArrayArrayArray2[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static129.anIntArray297 = null; Static129.pixels = null;
} else { } else {
Static260.frameBuffer.makeTarget(); Static260.frameBuffer.makeTarget();
} }
@ -111,7 +111,7 @@ public final class Static137 {
} }
if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) { if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static129.anIntArray297 = null; Static129.pixels = null;
} else { } else {
Static260.frameBuffer.makeTarget(); Static260.frameBuffer.makeTarget();
} }
@ -132,7 +132,7 @@ public final class Static137 {
Static89.aClass3_Sub2_Sub1_5 = Static56.aClass3_Sub2_Sub1_Sub1_1; Static89.aClass3_Sub2_Sub1_5 = Static56.aClass3_Sub2_Sub1_Sub1_1;
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static129.anIntArray297 = null; Static129.pixels = null;
} else { } else {
Static260.frameBuffer.makeTarget(); Static260.frameBuffer.makeTarget();
} }

2
client/src/main/java/Static141.java
View file

@ -38,7 +38,7 @@ public final class Static141 {
Static217.method3768(); Static217.method3768();
Static255.aClass54_16.method1815(); Static255.aClass54_16.method1815();
Static171.aClass139_1 = new Class139(); Static171.aClass139_1 = new Class139();
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3247(); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
Static120.anInt3034 = 0; Static120.anInt3034 = 0;
Static120.aClass51Array1 = new Light[255]; Static120.aClass51Array1 = new Light[255];
Static237.method4120(); Static237.method4120();

4
client/src/main/java/Static144.java
View file

@ -104,7 +104,7 @@ public final class Static144 {
if (local437 == 0 || local62 <= 1 || local238 <= 1) { if (local437 == 0 || local62 <= 1 || local238 <= 1) {
Static129.method2495(local47, local222, local62, local238, local372); Static129.method2495(local47, local222, local62, local238, local372);
} else { } else {
Static280.method4667(Static129.anIntArray297, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, local222, true); Static280.method4667(Static129.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, local222, true);
} }
} }
if (local395 != 0) { if (local395 != 0) {
@ -116,7 +116,7 @@ public final class Static144 {
if (local437 == 0 || local62 <= 1 || local238 <= 1) { if (local437 == 0 || local62 <= 1 || local238 <= 1) {
Static129.method2495(local47, local222, local62, local238, local395); Static129.method2495(local47, local222, local62, local238, local395);
} }
Static280.method4667(Static129.anIntArray297, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, local222, local372 == 0); Static280.method4667(Static129.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, local222, local372 == 0);
} }
} }
if (local197[local254] != null) { if (local197[local254] != null) {

24
client/src/main/java/Static147.java
View file

@ -44,10 +44,10 @@ public final class Static147 {
Static68.anIntArray170[local5] = local61; Static68.anIntArray170[local5] = local61;
Static68.anIntArray169[local5] = local71; Static68.anIntArray169[local5] = local71;
} }
Static68.anIntArray165[local5] = Rasteriser.anInt2471 + (local39 << 9) / local71; Static68.anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71;
Static68.anIntArray164[local5] = Rasteriser.anInt2469 + (local61 << 9) / local71; Static68.anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71;
} }
Rasteriser.anInt2473 = 0; Rasteriser.alpha = 0;
local3 = arg0.anIntArray166.length; local3 = arg0.anIntArray166.length;
for (local5 = 0; local5 < local3; local5++) { for (local5 = 0; local5 < local3; local5++) {
local15 = arg0.anIntArray166[local5]; local15 = arg0.anIntArray166[local5];
@ -60,26 +60,26 @@ public final class Static147 {
@Pc(160) int local160 = Static68.anIntArray164[local22]; @Pc(160) int local160 = Static68.anIntArray164[local22];
@Pc(164) int local164 = Static68.anIntArray164[local29]; @Pc(164) int local164 = Static68.anIntArray164[local29];
if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) { if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) {
if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local156, local160, local164, local39, local148, local152)) { if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
Static56.anInt1742 = arg5; Static56.anInt1742 = arg5;
Static116.anInt2954 = arg6; Static116.anInt2954 = arg6;
} }
if (!GlRenderer.enabled && !arg7) { if (!GlRenderer.enabled && !arg7) {
Rasteriser.aBoolean138 = false; Rasteriser.testX = false;
if (local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.anInt2472 || local148 > Rasteriser.anInt2472 || local152 > Rasteriser.anInt2472) { if (local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.width || local148 > Rasteriser.width || local152 > Rasteriser.width) {
Rasteriser.aBoolean138 = true; Rasteriser.testX = true;
} }
if (arg0.anIntArray161 == null || arg0.anIntArray161[local5] == -1) { if (arg0.anIntArray161 == null || arg0.anIntArray161[local5] == -1) {
if (arg0.anIntArray167[local5] != 12345678) { if (arg0.anIntArray167[local5] != 12345678) {
Rasteriser.method1928(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]); Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]);
} }
} else if (!Static159.aBoolean189) { } else if (!Static159.aBoolean189) {
@Pc(373) int local373 = Rasteriser.anInterface1_2.method3234(arg0.anIntArray161[local5]); @Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]);
Rasteriser.method1928(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5])); Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5]));
} else if (arg0.aBoolean113) { } else if (arg0.aBoolean113) {
Rasteriser.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]); Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]);
} else { } else {
Rasteriser.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]); Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]);
} }
} }
} }

2
client/src/main/java/Static148.java
View file

@ -17,7 +17,7 @@ public final class Static148 {
public static HashTable aClass133_13; public static HashTable aClass133_13;
@OriginalMember(owner = "client!li", name = "x", descriptor = "I") @OriginalMember(owner = "client!li", name = "x", descriptor = "I")
public static int anInt3535; public static int screenUpperY;
@OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;") @OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;")
public static final CollisionMap[] aClass97Array1 = new CollisionMap[4]; public static final CollisionMap[] aClass97Array1 = new CollisionMap[4];

2
client/src/main/java/Static156.java
View file

@ -162,7 +162,7 @@ public final class Static156 {
GlRenderer.disableDepthMask(); GlRenderer.disableDepthMask();
for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) { for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) {
@Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19]; @Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19];
if (local31.anInt2485 >= 0 && Rasteriser.anInterface1_2.method3237(local31.anInt2485) == 4) { if (local31.anInt2485 >= 0 && Rasteriser.textureProvider.method3237(local31.anInt2485) == 4) {
local1.glColor4fv(Static190.method3441(local31.anInt2486), 0); local1.glColor4fv(Static190.method3441(local31.anInt2486), 0);
@Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F); @Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F);
local31.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local57, true); local31.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local57, true);

8
client/src/main/java/Static160.java
View file

@ -69,14 +69,14 @@ public final class Static160 {
return false; return false;
} else if (local29 > arg4 && local66 > arg4) { } else if (local29 > arg4 && local66 > arg4) {
return false; return false;
} else if (local50 < Static240.anInt5334 && local87 < Static240.anInt5334) { } else if (local50 < Static240.screenLowerX && local87 < Static240.screenLowerX) {
return false; return false;
} else if (local50 > Static247.anInt5405 && local87 > Static247.anInt5405) { } else if (local50 > Static247.screenUpperX && local87 > Static247.screenUpperX) {
return false; return false;
} else if (local56 < Static1.anInt4 && local93 < Static1.anInt4) { } else if (local56 < Static1.screenLowerY && local93 < Static1.screenLowerY) {
return false; return false;
} else { } else {
return local56 <= Static148.anInt3535 || local93 <= Static148.anInt3535; return local56 <= Static148.screenUpperY || local93 <= Static148.screenUpperY;
} }
} }
} }

18
client/src/main/java/Static164.java
View file

@ -42,7 +42,7 @@ public final class Static164 {
if (local14 > 0L) { if (local14 > 0L) {
local65 = arg3; local65 = arg3;
} }
local75 = Static129.anIntArray297; local75 = Static129.pixels;
local90 = (52736 - arg2 * 512) * 4 + arg0 * 4 + 24624; local90 = (52736 - arg2 * 512) * 4 + arg0 * 4 + 24624;
if (local35 == 0 || local35 == 2) { if (local35 == 0 || local35 == 2) {
if (local28 == 0) { if (local28 == 0) {
@ -118,7 +118,7 @@ public final class Static164 {
local65 = 15597568; local65 = 15597568;
} }
local90 = arg0 * 4 + (103 - arg2) * 2048 + 24624; local90 = arg0 * 4 + (103 - arg2) * 2048 + 24624;
local75 = Static129.anIntArray297; local75 = Static129.pixels;
if (local28 == 0 || local28 == 2) { if (local28 == 0 || local28 == 2) {
local75[local90 + 1536] = local65; local75[local90 + 1536] = local65;
local75[local90 + 1025] = local65; local75[local90 + 1025] = local65;
@ -200,17 +200,17 @@ public final class Static164 {
return null; return null;
} }
} }
@Pc(118) int[] local118 = Static129.anIntArray297; @Pc(118) int[] local118 = Static129.pixels;
@Pc(120) int local120 = Static129.anInt3144; @Pc(120) int local120 = Static129.width;
@Pc(122) int local122 = Static129.anInt3146; @Pc(122) int local122 = Static129.anInt3146;
@Pc(125) int[] local125 = new int[4]; @Pc(125) int[] local125 = new int[4];
Static129.method2497(local125); Static129.method2497(local125);
@Pc(133) SoftwareSprite local133 = new SoftwareSprite(36, 32); @Pc(133) SoftwareSprite local133 = new SoftwareSprite(36, 32);
Static129.method2491(local133.anIntArray20, 36, 32); Static129.method2491(local133.anIntArray20, 36, 32);
Rasteriser.method1908(); Rasteriser.prepare();
Rasteriser.method1919(16, 16); Rasteriser.setBounds(16, 16);
@Pc(145) int local145 = local5.anInt2375; @Pc(145) int local145 = local5.anInt2375;
Rasteriser.aBoolean136 = false; Rasteriser.jagged = false;
if (arg6) { if (arg6) {
local145 = (int) ((double) local145 * 1.5D); local145 = (int) ((double) local145 * 1.5D);
} else if (arg4 == 2) { } else if (arg4 == 2) {
@ -241,8 +241,8 @@ public final class Static164 {
} }
Static129.method2491(local118, local120, local122); Static129.method2491(local118, local120, local122);
Static129.method2488(local125); Static129.method2488(local125);
Rasteriser.method1908(); Rasteriser.prepare();
Rasteriser.aBoolean136 = true; Rasteriser.jagged = true;
return GlRenderer.enabled && !arg1 ? new GlSprite(local133) : local133; return GlRenderer.enabled && !arg1 ? new GlSprite(local133) : local133;
} }
} }

8
client/src/main/java/Static176.java
View file

@ -65,10 +65,10 @@ public final class Static176 {
@Pc(15) int local15; @Pc(15) int local15;
@Pc(47) int local47; @Pc(47) int local47;
if (Static260.anInt5014 == 0) { if (Static260.anInt5014 == 0) {
@Pc(13) int local13 = Static148.anInt3535; @Pc(13) int local13 = Static148.screenUpperY;
local15 = Static1.anInt4; local15 = Static1.screenLowerY;
@Pc(17) int local17 = Static247.anInt5405; @Pc(17) int local17 = Static247.screenUpperX;
@Pc(19) int local19 = Static240.anInt5334; @Pc(19) int local19 = Static240.screenLowerX;
@Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19; @Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
local47 = local15 + (local13 - local15) * (arg4 - arg0) / arg2; local47 = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) { if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) {

6
client/src/main/java/Static19.java
View file

@ -76,9 +76,9 @@ public final class Static19 {
@OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I") @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I")
public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
@Pc(19) int local19 = Rasteriser.anIntArray220[Static268.method4585(arg1, arg2)]; @Pc(19) int local19 = Rasteriser.palette[Static268.method4585(arg1, arg2)];
if (arg0 > 0) { if (arg0 > 0) {
@Pc(31) int local31 = Rasteriser.anInterface1_2.method3238(arg0 & 0xFFFF); @Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF);
@Pc(49) int local49; @Pc(49) int local49;
@Pc(73) int local73; @Pc(73) int local73;
if (local31 != 0) { if (local31 != 0) {
@ -96,7 +96,7 @@ public final class Static19 {
local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8; local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8;
} }
} }
local49 = Rasteriser.anInterface1_2.method3229(arg0 & 0xFFFF); local49 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF);
if (local49 != 0) { if (local49 != 0) {
local49 += 256; local49 += 256;
@Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49; @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49;

4
client/src/main/java/Static190.java
View file

@ -39,9 +39,9 @@ public final class Static190 {
if (local43 != null) { if (local43 != null) {
return local43; return local43;
} }
Rasteriser.aBoolean134 = false; Rasteriser.textureHasTransparency = false;
local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false); local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false);
if (local43 != null && !Rasteriser.aBoolean134) { if (local43 != null && !Rasteriser.textureHasTransparency) {
Static118.aClass99_16.method3095(local43, local37); Static118.aClass99_16.method3095(local43, local37);
} }
return local43; return local43;

14
client/src/main/java/Static197.java
View file

@ -162,9 +162,9 @@ public final class Static197 {
GameShell.thread.setPriority(5); GameShell.thread.setPriority(5);
Static260.frameBuffer = null; Static260.frameBuffer = null;
Static268.method4580(); Static268.method4580();
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(200); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
if (Static178.highDetailLighting) { if (Static178.highDetailLighting) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} }
Static114.method4637(); Static114.method4637();
} else if (arg1 == 0 && arg3 > 0) { } else if (arg1 == 0 && arg3 > 0) {
@ -172,19 +172,19 @@ public final class Static197 {
Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas); Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas);
Static268.method4583(); Static268.method4583();
Static76.method1643(); Static76.method1643();
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(20); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
if (Static178.highDetailLighting) { if (Static178.highDetailLighting) {
if (Static113.anInt4609 == 1) { if (Static113.anInt4609 == 1) {
Rasteriser.method1911(0.9F); Rasteriser.setBrightness(0.9F);
} }
if (Static113.anInt4609 == 2) { if (Static113.anInt4609 == 2) {
Rasteriser.method1911(0.8F); Rasteriser.setBrightness(0.8F);
} }
if (Static113.anInt4609 == 3) { if (Static113.anInt4609 == 3) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} }
if (Static113.anInt4609 == 4) { if (Static113.anInt4609 == 4) {
Rasteriser.method1911(0.6F); Rasteriser.setBrightness(0.6F);
} }
} }
Static95.method1939(); Static95.method1939();

2
client/src/main/java/Static217.java
View file

@ -116,7 +116,7 @@ public final class Static217 {
Static90.method1857(); Static90.method1857();
Static139.aClass99_22.method3104(); Static139.aClass99_22.method3104();
if (!GlRenderer.enabled) { if (!GlRenderer.enabled) {
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3247(); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
} }
Static105.aClass54_9.method1815(); Static105.aClass54_9.method1815();
Static213.aClass153_88.method4499(); Static213.aClass153_88.method4499();

8
client/src/main/java/Static221.java
View file

@ -34,7 +34,7 @@ public final class Static221 {
Static250.anInt5434 = 0; Static250.anInt5434 = 0;
} }
@Pc(20) int local20 = 0; @Pc(20) int local20 = 0;
@Pc(24) int local24 = Static129.anInt3144 * arg1; @Pc(24) int local24 = Static129.width * arg1;
@Pc(26) int local26 = 0; @Pc(26) int local26 = 0;
for (@Pc(28) int local28 = 1; local28 < 255; local28++) { for (@Pc(28) int local28 = 1; local28 < 255; local28++) {
@Pc(43) int local43 = (256 - local28) * Static35.anIntArray83[local28] / 256; @Pc(43) int local43 = (256 - local28) * Static35.anIntArray83[local28] / 256;
@ -44,7 +44,7 @@ public final class Static221 {
local20 += local43; local20 += local43;
@Pc(55) int local55; @Pc(55) int local55;
for (local55 = local43; local55 < 128; local55++) { for (local55 = local43; local55 < 128; local55++) {
@Pc(65) int local65 = Static129.anIntArray297[local24++ + arg0]; @Pc(65) int local65 = Static129.pixels[local24++ + arg0];
@Pc(70) int local70 = Static216.anIntArray188[local20++]; @Pc(70) int local70 = Static216.anIntArray188[local20++];
if (local70 == 0) { if (local70 == 0) {
Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = local65; Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = local65;
@ -62,9 +62,9 @@ public final class Static221 {
} }
} }
for (local55 = 0; local55 < local43; local55++) { for (local55 = 0; local55 < local43; local55++) {
Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = Static129.anIntArray297[arg0 + local24++]; Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = Static129.pixels[arg0 + local24++];
} }
local24 += Static129.anInt3144 - 128; local24 += Static129.width - 128;
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static46.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1867, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1859); Static46.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1867, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1859);

6
client/src/main/java/Static237.java
View file

@ -116,9 +116,9 @@ public final class Static237 {
@OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I") @OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I")
public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) { public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) {
@Pc(5) int local5 = Rasteriser.anIntArray220[Static268.method4585(arg0, arg2)]; @Pc(5) int local5 = Rasteriser.palette[Static268.method4585(arg0, arg2)];
if (arg1 != -1) { if (arg1 != -1) {
@Pc(15) int local15 = Rasteriser.anInterface1_2.method3238(arg1 & 0xFFFF); @Pc(15) int local15 = Rasteriser.textureProvider.method3238(arg1 & 0xFFFF);
@Pc(21) int local21; @Pc(21) int local21;
@Pc(44) int local44; @Pc(44) int local44;
if (local15 != 0) { if (local15 != 0) {
@ -136,7 +136,7 @@ public final class Static237 {
local5 = ((local21 & 0xFF00FF) * local15 + (local5 & 0xFF00FF) * local44 & 0xFF00FF00) + ((local21 & 0xFF00) * local15 + (local5 & 0xFF00) * local44 & 0xFF0000) >> 8; local5 = ((local21 & 0xFF00FF) * local15 + (local5 & 0xFF00FF) * local44 & 0xFF00FF00) + ((local21 & 0xFF00) * local15 + (local5 & 0xFF00) * local44 & 0xFF0000) >> 8;
} }
} }
local21 = Rasteriser.anInterface1_2.method3229(arg1 & 0xFFFF); local21 = Rasteriser.textureProvider.method3229(arg1 & 0xFFFF);
if (local21 != 0) { if (local21 != 0) {
local21 += 256; local21 += 256;
@Pc(92) int local92 = (local5 >> 16 & 0xFF) * local21; @Pc(92) int local92 = (local5 >> 16 & 0xFF) * local21;

2
client/src/main/java/Static240.java
View file

@ -10,7 +10,7 @@ public final class Static240 {
public static int anInt5333; public static int anInt5333;
@OriginalMember(owner = "client!tg", name = "c", descriptor = "I") @OriginalMember(owner = "client!tg", name = "c", descriptor = "I")
public static int anInt5334; public static int screenLowerX;
@OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;") @OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;")
public static Sprite[] aClass3_Sub2_Sub1Array10; public static Sprite[] aClass3_Sub2_Sub1Array10;

2
client/src/main/java/Static247.java
View file

@ -8,7 +8,7 @@ public final class Static247 {
public static Class120[] aClass120Array2; public static Class120[] aClass120Array2;
@OriginalMember(owner = "client!ub", name = "m", descriptor = "I") @OriginalMember(owner = "client!ub", name = "m", descriptor = "I")
public static int anInt5405; public static int screenUpperX;
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V")
public static void method4244(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { public static void method4244(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {

2
client/src/main/java/Static248.java
View file

@ -128,7 +128,7 @@ public final class Static248 {
for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) {
@Pc(336) Class3_Sub14 local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; @Pc(336) Class3_Sub14 local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37];
@Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F); @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F);
if (local336.anInt2485 != -1 && Rasteriser.anInterface1_2.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) { if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) {
Static21.method619(local336.anInt2486); Static21.method619(local336.anInt2486);
} }
local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false); local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false);

12
client/src/main/java/Static253.java
View file

@ -101,7 +101,7 @@ public final class Static253 {
GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029);
} else { } else {
Static129.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4); Static129.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4);
Rasteriser.method1908(); Rasteriser.prepare();
} }
if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) { if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) {
Static39.aBoolean77 = false; Static39.aBoolean77 = false;
@ -109,11 +109,11 @@ public final class Static253 {
} else { } else {
Static39.aBoolean77 = true; Static39.aBoolean77 = true;
Static2.anInt7 = 0; Static2.anInt7 = 0;
local171 = Static247.anInt5405; local171 = Static247.screenUpperX;
@Pc(344) int local344 = Static1.anInt4; @Pc(344) int local344 = Static1.screenLowerY;
local127 = Static240.anInt5334; local127 = Static240.screenLowerX;
Static150.anInt3582 = local127 + (local171 - local127) * (-arg2 + Static155.anInt3751) / arg3; Static150.anInt3582 = local127 + (local171 - local127) * (-arg2 + Static155.anInt3751) / arg3;
@Pc(361) int local361 = Static148.anInt3535; @Pc(361) int local361 = Static148.screenUpperY;
Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344; Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344;
} }
Static107.method2261(); Static107.method2261();
@ -147,7 +147,7 @@ public final class Static253 {
Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); Static142.method2726(arg4, arg3, arg2, 256, arg0, 256);
Static233.method4000(arg3, arg2, arg0, 256, 256, arg4); Static233.method4000(arg3, arg2, arg0, 256, 256, arg4);
} }
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3239(Static178.anInt4247); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
Static115.method2310(arg3, arg4, arg0, arg2); Static115.method2310(arg3, arg4, arg0, arg2);
Static240.anInt5333 = local123; Static240.anInt5333 = local123;
Static134.anInt3302 = local121; Static134.anInt3302 = local121;

2
client/src/main/java/Static269.java
View file

@ -293,7 +293,7 @@ public final class Static269 {
Static48.method1195(arg3, 0, local61, local236, arg2, 0, local211, local50); Static48.method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2); Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2);
Static46.method1178(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg0, arg1, arg3, arg2); Static46.method1178(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg0, arg1, arg3, arg2);
Static129.anIntArray297 = null; Static129.pixels = null;
} else { } else {
Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211); Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211);
Static48.method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50); Static48.method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);

28
client/src/main/java/Static280.java
View file

@ -61,40 +61,40 @@ public final class Static280 {
@OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V") @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V")
public static void method4667(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) { public static void method4667(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) {
@Pc(7) int local7 = arg2; @Pc(7) int local7 = arg2;
if (Static129.anInt3148 <= arg2) { if (Static129.clipRight <= arg2) {
return; return;
} }
if (arg2 < Static129.anInt3145) { if (arg2 < Static129.clipLeft) {
local7 = Static129.anInt3145; local7 = Static129.clipLeft;
} }
@Pc(30) int local30 = arg7 + arg2; @Pc(30) int local30 = arg7 + arg2;
if (Static129.anInt3145 >= local30) { if (Static129.clipLeft >= local30) {
return; return;
} }
if (Static129.anInt3148 < local30) { if (Static129.clipRight < local30) {
local30 = Static129.anInt3148; local30 = Static129.clipRight;
} }
@Pc(43) int local43 = arg8; @Pc(43) int local43 = arg8;
if (Static129.anInt3149 <= arg8) { if (Static129.clipBottom <= arg8) {
return; return;
} }
@Pc(56) int local56 = arg8 + arg6; @Pc(56) int local56 = arg8 + arg6;
if (arg8 < Static129.anInt3147) { if (arg8 < Static129.clipTop) {
local43 = Static129.anInt3147; local43 = Static129.clipTop;
} }
if (local56 <= Static129.anInt3147) { if (local56 <= Static129.clipTop) {
return; return;
} }
@Pc(79) int local79 = local7 + Static129.anInt3144 * local43; @Pc(79) int local79 = local7 + Static129.width * local43;
if (arg5 == 9) { if (arg5 == 9) {
arg3 = arg3 + 1 & 0x3; arg3 = arg3 + 1 & 0x3;
arg5 = 1; arg5 = 1;
} }
@Pc(99) int local99 = local7 + Static129.anInt3144 - local30; @Pc(99) int local99 = local7 + Static129.width - local30;
local43 -= arg8; local43 -= arg8;
@Pc(108) int local108 = arg6 - local43; @Pc(108) int local108 = arg6 - local43;
if (Static129.anInt3149 < local56) { if (Static129.clipBottom < local56) {
local56 = Static129.anInt3149; local56 = Static129.clipBottom;
} }
if (arg5 == 10) { if (arg5 == 10) {
arg3 = arg3 + 3 & 0x3; arg3 = arg3 + 3 & 0x3;

6
client/src/main/java/Static285.java
View file

@ -46,8 +46,8 @@ public final class Static285 {
@OriginalMember(owner = "client!dd", name = "a", descriptor = "([I[BIIIIIIIII[I[I)V") @OriginalMember(owner = "client!dd", name = "a", descriptor = "([I[BIIIIIIIII[I[I)V")
public static void method1138(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int[] arg11, @OriginalArg(12) int[] arg12) { public static void method1138(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int[] arg11, @OriginalArg(12) int[] arg12) {
@Pc(3) int local3 = arg2 - Static129.anInt3145; @Pc(3) int local3 = arg2 - Static129.clipLeft;
@Pc(7) int local7 = arg3 - Static129.anInt3147; @Pc(7) int local7 = arg3 - Static129.clipTop;
for (@Pc(9) int local9 = local7; local9 < local7 + arg5; local9++) { for (@Pc(9) int local9 = local7; local9 < local7 + arg5; local9++) {
@Pc(18) int local18 = arg11[local9]; @Pc(18) int local18 = arg11[local9];
@Pc(22) int local22 = arg12[local9]; @Pc(22) int local22 = arg12[local9];
@ -82,7 +82,7 @@ public final class Static285 {
if (arg1[arg7++] == 0) { if (arg1[arg7++] == 0) {
arg8++; arg8++;
} else { } else {
Static129.anIntArray297[arg8++] = arg6; Static129.pixels[arg8++] = arg6;
} }
} }
arg7 += local31 + arg10; arg7 += local31 + arg10;

2
client/src/main/java/Static33.java
View file

@ -164,7 +164,7 @@ public final class Static33 {
local519 = 127; local519 = 127;
} }
@Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00); @Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00);
local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.anIntArray220[Static87.method1814(96, local541)]; local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.palette[Static87.method1814(96, local541)];
} else if (local462 != null) { } else if (local462 != null) {
local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0; local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0;
} }

2
client/src/main/java/Static37.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static37 { public final class Static37 {
@OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;") @OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;")
public static GlTextureProvider anInterface1_1; public static TextureProvider anInterface1_1;
@OriginalMember(owner = "client!cm", name = "c", descriptor = "I") @OriginalMember(owner = "client!cm", name = "c", descriptor = "I")
public static int anInt1176; public static int anInt1176;

16
client/src/main/java/Static45.java
View file

@ -223,7 +223,7 @@ public final class Static45 {
local267 = 127; local267 = 127;
} }
local273 = (local234 & 0x380) + (local234 + local10 & 0xFC00) + local267; local273 = (local234 & 0x380) + (local234 + local10 & 0xFC00) + local267;
local254 = Rasteriser.anIntArray220[Static87.method1814(96, local273)]; local254 = Rasteriser.palette[Static87.method1814(96, local273)];
} }
local267 = local146[local168][local173]; local267 = local146[local168][local173];
local332 = local146[local168][local173 + 1]; local332 = local146[local168][local173 + 1];
@ -241,7 +241,7 @@ public final class Static45 {
@Pc(1834) int local1834 = Static240.aByteArrayArrayArray14[local152][local322][local1794] & 0xFF; @Pc(1834) int local1834 = Static240.aByteArrayArrayArray14[local152][local322][local1794] & 0xFF;
if (local1834 != 0) { if (local1834 != 0) {
@Pc(1842) FloType local1842 = Static256.method4395(local1834 - 1); @Pc(1842) FloType local1842 = Static256.method4395(local1834 - 1);
if (local1842.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1842.anInt5892) == 4) { if (local1842.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1842.anInt5892) == 4) {
Static62.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24); Static62.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24);
continue label771; continue label771;
} }
@ -258,7 +258,7 @@ public final class Static45 {
@Pc(1353) int local1353; @Pc(1353) int local1353;
@Pc(1288) int local1288; @Pc(1288) int local1288;
if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) {
if (local1248.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1248.anInt5892) == 4) { if (local1248.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1248.anInt5892) == 4) {
Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889; Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889;
} else { } else {
label737: for (local1288 = local168 - 1; local1288 <= local168 + 1; local1288++) { label737: for (local1288 = local168 - 1; local1288 <= local168 + 1; local1288++) {
@ -267,7 +267,7 @@ public final class Static45 {
local1353 = Static240.aByteArrayArrayArray14[local152][local1288][local1301] & 0xFF; local1353 = Static240.aByteArrayArrayArray14[local152][local1288][local1301] & 0xFF;
if (local1353 != 0) { if (local1353 != 0) {
@Pc(1366) FloType local1366 = Static256.method4395(local1353 - 1); @Pc(1366) FloType local1366 = Static256.method4395(local1353 - 1);
if (local1366.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1366.anInt5892) == 4) { if (local1366.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1366.anInt5892) == 4) {
Static62.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24); Static62.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24);
break label737; break label737;
} }
@ -278,14 +278,14 @@ public final class Static45 {
} }
} }
local1288 = local1248.anInt5892; local1288 = local1248.anInt5892;
if (local1288 >= 0 && !Rasteriser.anInterface1_2.method3236(local1288)) { if (local1288 >= 0 && !Rasteriser.textureProvider.method3236(local1288)) {
local1288 = -1; local1288 = -1;
} }
@Pc(1458) int local1458; @Pc(1458) int local1458;
@Pc(1429) int local1429; @Pc(1429) int local1429;
if (local1288 >= 0) { if (local1288 >= 0) {
local1301 = -1; local1301 = -1;
local1353 = Rasteriser.anIntArray220[Static230.method3949(Rasteriser.anInterface1_2.method3234(local1288), 96)]; local1353 = Rasteriser.palette[Static230.method3949(Rasteriser.textureProvider.getAverageColor(local1288), 96)];
} else if (local1248.anInt5899 == -1) { } else if (local1248.anInt5899 == -1) {
local1301 = -2; local1301 = -2;
local1353 = 0; local1353 = 0;
@ -298,7 +298,7 @@ public final class Static45 {
local1429 = 127; local1429 = 127;
} }
local1458 = (local1301 & 0x380) + ((local1301 + local10 & 0xFC00) + local1429); local1458 = (local1301 & 0x380) + ((local1301 + local10 & 0xFC00) + local1429);
local1353 = Rasteriser.anIntArray220[Static230.method3949(local1458, 96)]; local1353 = Rasteriser.palette[Static230.method3949(local1458, 96)];
} }
if (local1248.anInt5894 >= 0) { if (local1248.anInt5894 >= 0) {
local1429 = local1248.anInt5894; local1429 = local1248.anInt5894;
@ -309,7 +309,7 @@ public final class Static45 {
local1458 = 127; local1458 = 127;
} }
@Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + local10 & 0xFC00) + local1458); @Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + local10 & 0xFC00) + local1458);
local1353 = Rasteriser.anIntArray220[Static230.method3949(local1529, 96)]; local1353 = Rasteriser.palette[Static230.method3949(local1529, 96)];
} }
Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353); Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353);
if (GlRenderer.enabled && local152 > 0) { if (GlRenderer.enabled && local152 > 0) {

8
client/src/main/java/Static70.java
View file

@ -46,7 +46,7 @@ public final class Static70 {
@Pc(18) FloType local18 = Static256.method4395(local11); @Pc(18) FloType local18 = Static256.method4395(local11);
if (local18 != null) { if (local18 != null) {
@Pc(24) int local24 = local18.anInt5892; @Pc(24) int local24 = local18.anInt5892;
if (local24 >= 0 && !Rasteriser.anInterface1_2.method3236(local24)) { if (local24 >= 0 && !Rasteriser.textureProvider.method3236(local24)) {
local24 = -1; local24 = -1;
} }
@Pc(53) int local53; @Pc(53) int local53;
@ -62,9 +62,9 @@ public final class Static70 {
local72 = 127; local72 = 127;
} }
local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72; local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72;
local53 = Rasteriser.anIntArray220[Static230.method3949(local95, 96)]; local53 = Rasteriser.palette[Static230.method3949(local95, 96)];
} else if (local24 >= 0) { } else if (local24 >= 0) {
local53 = Rasteriser.anIntArray220[Static230.method3949(Rasteriser.anInterface1_2.method3234(local24), 96)]; local53 = Rasteriser.palette[Static230.method3949(Rasteriser.textureProvider.getAverageColor(local24), 96)];
} else if (local18.anInt5899 == -1) { } else if (local18.anInt5899 == -1) {
local53 = -1; local53 = -1;
} else { } else {
@ -76,7 +76,7 @@ public final class Static70 {
local72 = 127; local72 = 127;
} }
local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00); local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00);
local53 = Rasteriser.anIntArray220[Static230.method3949(local95, 96)]; local53 = Rasteriser.palette[Static230.method3949(local95, 96)];
} }
Static145.anIntArray330[local11 + 1] = local53; Static145.anIntArray330[local11 + 1] = local53;
} }

14
client/src/main/java/Static87.java
View file

@ -113,7 +113,7 @@ public final class Static87 {
Static46.method1187(arg0, arg6, arg4, arg7); Static46.method1187(arg0, arg6, arg4, arg7);
} else { } else {
Static129.method2496(arg0, arg6, arg4, arg7); Static129.method2496(arg0, arg6, arg4, arg7);
Rasteriser.method1908(); Rasteriser.prepare();
} }
for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) { for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) {
@Pc(30) Component local30 = arg3[local18]; @Pc(30) Component local30 = arg3[local18];
@ -394,7 +394,7 @@ public final class Static87 {
Static46.method1187(arg0, arg6, arg4, arg7); Static46.method1187(arg0, arg6, arg4, arg7);
} else { } else {
Static129.method2496(arg0, arg6, arg4, arg7); Static129.method2496(arg0, arg6, arg4, arg7);
Rasteriser.method1908(); Rasteriser.prepare();
} }
} }
if (Static223.aBooleanArray116[local57] || Static199.anInt4672 > 1) { if (Static223.aBooleanArray116[local57] || Static199.anInt4672 > 1) {
@ -421,7 +421,7 @@ public final class Static87 {
} else { } else {
local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.objCounts[local270], 3153952); local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.objCounts[local270], 3153952);
} }
if (Rasteriser.aBoolean134) { if (Rasteriser.textureHasTransparency) {
Static186.aBooleanArray100[local57] = true; Static186.aBooleanArray100[local57] = true;
} }
if (local1476 == null) { if (local1476 == null) {
@ -448,8 +448,8 @@ public final class Static87 {
local1575 = Static46.anInt1441; local1575 = Static46.anInt1441;
local1577 = Static46.clipY; local1577 = Static46.clipY;
} else { } else {
local1577 = Static129.anInt3147; local1577 = Static129.clipTop;
local1575 = Static129.anInt3149; local1575 = Static129.clipBottom;
} }
@Pc(1611) int local1611; @Pc(1611) int local1611;
if (local1577 > local556 + local514 && local1571.scrollY > 0) { if (local1577 > local556 + local514 && local1571.scrollY > 0) {
@ -754,7 +754,7 @@ public final class Static87 {
GlRenderer.enableDepthMask(); GlRenderer.enableDepthMask();
} }
} else { } else {
Rasteriser.method1919(local556, local545); Rasteriser.setBounds(local556, local545);
local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16;
local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16;
if (!local30.aBoolean32) { if (!local30.aBoolean32) {
@ -764,7 +764,7 @@ public final class Static87 {
} else { } else {
local2589.method4571(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + local503, local571 + local30.modelZOffset, -1L); local2589.method4571(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + local503, local571 + local30.modelZOffset, -1L);
} }
Rasteriser.method1915(); Rasteriser.prepareOffsets();
} }
} }
} else { } else {

20
client/src/main/java/Static88.java
View file

@ -3205,16 +3205,16 @@ public final class Static88 {
Static113.anInt4609 = local809; Static113.anInt4609 = local809;
if (!GlRenderer.enabled || !Static178.highDetailLighting) { if (!GlRenderer.enabled || !Static178.highDetailLighting) {
if (Static113.anInt4609 == 1) { if (Static113.anInt4609 == 1) {
Rasteriser.method1911(0.9F); Rasteriser.setBrightness(0.9F);
} }
if (Static113.anInt4609 == 2) { if (Static113.anInt4609 == 2) {
Rasteriser.method1911(0.8F); Rasteriser.setBrightness(0.8F);
} }
if (Static113.anInt4609 == 3) { if (Static113.anInt4609 == 3) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} }
if (Static113.anInt4609 == 4) { if (Static113.anInt4609 == 4) {
Rasteriser.method1911(0.6F); Rasteriser.setBrightness(0.6F);
} }
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -3257,7 +3257,7 @@ public final class Static88 {
if (local226 == 6006) { if (local226 == 6006) {
local28--; local28--;
Static53.aBoolean99 = Static254.anIntArray487[local28] == 1; Static53.aBoolean99 = Static254.anIntArray487[local28] == 1;
((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3245(!Static53.aBoolean99); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3245(!Static53.aBoolean99);
Static203.method3663(GameShell.signLink); Static203.method3663(GameShell.signLink);
Static18.sentToServer = false; Static18.sentToServer = false;
continue; continue;
@ -3308,19 +3308,19 @@ public final class Static88 {
local28--; local28--;
Static178.highDetailLighting = Static254.anIntArray487[local28] == 1; Static178.highDetailLighting = Static254.anIntArray487[local28] == 1;
if (GlRenderer.enabled && Static178.highDetailLighting) { if (GlRenderer.enabled && Static178.highDetailLighting) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} else { } else {
if (Static113.anInt4609 == 1) { if (Static113.anInt4609 == 1) {
Rasteriser.method1911(0.9F); Rasteriser.setBrightness(0.9F);
} }
if (Static113.anInt4609 == 2) { if (Static113.anInt4609 == 2) {
Rasteriser.method1911(0.8F); Rasteriser.setBrightness(0.8F);
} }
if (Static113.anInt4609 == 3) { if (Static113.anInt4609 == 3) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} }
if (Static113.anInt4609 == 4) { if (Static113.anInt4609 == 4) {
Rasteriser.method1911(0.6F); Rasteriser.setBrightness(0.6F);
} }
} }
Static145.method2742(); Static145.method2742();

6
client/src/main/java/Texture.java
View file

@ -73,7 +73,7 @@ public final class Texture {
} }
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IZIDILclient!ve;Lclient!m;Z)[I") @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IZIDILclient!ve;Lclient!m;Z)[I")
public final int[] method2725(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) double arg3, @OriginalArg(5) Js5 arg4, @OriginalArg(6) GlTextureProvider arg5, @OriginalArg(7) boolean arg6) { public final int[] method2725(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) double arg3, @OriginalArg(5) Js5 arg4, @OriginalArg(6) TextureProvider arg5, @OriginalArg(7) boolean arg6) {
Static241.method4537(arg3); Static241.method4537(arg3);
Static37.anInterface1_1 = arg5; Static37.anInterface1_1 = arg5;
Static176.aClass153_76 = arg4; Static176.aClass153_76 = arg4;
@ -152,7 +152,7 @@ public final class Texture {
} }
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIZLclient!m;DILclient!ve;)[B") @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIZLclient!m;DILclient!ve;)[B")
public final byte[] method2728(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) GlTextureProvider arg3, @OriginalArg(4) double arg4, @OriginalArg(6) Js5 arg5) { public final byte[] method2728(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) TextureProvider arg3, @OriginalArg(4) double arg4, @OriginalArg(6) Js5 arg5) {
@Pc(8) byte[] local8 = new byte[arg1 * 4 * arg0]; @Pc(8) byte[] local8 = new byte[arg1 * 4 * arg0];
Static241.method4537(arg4); Static241.method4537(arg4);
Static176.aClass153_76 = arg5; Static176.aClass153_76 = arg5;
@ -241,7 +241,7 @@ public final class Texture {
} }
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(ZLclient!m;Lclient!ve;)Z") @OriginalMember(owner = "client!lc", name = "a", descriptor = "(ZLclient!m;Lclient!ve;)Z")
public final boolean method2729(@OriginalArg(1) GlTextureProvider arg0, @OriginalArg(2) Js5 arg1) { public final boolean method2729(@OriginalArg(1) TextureProvider arg0, @OriginalArg(2) Js5 arg1) {
@Pc(10) int local10; @Pc(10) int local10;
if (Static215.anInt4868 > 0) { if (Static215.anInt4868 > 0) {
for (local10 = 0; local10 < this.anIntArray327.length; local10++) { for (local10 = 0; local10 < this.anIntArray327.length; local10++) {

2
client/src/main/java/TextureOp32.java
View file

@ -63,7 +63,7 @@ public final class TextureOp32 extends TextureOp {
} else { } else {
@Pc(22) int local22 = Static189.anInt4457; @Pc(22) int local22 = Static189.anInt4457;
@Pc(24) int local24 = Static172.anInt4165; @Pc(24) int local24 = Static172.anInt4165;
@Pc(34) int local34 = Static37.anInterface1_1.method3233(this.anInt5539) ? 64 : 128; @Pc(34) int local34 = Static37.anInterface1_1.isLowDetail(this.anInt5539) ? 64 : 128;
this.anIntArray483 = Static37.anInterface1_1.method3235(this.anInt5539); this.anIntArray483 = Static37.anInterface1_1.method3235(this.anInt5539);
this.anInt5536 = local34; this.anInt5536 = local34;
this.anInt5535 = local34; this.anInt5535 = local34;

8
client/src/main/java/GlTextureProvider.java → client/src/main/java/TextureProvider.java
View file

@ -3,10 +3,10 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!m") @OriginalClass("client!m")
public interface GlTextureProvider { public interface TextureProvider {
@OriginalMember(owner = "client!m", name = "a", descriptor = "(BI)Z") @OriginalMember(owner = "client!m", name = "a", descriptor = "(BI)Z")
boolean method3226(@OriginalArg(1) int arg0); boolean isOpaque(@OriginalArg(1) int arg0);
@OriginalMember(owner = "client!m", name = "a", descriptor = "(IZ)V") @OriginalMember(owner = "client!m", name = "a", descriptor = "(IZ)V")
void method3227(@OriginalArg(0) int arg0); void method3227(@OriginalArg(0) int arg0);
@ -27,10 +27,10 @@ public interface GlTextureProvider {
int[] method3232(@OriginalArg(0) int arg0, @OriginalArg(2) float arg1); int[] method3232(@OriginalArg(0) int arg0, @OriginalArg(2) float arg1);
@OriginalMember(owner = "client!m", name = "b", descriptor = "(BI)Z") @OriginalMember(owner = "client!m", name = "b", descriptor = "(BI)Z")
boolean method3233(@OriginalArg(1) int arg0); boolean isLowDetail(@OriginalArg(1) int arg0);
@OriginalMember(owner = "client!m", name = "d", descriptor = "(II)I") @OriginalMember(owner = "client!m", name = "d", descriptor = "(II)I")
int method3234(@OriginalArg(0) int arg0); int getAverageColor(@OriginalArg(0) int arg0);
@OriginalMember(owner = "client!m", name = "e", descriptor = "(II)[I") @OriginalMember(owner = "client!m", name = "e", descriptor = "(II)[I")
int[] method3235(@OriginalArg(1) int arg0); int[] method3235(@OriginalArg(1) int arg0);

32
client/src/main/java/WorldMapFont.java
View file

@ -118,31 +118,31 @@ public final class WorldMapFont {
@Pc(21) int local21 = arg4[arg0 + 3]; @Pc(21) int local21 = arg4[arg0 + 3];
@Pc(27) int local27 = arg4[arg0 + 4]; @Pc(27) int local27 = arg4[arg0 + 4];
@Pc(47) int local47 = arg4[arg0] * 16384 + arg4[arg0 + 1] * 128 + arg4[arg0 + 2]; @Pc(47) int local47 = arg4[arg0] * 16384 + arg4[arg0 + 1] * 128 + arg4[arg0 + 2];
@Pc(53) int local53 = local7 + local15 * Static129.anInt3144; @Pc(53) int local53 = local7 + local15 * Static129.width;
@Pc(57) int local57 = Static129.anInt3144 - local21; @Pc(57) int local57 = Static129.width - local21;
@Pc(59) int local59 = 0; @Pc(59) int local59 = 0;
@Pc(66) int local66; @Pc(66) int local66;
if (local15 < Static129.anInt3147) { if (local15 < Static129.clipTop) {
local66 = Static129.anInt3147 - local15; local66 = Static129.clipTop - local15;
local27 -= local66; local27 -= local66;
local15 = Static129.anInt3147; local15 = Static129.clipTop;
local47 += local66 * local21; local47 += local66 * local21;
local53 += local66 * Static129.anInt3144; local53 += local66 * Static129.width;
} }
if (local15 + local27 >= Static129.anInt3149) { if (local15 + local27 >= Static129.clipBottom) {
local27 -= local15 + local27 + 1 - Static129.anInt3149; local27 -= local15 + local27 + 1 - Static129.clipBottom;
} }
if (local7 < Static129.anInt3145) { if (local7 < Static129.clipLeft) {
local66 = Static129.anInt3145 - local7; local66 = Static129.clipLeft - local7;
local21 -= local66; local21 -= local66;
local7 = Static129.anInt3145; local7 = Static129.clipLeft;
local47 += local66; local47 += local66;
local53 += local66; local53 += local66;
local59 = local66; local59 = local66;
local57 += local66; local57 += local66;
} }
if (local7 + local21 >= Static129.anInt3148) { if (local7 + local21 >= Static129.clipRight) {
local66 = local7 + local21 + 1 - Static129.anInt3148; local66 = local7 + local21 + 1 - Static129.clipRight;
local21 -= local66; local21 -= local66;
local59 += local66; local59 += local66;
local57 += local66; local57 += local66;
@ -151,9 +151,9 @@ public final class WorldMapFont {
return; return;
} }
if (this.aBoolean112) { if (this.aBoolean112) {
this.method1505(Static129.anIntArray297, arg4, arg3, local47, local53, local21, local27, local57, local59); this.method1505(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
} else { } else {
this.method1507(Static129.anIntArray297, arg4, arg3, local47, local53, local21, local27, local57, local59); this.method1507(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
} }
} }
@ -201,7 +201,7 @@ public final class WorldMapFont {
public final void method1508(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public final void method1508(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(5) int local5 = this.method1510(arg0) / 2; @Pc(5) int local5 = this.method1510(arg0) / 2;
@Pc(8) int local8 = this.method1511(); @Pc(8) int local8 = this.method1511();
if (arg1 - local5 <= Static129.anInt3148 && (arg1 + local5 >= Static129.anInt3145 && (arg2 - local8 <= Static129.anInt3149 && arg2 >= 0))) { if (arg1 - local5 <= Static129.clipRight && (arg1 + local5 >= Static129.clipLeft && (arg2 - local8 <= Static129.clipBottom && arg2 >= 0))) {
this.method1502(arg0, arg1 - local5, arg2, arg3, true); this.method1502(arg0, arg1 - local5, arg2, arg3, true);
} }
} }

10
client/src/main/java/client.java
View file

@ -840,18 +840,18 @@ public final class client extends GameShell {
} else if (Static166.anInt4051 == 90) { } else if (Static166.anInt4051 == 90) {
if (Static167.aClass153_63.method4475()) { if (Static167.aClass153_63.method4475()) {
@Pc(951) Js5GlTextureProvider local951 = new Js5GlTextureProvider(Static195.aClass153_80, Static167.aClass153_63, Static209.aClass153_86, 20, !Static53.aBoolean99); @Pc(951) Js5GlTextureProvider local951 = new Js5GlTextureProvider(Static195.aClass153_80, Static167.aClass153_63, Static209.aClass153_86, 20, !Static53.aBoolean99);
Rasteriser.method1914(local951); Rasteriser.unpackTextures(local951);
if (Static113.anInt4609 == 1) { if (Static113.anInt4609 == 1) {
Rasteriser.method1911(0.9F); Rasteriser.setBrightness(0.9F);
} }
if (Static113.anInt4609 == 2) { if (Static113.anInt4609 == 2) {
Rasteriser.method1911(0.8F); Rasteriser.setBrightness(0.8F);
} }
if (Static113.anInt4609 == 3) { if (Static113.anInt4609 == 3) {
Rasteriser.method1911(0.7F); Rasteriser.setBrightness(0.7F);
} }
if (Static113.anInt4609 == 4) { if (Static113.anInt4609 == 4) {
Rasteriser.method1911(0.6F); Rasteriser.setBrightness(0.6F);
} }
Static126.aClass100_602 = LocalizedText.MAINLOAD90B; Static126.aClass100_602 = LocalizedText.MAINLOAD90B;
Static166.anInt4051 = 100; Static166.anInt4051 = 100;