Use newer version of fernflower and remove __xx names

This commit is contained in:
Lucas
2019-07-04 23:51:52 +02:00
parent 1f2a9b21d6
commit a8d801d830
294 changed files with 27369 additions and 27322 deletions

View File

@@ -12,7 +12,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
@ObfuscatedSignature(
signature = "Lho;"
)
static Widget __t_i;
static Widget field1030;
@ObfuscatedName("db")
@ObfuscatedSignature(
signature = "Lit;"
@@ -32,7 +32,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
@ObfuscatedGetter(
intValue = -1722323621
)
final int __m;
final int field1031;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Laj;"
@@ -43,28 +43,28 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
@ObfuscatedGetter(
intValue = 364253793
)
final int __q;
final int field1032;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -362031241
)
final int __w;
final int field1033;
@ObfuscatedSignature(
signature = "(Lhu;Lhu;ILaj;)V"
)
WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) {
super(var1, var2);
this.__m = var3;
this.field1031 = var3;
this.label0 = var4;
WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.__m_15());
WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.vmethod395());
Sprite var6 = var5.getSprite(false);
if(var6 != null) {
this.__q = var6.subWidth;
this.__w = var6.subHeight;
if (var6 != null) {
this.field1032 = var6.subWidth;
this.field1033 = var6.subHeight;
} else {
this.__q = 0;
this.__w = 0;
this.field1032 = 0;
this.field1033 = 0;
}
}
@@ -74,8 +74,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
signature = "(I)I",
garbageValue = "1990181988"
)
public int __m_15() {
return this.__m;
public int vmethod395() {
return this.field1031;
}
@ObfuscatedName("f")
@@ -83,7 +83,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
signature = "(I)Laj;",
garbageValue = "1159446036"
)
WorldMapLabel __f_16() {
WorldMapLabel vmethod396() {
return this.label0;
}
@@ -92,8 +92,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
signature = "(B)I",
garbageValue = "75"
)
int __q_17() {
return this.__q;
int vmethod397() {
return this.field1032;
}
@ObfuscatedName("w")
@@ -101,8 +101,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
signature = "(I)I",
garbageValue = "-1558233611"
)
int __w_18() {
return this.__w;
int vmethod398() {
return this.field1033;
}
@ObfuscatedName("m")
@@ -120,57 +120,58 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
garbageValue = "-252304353"
)
static final void method212() {
for(int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
--Client.queuedSoundEffectDelays[var0];
if(Client.queuedSoundEffectDelays[var0] >= -10) {
SoundEffect var9 = Client.soundEffects[var0];
if(var9 == null) {
Object var10000 = null;
var9 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
if(var9 == null) {
for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
int var10002 = Client.queuedSoundEffectDelays[var0]--;
if (Client.queuedSoundEffectDelays[var0] >= -10) {
SoundEffect var10 = Client.soundEffects[var0];
if (var10 == null) {
Object var2 = null;
var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
if (var10 == null) {
continue;
}
Client.queuedSoundEffectDelays[var0] += var9.__q_174();
Client.soundEffects[var0] = var9;
int[] var10000 = Client.queuedSoundEffectDelays;
var10000[var0] += var10.method303();
Client.soundEffects[var0] = var10;
}
if(Client.queuedSoundEffectDelays[var0] < 0) {
int var2;
if(Client.soundLocations[var0] != 0) {
if (Client.queuedSoundEffectDelays[var0] < 0) {
int var11;
if (Client.soundLocations[var0] != 0) {
int var3 = (Client.soundLocations[var0] & 255) * 128;
int var4 = Client.soundLocations[var0] >> 16 & 255;
int var5 = var4 * 128 + 64 - Canvas.localPlayer.x;
if(var5 < 0) {
if (var5 < 0) {
var5 = -var5;
}
int var6 = Client.soundLocations[var0] >> 8 & 255;
int var7 = var6 * 128 + 64 - Canvas.localPlayer.y;
if(var7 < 0) {
if (var7 < 0) {
var7 = -var7;
}
int var8 = var5 + var7 - 128;
if(var8 > var3) {
if (var8 > var3) {
Client.queuedSoundEffectDelays[var0] = -100;
continue;
}
if(var8 < 0) {
if (var8 < 0) {
var8 = 0;
}
var2 = (var3 - var8) * Client.__client_qc / var3;
var11 = (var3 - var8) * Client.field115 / var3;
} else {
var2 = Client.soundEffectVolume;
var11 = Client.soundEffectVolume;
}
if(var2 > 0) {
RawSound var10 = var9.toRawSound().resample(MilliClock.decimator);
RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
TaskHandler.pcmStreamMixer.addSubStream(var11);
if (var11 > 0) {
RawSound var12 = var10.toRawSound().resample(MilliClock.decimator);
RawPcmStream var13 = RawPcmStream.createRawPcmStream(var12, 100, var11);
var13.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
TaskHandler.pcmStreamMixer.addSubStream(var13);
}
Client.queuedSoundEffectDelays[var0] = -100;
@@ -178,7 +179,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
} else {
--Client.soundEffectCount;
for(int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
@@ -190,20 +191,20 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
}
}
if(Client.__client_qq) {
boolean var12;
if(class214.__hf_o != 0) {
var12 = true;
if (Client.field107) {
boolean var9;
if (class214.field1129 != 0) {
var9 = true;
} else {
var12 = class214.midiPcmStream.isReady();
var9 = class214.midiPcmStream.isReady();
}
if(!var12) {
if(Client.__client_qf != 0 && Client.__client_qy != -1) {
Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, Client.__client_qf, false);
if (!var9) {
if (Client.field128 != 0 && Client.field112 != -1) {
Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false);
}
Client.__client_qq = false;
Client.field107 = false;
}
}