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

@@ -25,18 +25,18 @@ final class UnitPriceComparator implements Comparator {
signature = "(Ll;Ll;I)I",
garbageValue = "-120071238"
)
int __m_11(GrandExchangeEvent var1, GrandExchangeEvent var2) {
return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice?-1:(var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice?0:1);
int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) {
return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1);
}
@Export("compare")
@ObfuscatedName("compare")
public int compare(Object var1, Object var2) {
return this.__m_11((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
}
@ObfuscatedName("equals")
public boolean __equals_13(Object var1) {
public boolean method338(Object var1) {
return super.equals(var1);
}
@@ -69,14 +69,14 @@ final class UnitPriceComparator implements Comparator {
garbageValue = "2032203362"
)
static final int method131() {
if(ReflectionCheck.clientPreferences.roofsHidden) {
if (ReflectionCheck.clientPreferences.roofsHidden) {
return SoundSystem.plane;
} else {
int var0 = 3;
if(WorldMapIcon1.cameraPitch < 310) {
if (WorldMapIcon1.cameraPitch < 310) {
int var1;
int var2;
if(Client.oculusOrbState == 1) {
if (Client.oculusOrbState == 1) {
var1 = MouseHandler.oculusOrbFocalPointX >> 7;
var2 = ScriptEvent.oculusOrbFocalPointY >> 7;
} else {
@@ -86,27 +86,27 @@ final class UnitPriceComparator implements Comparator {
int var3 = WorldMapSection1.cameraX >> 7;
int var4 = class11.cameraZ >> 7;
if(var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
return SoundSystem.plane;
}
if(var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
return SoundSystem.plane;
}
if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
var0 = SoundSystem.plane;
}
int var5;
if(var1 > var3) {
if (var1 > var3) {
var5 = var1 - var3;
} else {
var5 = var3 - var1;
}
int var6;
if(var2 > var4) {
if (var2 > var4) {
var6 = var2 - var4;
} else {
var6 = var4 - var2;
@@ -114,60 +114,60 @@ final class UnitPriceComparator implements Comparator {
int var7;
int var8;
if(var5 > var6) {
if (var5 > var6) {
var7 = var6 * 65536 / var5;
var8 = 32768;
while(var3 != var1) {
if(var3 < var1) {
while (var3 != var1) {
if (var3 < var1) {
++var3;
} else if(var3 > var1) {
} else if (var3 > var1) {
--var3;
}
if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
var0 = SoundSystem.plane;
}
var8 += var7;
if(var8 >= 65536) {
if (var8 >= 65536) {
var8 -= 65536;
if(var4 < var2) {
if (var4 < var2) {
++var4;
} else if(var4 > var2) {
} else if (var4 > var2) {
--var4;
}
if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
var0 = SoundSystem.plane;
}
}
}
} else if(var6 > 0) {
} else if (var6 > 0) {
var7 = var5 * 65536 / var6;
var8 = 32768;
while(var4 != var2) {
if(var4 < var2) {
while (var4 != var2) {
if (var4 < var2) {
++var4;
} else if(var4 > var2) {
} else if (var4 > var2) {
--var4;
}
if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
var0 = SoundSystem.plane;
}
var8 += var7;
if(var8 >= 65536) {
if (var8 >= 65536) {
var8 -= 65536;
if(var3 < var1) {
if (var3 < var1) {
++var3;
} else if(var3 > var1) {
} else if (var3 > var1) {
--var3;
}
if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
var0 = SoundSystem.plane;
}
}
@@ -175,8 +175,8 @@ final class UnitPriceComparator implements Comparator {
}
}
if(Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
if((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
if (Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
if ((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
var0 = SoundSystem.plane;
}
@@ -193,12 +193,12 @@ final class UnitPriceComparator implements Comparator {
garbageValue = "-239357025"
)
static final void method136(int var0, int var1) {
if(Client.hintArrowType == 2) {
if (Client.hintArrowType == 2) {
WorldMapLabel.worldToScreen((Client.hintArrowX - class50.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GraphicsObject.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2);
if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
}
}
}
}