More refactoring (tm)

This commit is contained in:
Lucas
2019-07-07 15:10:50 +02:00
parent e1a815eddd
commit e2aac6d899
159 changed files with 38213 additions and 46222 deletions

View File

@@ -54,14 +54,16 @@ public abstract class AbstractWorldMapIcon {
signature = "(I)I",
garbageValue = "1990181988"
)
public abstract int vmethod395();
@Export("element")
public abstract int element();
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)Laj;",
garbageValue = "1159446036"
)
abstract WorldMapLabel vmethod396();
@Export("label")
abstract WorldMapLabel label();
@ObfuscatedName("q")
@ObfuscatedSignature(
@@ -92,7 +94,7 @@ public abstract class AbstractWorldMapIcon {
garbageValue = "1150380891"
)
boolean method19() {
return this.vmethod395() >= 0;
return this.element() >= 0;
}
@ObfuscatedName("b")
@@ -104,7 +106,7 @@ public abstract class AbstractWorldMapIcon {
if (!this.method19()) {
return false;
} else {
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395());
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.element());
int var4 = this.vmethod397();
int var5 = this.vmethod398();
switch(var3.field3287.field3528) {
@@ -153,7 +155,7 @@ public abstract class AbstractWorldMapIcon {
garbageValue = "1201712205"
)
boolean method21(int var1, int var2) {
WorldMapLabel var3 = this.vmethod396();
WorldMapLabel var3 = this.label();
return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false);
}