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
2019-06-08 23:06:59 +02:00
490 changed files with 740 additions and 38563 deletions

View File

@@ -0,0 +1,248 @@
import java.text.DecimalFormat;
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;
@ObfuscatedName("cu")
@Implements("Login")
public class Login {
@ObfuscatedName("f")
@Export("__cu_f")
static boolean __cu_f;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 1606541885
)
@Export("__cu_q")
static int __cu_q;
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Llq;"
)
@Export("__cu_o")
static IndexedSprite __cu_o;
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lln;"
)
@Export("__cu_g")
static Sprite __cu_g;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -184301597
)
@Export("pcmPlayerCount")
static int pcmPlayerCount;
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "Llq;"
)
@Export("__cu_d")
static IndexedSprite __cu_d;
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = 932541923
)
@Export("__cu_y")
static int __cu_y;
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = -504870061
)
@Export("Login_loadingPercent")
static int Login_loadingPercent;
@ObfuscatedName("c")
@Export("Login_loadingText")
static String Login_loadingText;
@ObfuscatedName("aj")
@ObfuscatedGetter(
intValue = 1077910071
)
@Export("__cu_aj")
static int __cu_aj;
@ObfuscatedName("ac")
@ObfuscatedGetter(
intValue = 1677133239
)
@Export("__cu_ac")
static int __cu_ac;
@ObfuscatedName("aw")
@ObfuscatedGetter(
intValue = 1861681835
)
@Export("loginIndex")
static int loginIndex;
@ObfuscatedName("al")
@Export("Login_response0")
static String Login_response0;
@ObfuscatedName("ab")
@Export("Login_response1")
static String Login_response1;
@ObfuscatedName("ae")
@Export("Login_response2")
static String Login_response2;
@ObfuscatedName("at")
@Export("Login_response3")
static String Login_response3;
@ObfuscatedName("ad")
@Export("Login_username")
static String Login_username;
@ObfuscatedName("ap")
@Export("Login_password")
static String Login_password;
@ObfuscatedName("aa")
@Export("__cu_aa")
static boolean __cu_aa;
@ObfuscatedName("ax")
@Export("__cu_ax")
static boolean __cu_ax;
@ObfuscatedName("ai")
@Export("otp")
static String otp;
@ObfuscatedName("ba")
@Export("__cu_ba")
static boolean __cu_ba;
@ObfuscatedName("bb")
@ObfuscatedGetter(
intValue = 1769484271
)
@Export("currentLoginField")
static int currentLoginField;
@ObfuscatedName("bk")
@Export("__cu_bk")
static boolean __cu_bk;
@ObfuscatedName("bl")
@ObfuscatedGetter(
intValue = 1431381579
)
@Export("__cu_bl")
static int __cu_bl;
@ObfuscatedName("br")
@ObfuscatedGetter(
intValue = -376233039
)
@Export("__cu_br")
static int __cu_br;
@ObfuscatedName("bj")
@ObfuscatedGetter(
intValue = 1548722671
)
@Export("__cu_bj")
static int __cu_bj;
@ObfuscatedName("bi")
@ObfuscatedGetter(
longValue = 803647694904294325L
)
@Export("__cu_bi")
static long __cu_bi;
@ObfuscatedName("bz")
@ObfuscatedGetter(
longValue = -3234258972092460093L
)
@Export("__cu_bz")
static long __cu_bz;
@ObfuscatedName("do")
@ObfuscatedSignature(
signature = "Lit;"
)
@Export("indexCache11")
static IndexCache indexCache11;
static {
__cu_q = 0;
__cu_y = __cu_q + 202;
Login_loadingPercent = 10;
Login_loadingText = "";
__cu_aj = -1;
__cu_ac = 1;
loginIndex = 0;
Login_response0 = "";
Login_response1 = "";
Login_response2 = "";
Login_response3 = "";
Login_username = "";
Login_password = "";
__cu_aa = false;
__cu_ax = false;
__cu_ba = true;
currentLoginField = 0;
__cu_bk = false;
__cu_bl = -1;
__cu_br = 0;
__cu_bj = 0;
new DecimalFormat("##0.00");
new class161();
__cu_bi = -1L;
__cu_bz = -1L;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lir;II)Lhl;",
garbageValue = "-1625685874"
)
static MusicPatch method2045(AbstractIndexCache var0, int var1) {
byte[] var2 = var0.takeRecordFlat(var1);
return var2 == null?null:new MusicPatch(var2);
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-246495141"
)
static void method2056() {
class248.__iu_e = new int[2000];
int var0 = 0;
int var1 = 240;
int var3;
for(byte var2 = 12; var0 < 16; var1 -= var2) {
var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
class248.__iu_e[var0] = var3;
++var0;
}
var1 = 48;
for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) {
var3 = var0 * 2;
for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) {
class248.__iu_e[var0] = var4;
}
}
}
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Lir;IIIZB)V",
garbageValue = "45"
)
public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) {
class214.__hf_o = 1;
class214.__hf_u = var0;
class30.musicTrackArchiveId = var1;
GrandExchangeOffer.musicTrackFileId = var2;
WorldMapLabel.__aj_e = var3;
RectangleMode.musicTrackBoolean = var4;
FaceNormal.__el_x = 10000;
}
@ObfuscatedName("gm")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "-1"
)
static final int method2061() {
if(ReflectionCheck.clientPreferences.roofsHidden) {
return SoundSystem.plane;
} else {
int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane);
return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3;
}
}
}