Merge remote-tracking branch 'ext_upstream/master' into master3
# Conflicts: # deobfuscator/pom.xml # deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java # deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java # deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java # deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java # deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java # deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java # deobfuscator/src/main/java/net/runelite/asm/pool/Class.java # deobfuscator/src/main/java/net/runelite/asm/pool/Field.java # deobfuscator/src/main/java/net/runelite/deob/Deob.java # deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java # deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java # deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java # deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java # deobfuscator/src/test/java/net/runelite/asm/annotations/MyAnnotation.java # deobfuscator/src/test/java/net/runelite/asm/execution/mapper/StaticStepTest.java # deobfuscator/src/test/java/net/runelite/asm/execution/tests/TableSwitch.java # deobfuscator/src/test/java/net/runelite/asm/signature/SignatureTest.java # deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java # deobfuscator/src/test/java/net/runelite/deob/TemporyFolderLocation.java # deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java # deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBufferTest.java # deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java # deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java # deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java # deobfuscator/src/test/java/net/runelite/osb/inject/FieldHook.java # injected-client/pom.xml # injector-plugin/pom.xml # injector-plugin/src/main/java/net/runelite/injector/Inject.java # injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java # injector-plugin/src/main/java/net/runelite/injector/InjectionException.java # injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java # injector-plugin/src/main/java/net/runelite/injector/raw/ClearColorBuffer.java # injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java # injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java # pom.xml # runelite-api/src/main/java/net/runelite/api/Actor.java # runelite-api/src/main/java/net/runelite/api/Client.java # runelite-api/src/main/java/net/runelite/api/CollisionData.java # runelite-api/src/main/java/net/runelite/api/EquipmentInventorySlot.java # runelite-api/src/main/java/net/runelite/api/NPCDefinition.java # runelite-api/src/main/java/net/runelite/api/Perspective.java # runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java # runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java # runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java # runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java # runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java # runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java # runelite-api/src/main/java/net/runelite/api/events/SpotAnimationChanged.java # runelite-api/src/main/java/net/runelite/api/vars/AccountType.java # runelite-api/src/main/java/net/runelite/mapping/Construct.java # runelite-api/src/main/java/net/runelite/mapping/Hook.java # runelite-api/src/main/java/net/runelite/mapping/Implements.java # runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java # runelite-client/src/main/java/net/runelite/client/game/ItemManager.java # runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java # runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java # runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java # runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java # runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java # runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java # runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java # runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java # runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java # runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java # runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java # runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java # runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java # runescape-api/src/main/java/net/runelite/mapping/Implements.java # runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java # runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java # runescape-api/src/main/java/net/runelite/rs/api/RSClient.java # runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java # runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java # runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java # runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java # runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java # runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java # runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java # runescape-api/src/main/java/net/runelite/rs/api/RSItem.java # runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java # runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java # runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java # runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java # runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java # runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java # runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java # runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java # runescape-api/src/main/java/net/runelite/rs/api/RSModel.java # runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java # runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java # runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java # runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java # runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java # runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
This commit is contained in:
Lucas
266
runescape-client/src/main/java/WorldMapLabel.java
Normal file
266
runescape-client/src/main/java/WorldMapLabel.java
Normal file
@@ -0,0 +1,266 @@
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InvalidClassException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.OptionalDataException;
|
||||
import java.io.StreamCorruptedException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import net.runelite.mapping.Export;
|
||||
import net.runelite.mapping.Implements;
|
||||
import net.runelite.mapping.ObfuscatedGetter;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
import net.runelite.rs.Reflection;
|
||||
|
||||
@ObfuscatedName("aj")
|
||||
@Implements("WorldMapLabel")
|
||||
public class WorldMapLabel {
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1536028937
|
||||
)
|
||||
@Export("__aj_e")
|
||||
public static int __aj_e;
|
||||
@ObfuscatedName("m")
|
||||
@Export("text")
|
||||
String text;
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -471061617
|
||||
)
|
||||
@Export("width")
|
||||
int width;
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -85027761
|
||||
)
|
||||
@Export("height")
|
||||
int height;
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Ls;"
|
||||
)
|
||||
@Export("size")
|
||||
WorldMapLabelSize size;
|
||||
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Ljava/lang/String;IILs;)V"
|
||||
)
|
||||
WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) {
|
||||
this.text = var1;
|
||||
this.width = var2;
|
||||
this.height = var3;
|
||||
this.size = var4;
|
||||
}
|
||||
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lhx;I)V",
|
||||
garbageValue = "-1747135919"
|
||||
)
|
||||
public static void method443(PacketBuffer var0) {
|
||||
ReflectionCheck var1 = (ReflectionCheck)class322.reflectionChecks.last();
|
||||
if(var1 != null) {
|
||||
int var2 = var0.index;
|
||||
var0.writeInt(var1.id);
|
||||
|
||||
for(int var3 = 0; var3 < var1.size; ++var3) {
|
||||
if(var1.creationErrors[var3] != 0) {
|
||||
var0.writeByte(var1.creationErrors[var3]);
|
||||
} else {
|
||||
try {
|
||||
int var4 = var1.operations[var3];
|
||||
Field var5;
|
||||
int var6;
|
||||
if(var4 == 0) {
|
||||
var5 = var1.fields[var3];
|
||||
var6 = Reflection.getInt(var5, (Object)null);
|
||||
var0.writeByte(0);
|
||||
var0.writeInt(var6);
|
||||
} else if(var4 == 1) {
|
||||
var5 = var1.fields[var3];
|
||||
Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
|
||||
var0.writeByte(0);
|
||||
} else if(var4 == 2) {
|
||||
var5 = var1.fields[var3];
|
||||
var6 = var5.getModifiers();
|
||||
var0.writeByte(0);
|
||||
var0.writeInt(var6);
|
||||
}
|
||||
|
||||
Method var25;
|
||||
if(var4 != 3) {
|
||||
if(var4 == 4) {
|
||||
var25 = var1.methods[var3];
|
||||
var6 = var25.getModifiers();
|
||||
var0.writeByte(0);
|
||||
var0.writeInt(var6);
|
||||
}
|
||||
} else {
|
||||
var25 = var1.methods[var3];
|
||||
byte[][] var10 = var1.arguments[var3];
|
||||
Object[] var7 = new Object[var10.length];
|
||||
|
||||
for(int var8 = 0; var8 < var10.length; ++var8) {
|
||||
ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
|
||||
var7[var8] = var9.readObject();
|
||||
}
|
||||
|
||||
Object var11 = Reflection.invoke(var25, (Object)null, var7);
|
||||
if(var11 == null) {
|
||||
var0.writeByte(0);
|
||||
} else if(var11 instanceof Number) {
|
||||
var0.writeByte(1);
|
||||
var0.writeLong(((Number)var11).longValue());
|
||||
} else if(var11 instanceof String) {
|
||||
var0.writeByte(2);
|
||||
var0.writeStringCp1252NullTerminated((String)var11);
|
||||
} else {
|
||||
var0.writeByte(4);
|
||||
}
|
||||
}
|
||||
} catch (ClassNotFoundException var13) {
|
||||
var0.writeByte(-10);
|
||||
} catch (InvalidClassException var14) {
|
||||
var0.writeByte(-11);
|
||||
} catch (StreamCorruptedException var15) {
|
||||
var0.writeByte(-12);
|
||||
} catch (OptionalDataException var16) {
|
||||
var0.writeByte(-13);
|
||||
} catch (IllegalAccessException var17) {
|
||||
var0.writeByte(-14);
|
||||
} catch (IllegalArgumentException var18) {
|
||||
var0.writeByte(-15);
|
||||
} catch (InvocationTargetException var19) {
|
||||
var0.writeByte(-16);
|
||||
} catch (SecurityException var20) {
|
||||
var0.writeByte(-17);
|
||||
} catch (IOException var21) {
|
||||
var0.writeByte(-18);
|
||||
} catch (NullPointerException var22) {
|
||||
var0.writeByte(-19);
|
||||
} catch (Exception var23) {
|
||||
var0.writeByte(-20);
|
||||
} catch (Throwable var24) {
|
||||
var0.writeByte(-21);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var0.__aa_312(var2);
|
||||
var1.remove();
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(III)I",
|
||||
garbageValue = "823291412"
|
||||
)
|
||||
static int method442(int var0, int var1) {
|
||||
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
|
||||
return var2 == null?0:(var1 >= 0 && var1 < var2.quantities.length?var2.quantities[var1]:0);
|
||||
}
|
||||
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)[Llq;",
|
||||
garbageValue = "-1374541046"
|
||||
)
|
||||
public static IndexedSprite[] method444() {
|
||||
IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount];
|
||||
|
||||
for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
|
||||
IndexedSprite var2 = var0[var1] = new IndexedSprite();
|
||||
var2.width = class328.indexedSpriteWidth;
|
||||
var2.height = class328.indexedSpriteHeight;
|
||||
var2.xOffset = class328.indexedSpriteOffsetXs[var1];
|
||||
var2.yOffset = class328.indexedSpriteOffsetYs[var1];
|
||||
var2.subWidth = VarbitDefinition.indexedSpriteWidths[var1];
|
||||
var2.subHeight = SecureRandomCallable.indexedSpriteHeights[var1];
|
||||
var2.palette = class328.indexedSpritePalette;
|
||||
var2.pixels = class328.spritePixels[var1];
|
||||
}
|
||||
|
||||
class328.indexedSpriteOffsetXs = null;
|
||||
class328.indexedSpriteOffsetYs = null;
|
||||
VarbitDefinition.indexedSpriteWidths = null;
|
||||
SecureRandomCallable.indexedSpriteHeights = null;
|
||||
class328.indexedSpritePalette = null;
|
||||
class328.spritePixels = null;
|
||||
return var0;
|
||||
}
|
||||
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lbt;Lbt;IZI)I",
|
||||
garbageValue = "1459100828"
|
||||
)
|
||||
@Export("compareWorlds")
|
||||
static int compareWorlds(World var0, World var1, int var2, boolean var3) {
|
||||
if(var2 == 1) {
|
||||
int var4 = var0.population;
|
||||
int var5 = var1.population;
|
||||
if(!var3) {
|
||||
if(var4 == -1) {
|
||||
var4 = 2001;
|
||||
}
|
||||
|
||||
if(var5 == -1) {
|
||||
var5 = 2001;
|
||||
}
|
||||
}
|
||||
|
||||
return var4 - var5;
|
||||
} else {
|
||||
return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.__d_146()?(var1.__d_146()?0:1):(var1.__d_146()?-1:0)):(var2 == 7?(var0.__e_144()?(var1.__e_144()?0:1):(var1.__e_144()?-1:0)):var0.id - var1.id)))));
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(B)V",
|
||||
garbageValue = "60"
|
||||
)
|
||||
public static void method440() {
|
||||
NpcDefinition.NpcDefinition_cached.clear();
|
||||
NpcDefinition.NpcDefinition_cachedModels.clear();
|
||||
}
|
||||
|
||||
@ObfuscatedName("gx")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIII)V",
|
||||
garbageValue = "-1610474394"
|
||||
)
|
||||
@Export("worldToScreen")
|
||||
static final void worldToScreen(int var0, int var1, int var2) {
|
||||
if(var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
|
||||
int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
|
||||
var0 -= WorldMapSection1.cameraX;
|
||||
var3 -= GrandExchangeEvents.cameraY;
|
||||
var1 -= class11.cameraZ;
|
||||
int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch];
|
||||
int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon1.cameraPitch];
|
||||
int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode.cameraYaw];
|
||||
int var7 = Rasterizer3D.Rasterizer3D_cosine[MusicPatchNode.cameraYaw];
|
||||
int var8 = var0 * var7 + var6 * var1 >> 16;
|
||||
var1 = var7 * var1 - var0 * var6 >> 16;
|
||||
var0 = var8;
|
||||
var8 = var3 * var5 - var4 * var1 >> 16;
|
||||
var1 = var5 * var1 + var3 * var4 >> 16;
|
||||
if(var1 >= 50) {
|
||||
Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
|
||||
Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2;
|
||||
} else {
|
||||
Client.viewportTempX = -1;
|
||||
Client.viewportTempY = -1;
|
||||
}
|
||||
|
||||
} else {
|
||||
Client.viewportTempX = -1;
|
||||
Client.viewportTempY = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user