Merge remote-tracking branch 'runelite/master'
This commit is contained in:
Owain van Brakel
@@ -25,7 +25,7 @@
|
||||
|
||||
object ProjectVersions {
|
||||
const val launcherVersion = "2.2.0"
|
||||
const val rlVersion = "1.6.20"
|
||||
const val rlVersion = "1.6.21"
|
||||
|
||||
const val openosrsVersion = "3.3.8"
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ public enum ConfigType
|
||||
VARCLIENTSTRING(15),
|
||||
VARPLAYER(16),
|
||||
HITSPLAT(32),
|
||||
HEALTHBAR(33),
|
||||
STRUCT(34),
|
||||
AREA(35);
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Trevor <https://github.com/Trevor159>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache.definitions;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class HealthBarDefinition
|
||||
{
|
||||
public int id;
|
||||
public int field3276;
|
||||
public int field3277;
|
||||
public int field3278;
|
||||
public int field3283;
|
||||
public int field3272;
|
||||
public int field3275;
|
||||
public int healthBarFrontSpriteId;
|
||||
public int healthBarBackSpriteId;
|
||||
public int healthScale;
|
||||
public int healthBarPadding;
|
||||
}
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Trevor <https://github.com/Trevor159>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache.definitions.loaders;
|
||||
|
||||
import net.runelite.cache.definitions.HealthBarDefinition;
|
||||
import net.runelite.cache.io.InputStream;
|
||||
|
||||
public class HealthBarLoader
|
||||
{
|
||||
public HealthBarDefinition load(int id, byte[] b)
|
||||
{
|
||||
HealthBarDefinition def = new HealthBarDefinition();
|
||||
InputStream is = new InputStream(b);
|
||||
def.id = id;
|
||||
|
||||
while (true)
|
||||
{
|
||||
int opcode = is.readUnsignedByte();
|
||||
if (opcode == 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
this.decodeValues(opcode, def, is);
|
||||
}
|
||||
|
||||
return def;
|
||||
}
|
||||
|
||||
private void decodeValues(int opcode, HealthBarDefinition def, InputStream stream)
|
||||
{
|
||||
if (opcode == 1)
|
||||
{
|
||||
stream.readUnsignedShort();
|
||||
}
|
||||
else if (opcode == 2)
|
||||
{
|
||||
def.field3277 = stream.readUnsignedByte();
|
||||
}
|
||||
else if (opcode == 3)
|
||||
{
|
||||
def.field3278 = stream.readUnsignedByte();
|
||||
}
|
||||
else if (opcode == 4)
|
||||
{
|
||||
def.field3283 = 0;
|
||||
}
|
||||
else if (opcode == 5)
|
||||
{
|
||||
def.field3275 = stream.readUnsignedShort();
|
||||
}
|
||||
else if (opcode == 6)
|
||||
{
|
||||
stream.readUnsignedByte();
|
||||
}
|
||||
else if (opcode == 7)
|
||||
{
|
||||
def.healthBarFrontSpriteId = stream.readBigSmart2();
|
||||
}
|
||||
else if (opcode == 8)
|
||||
{
|
||||
def.healthBarBackSpriteId = stream.readBigSmart2();
|
||||
}
|
||||
else if (opcode == 11)
|
||||
{
|
||||
def.field3283 = stream.readUnsignedShort();
|
||||
}
|
||||
else if (opcode == 14)
|
||||
{
|
||||
def.healthScale = stream.readUnsignedByte();
|
||||
}
|
||||
else if (opcode == 15)
|
||||
{
|
||||
def.healthBarPadding = stream.readUnsignedByte();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Trevor <https://github.com/Trevor159>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache;
|
||||
|
||||
import com.google.common.io.Files;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.runelite.cache.definitions.HealthBarDefinition;
|
||||
import net.runelite.cache.definitions.loaders.HealthBarLoader;
|
||||
import net.runelite.cache.fs.Archive;
|
||||
import net.runelite.cache.fs.ArchiveFiles;
|
||||
import net.runelite.cache.fs.FSFile;
|
||||
import net.runelite.cache.fs.Index;
|
||||
import net.runelite.cache.fs.Storage;
|
||||
import net.runelite.cache.fs.Store;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TemporaryFolder;
|
||||
|
||||
@Slf4j
|
||||
public class HealthBarDumper
|
||||
{
|
||||
private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
|
||||
@Rule
|
||||
public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void test() throws IOException
|
||||
{
|
||||
File dumpDir = folder.newFolder("healthbars");
|
||||
int count = 0;
|
||||
|
||||
try (Store store = new Store(StoreLocation.LOCATION))
|
||||
{
|
||||
store.load();
|
||||
|
||||
Storage storage = store.getStorage();
|
||||
Index index = store.getIndex(IndexType.CONFIGS);
|
||||
Archive archive = index.getArchive(ConfigType.HEALTHBAR.getId());
|
||||
|
||||
byte[] archiveData = storage.loadArchive(archive);
|
||||
ArchiveFiles files = archive.getFiles(archiveData);
|
||||
|
||||
HealthBarLoader loader = new HealthBarLoader();
|
||||
|
||||
for (FSFile file : files.getFiles())
|
||||
{
|
||||
byte[] b = file.getContents();
|
||||
|
||||
HealthBarDefinition def = loader.load(file.getFileId(), b);
|
||||
|
||||
if (def != null)
|
||||
{
|
||||
Files.asCharSink(new File(dumpDir, file.getFileId() + ".json"), Charset.defaultCharset()).write(gson.toJson(def));
|
||||
++count;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log.info("Dumped {} healthbars to {}", count, dumpDir);
|
||||
}
|
||||
}
|
||||
@@ -11359,7 +11359,7 @@ public final class ItemID
|
||||
public static final int TWISTED_BANNER = 24413;
|
||||
public static final int RUNE_POUCH_L = 24416;
|
||||
public static final int INQUISITORS_MACE = 24417;
|
||||
public static final int CABBAGE_24418 = 24418;
|
||||
public static final int GRAVESTONE = 24418;
|
||||
public static final int INQUISITORS_GREAT_HELM = 24419;
|
||||
public static final int INQUISITORS_HAUBERK = 24420;
|
||||
public static final int INQUISITORS_PLATESKIRT = 24421;
|
||||
@@ -11408,6 +11408,8 @@ public final class ItemID
|
||||
public static final int VOLATILE_ORB = 24514;
|
||||
public static final int ELDRITCH_ORB = 24517;
|
||||
public static final int VICTORS_CAPE_1000 = 24520;
|
||||
public static final int DEATHS_COFFER = 24523;
|
||||
public static final int GRAVESTONE_24524 = 24524;
|
||||
public static final int CAT_EARS = 24525;
|
||||
public static final int HELL_CAT_EARS = 24527;
|
||||
public static final int LAMP_OF_THE_GATHERER = 24528;
|
||||
@@ -11572,5 +11574,9 @@ public final class ItemID
|
||||
public static final int VYRE_NOBLE_DRESS_BOTTOM_24840 = 24840;
|
||||
public static final int A_TASTE_OF_HOPE = 24842;
|
||||
public static final int RING_OF_ENDURANCE_UNCHARGED_24844 = 24844;
|
||||
public static final int RED = 24847;
|
||||
public static final int ZIGGY = 24849;
|
||||
public static final int SOFT_CLAY_PACK_24851 = 24851;
|
||||
public static final int BAG_FULL_OF_GEMS_24853 = 24853;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -8750,5 +8750,13 @@ public final class NpcID
|
||||
public static final int CHILD_9799 = 9799;
|
||||
public static final int SLEEPWALKER_9801 = 9801;
|
||||
public static final int SLEEPWALKER_9802 = 9802;
|
||||
public static final int RED = 9850;
|
||||
public static final int ZIGGY = 9851;
|
||||
public static final int RED_9852 = 9852;
|
||||
public static final int ZIGGY_9853 = 9853;
|
||||
public static final int DEATH_9855 = 9855;
|
||||
public static final int GRAVE = 9856;
|
||||
public static final int GRAVE_9857 = 9857;
|
||||
public static final int SQUIRE_10368 = 10368;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -12906,8 +12906,6 @@ public final class NullItemID
|
||||
public static final int NULL_24519 = 24519;
|
||||
public static final int NULL_24521 = 24521;
|
||||
public static final int NULL_24522 = 24522;
|
||||
public static final int NULL_24523 = 24523;
|
||||
public static final int NULL_24524 = 24524;
|
||||
public static final int NULL_24526 = 24526;
|
||||
public static final int NULL_24530 = 24530;
|
||||
public static final int NULL_24532 = 24532;
|
||||
@@ -13066,5 +13064,9 @@ public final class NullItemID
|
||||
public static final int NULL_24843 = 24843;
|
||||
public static final int NULL_24845 = 24845;
|
||||
public static final int NULL_24846 = 24846;
|
||||
public static final int NULL_24848 = 24848;
|
||||
public static final int NULL_24850 = 24850;
|
||||
public static final int NULL_24852 = 24852;
|
||||
public static final int NULL_24854 = 24854;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -1081,5 +1081,516 @@ public final class NullNpcID
|
||||
public static final int NULL_9847 = 9847;
|
||||
public static final int NULL_9848 = 9848;
|
||||
public static final int NULL_9849 = 9849;
|
||||
public static final int NULL_9854 = 9854;
|
||||
public static final int NULL_9858 = 9858;
|
||||
public static final int NULL_9859 = 9859;
|
||||
public static final int NULL_9860 = 9860;
|
||||
public static final int NULL_9861 = 9861;
|
||||
public static final int NULL_9862 = 9862;
|
||||
public static final int NULL_9863 = 9863;
|
||||
public static final int NULL_9864 = 9864;
|
||||
public static final int NULL_9865 = 9865;
|
||||
public static final int NULL_9866 = 9866;
|
||||
public static final int NULL_9867 = 9867;
|
||||
public static final int NULL_9868 = 9868;
|
||||
public static final int NULL_9869 = 9869;
|
||||
public static final int NULL_9870 = 9870;
|
||||
public static final int NULL_9871 = 9871;
|
||||
public static final int NULL_9872 = 9872;
|
||||
public static final int NULL_9873 = 9873;
|
||||
public static final int NULL_9874 = 9874;
|
||||
public static final int NULL_9875 = 9875;
|
||||
public static final int NULL_9876 = 9876;
|
||||
public static final int NULL_9877 = 9877;
|
||||
public static final int NULL_9878 = 9878;
|
||||
public static final int NULL_9879 = 9879;
|
||||
public static final int NULL_9880 = 9880;
|
||||
public static final int NULL_9881 = 9881;
|
||||
public static final int NULL_9882 = 9882;
|
||||
public static final int NULL_9883 = 9883;
|
||||
public static final int NULL_9884 = 9884;
|
||||
public static final int NULL_9885 = 9885;
|
||||
public static final int NULL_9886 = 9886;
|
||||
public static final int NULL_9887 = 9887;
|
||||
public static final int NULL_9888 = 9888;
|
||||
public static final int NULL_9889 = 9889;
|
||||
public static final int NULL_9890 = 9890;
|
||||
public static final int NULL_9891 = 9891;
|
||||
public static final int NULL_9892 = 9892;
|
||||
public static final int NULL_9893 = 9893;
|
||||
public static final int NULL_9894 = 9894;
|
||||
public static final int NULL_9895 = 9895;
|
||||
public static final int NULL_9896 = 9896;
|
||||
public static final int NULL_9897 = 9897;
|
||||
public static final int NULL_9898 = 9898;
|
||||
public static final int NULL_9899 = 9899;
|
||||
public static final int NULL_9900 = 9900;
|
||||
public static final int NULL_9901 = 9901;
|
||||
public static final int NULL_9902 = 9902;
|
||||
public static final int NULL_9903 = 9903;
|
||||
public static final int NULL_9904 = 9904;
|
||||
public static final int NULL_9905 = 9905;
|
||||
public static final int NULL_9906 = 9906;
|
||||
public static final int NULL_9907 = 9907;
|
||||
public static final int NULL_9908 = 9908;
|
||||
public static final int NULL_9909 = 9909;
|
||||
public static final int NULL_9910 = 9910;
|
||||
public static final int NULL_9911 = 9911;
|
||||
public static final int NULL_9912 = 9912;
|
||||
public static final int NULL_9913 = 9913;
|
||||
public static final int NULL_9914 = 9914;
|
||||
public static final int NULL_9915 = 9915;
|
||||
public static final int NULL_9916 = 9916;
|
||||
public static final int NULL_9917 = 9917;
|
||||
public static final int NULL_9918 = 9918;
|
||||
public static final int NULL_9919 = 9919;
|
||||
public static final int NULL_9920 = 9920;
|
||||
public static final int NULL_9921 = 9921;
|
||||
public static final int NULL_9922 = 9922;
|
||||
public static final int NULL_9923 = 9923;
|
||||
public static final int NULL_9924 = 9924;
|
||||
public static final int NULL_9925 = 9925;
|
||||
public static final int NULL_9926 = 9926;
|
||||
public static final int NULL_9927 = 9927;
|
||||
public static final int NULL_9928 = 9928;
|
||||
public static final int NULL_9929 = 9929;
|
||||
public static final int NULL_9930 = 9930;
|
||||
public static final int NULL_9931 = 9931;
|
||||
public static final int NULL_9932 = 9932;
|
||||
public static final int NULL_9933 = 9933;
|
||||
public static final int NULL_9934 = 9934;
|
||||
public static final int NULL_9935 = 9935;
|
||||
public static final int NULL_9936 = 9936;
|
||||
public static final int NULL_9937 = 9937;
|
||||
public static final int NULL_9938 = 9938;
|
||||
public static final int NULL_9939 = 9939;
|
||||
public static final int NULL_9940 = 9940;
|
||||
public static final int NULL_9941 = 9941;
|
||||
public static final int NULL_9942 = 9942;
|
||||
public static final int NULL_9943 = 9943;
|
||||
public static final int NULL_9944 = 9944;
|
||||
public static final int NULL_9945 = 9945;
|
||||
public static final int NULL_9946 = 9946;
|
||||
public static final int NULL_9947 = 9947;
|
||||
public static final int NULL_9948 = 9948;
|
||||
public static final int NULL_9949 = 9949;
|
||||
public static final int NULL_9950 = 9950;
|
||||
public static final int NULL_9951 = 9951;
|
||||
public static final int NULL_9952 = 9952;
|
||||
public static final int NULL_9953 = 9953;
|
||||
public static final int NULL_9954 = 9954;
|
||||
public static final int NULL_9955 = 9955;
|
||||
public static final int NULL_9956 = 9956;
|
||||
public static final int NULL_9957 = 9957;
|
||||
public static final int NULL_9958 = 9958;
|
||||
public static final int NULL_9959 = 9959;
|
||||
public static final int NULL_9960 = 9960;
|
||||
public static final int NULL_9961 = 9961;
|
||||
public static final int NULL_9962 = 9962;
|
||||
public static final int NULL_9963 = 9963;
|
||||
public static final int NULL_9964 = 9964;
|
||||
public static final int NULL_9965 = 9965;
|
||||
public static final int NULL_9966 = 9966;
|
||||
public static final int NULL_9967 = 9967;
|
||||
public static final int NULL_9968 = 9968;
|
||||
public static final int NULL_9969 = 9969;
|
||||
public static final int NULL_9970 = 9970;
|
||||
public static final int NULL_9971 = 9971;
|
||||
public static final int NULL_9972 = 9972;
|
||||
public static final int NULL_9973 = 9973;
|
||||
public static final int NULL_9974 = 9974;
|
||||
public static final int NULL_9975 = 9975;
|
||||
public static final int NULL_9976 = 9976;
|
||||
public static final int NULL_9977 = 9977;
|
||||
public static final int NULL_9978 = 9978;
|
||||
public static final int NULL_9979 = 9979;
|
||||
public static final int NULL_9980 = 9980;
|
||||
public static final int NULL_9981 = 9981;
|
||||
public static final int NULL_9982 = 9982;
|
||||
public static final int NULL_9983 = 9983;
|
||||
public static final int NULL_9984 = 9984;
|
||||
public static final int NULL_9985 = 9985;
|
||||
public static final int NULL_9986 = 9986;
|
||||
public static final int NULL_9987 = 9987;
|
||||
public static final int NULL_9988 = 9988;
|
||||
public static final int NULL_9989 = 9989;
|
||||
public static final int NULL_9990 = 9990;
|
||||
public static final int NULL_9991 = 9991;
|
||||
public static final int NULL_9992 = 9992;
|
||||
public static final int NULL_9993 = 9993;
|
||||
public static final int NULL_9994 = 9994;
|
||||
public static final int NULL_9995 = 9995;
|
||||
public static final int NULL_9996 = 9996;
|
||||
public static final int NULL_9997 = 9997;
|
||||
public static final int NULL_9998 = 9998;
|
||||
public static final int NULL_9999 = 9999;
|
||||
public static final int NULL_10000 = 10000;
|
||||
public static final int NULL_10001 = 10001;
|
||||
public static final int NULL_10002 = 10002;
|
||||
public static final int NULL_10003 = 10003;
|
||||
public static final int NULL_10004 = 10004;
|
||||
public static final int NULL_10005 = 10005;
|
||||
public static final int NULL_10006 = 10006;
|
||||
public static final int NULL_10007 = 10007;
|
||||
public static final int NULL_10008 = 10008;
|
||||
public static final int NULL_10009 = 10009;
|
||||
public static final int NULL_10010 = 10010;
|
||||
public static final int NULL_10011 = 10011;
|
||||
public static final int NULL_10012 = 10012;
|
||||
public static final int NULL_10013 = 10013;
|
||||
public static final int NULL_10014 = 10014;
|
||||
public static final int NULL_10015 = 10015;
|
||||
public static final int NULL_10016 = 10016;
|
||||
public static final int NULL_10017 = 10017;
|
||||
public static final int NULL_10018 = 10018;
|
||||
public static final int NULL_10019 = 10019;
|
||||
public static final int NULL_10020 = 10020;
|
||||
public static final int NULL_10021 = 10021;
|
||||
public static final int NULL_10022 = 10022;
|
||||
public static final int NULL_10023 = 10023;
|
||||
public static final int NULL_10024 = 10024;
|
||||
public static final int NULL_10025 = 10025;
|
||||
public static final int NULL_10026 = 10026;
|
||||
public static final int NULL_10027 = 10027;
|
||||
public static final int NULL_10028 = 10028;
|
||||
public static final int NULL_10029 = 10029;
|
||||
public static final int NULL_10030 = 10030;
|
||||
public static final int NULL_10031 = 10031;
|
||||
public static final int NULL_10032 = 10032;
|
||||
public static final int NULL_10033 = 10033;
|
||||
public static final int NULL_10034 = 10034;
|
||||
public static final int NULL_10035 = 10035;
|
||||
public static final int NULL_10036 = 10036;
|
||||
public static final int NULL_10037 = 10037;
|
||||
public static final int NULL_10038 = 10038;
|
||||
public static final int NULL_10039 = 10039;
|
||||
public static final int NULL_10040 = 10040;
|
||||
public static final int NULL_10041 = 10041;
|
||||
public static final int NULL_10042 = 10042;
|
||||
public static final int NULL_10043 = 10043;
|
||||
public static final int NULL_10044 = 10044;
|
||||
public static final int NULL_10045 = 10045;
|
||||
public static final int NULL_10046 = 10046;
|
||||
public static final int NULL_10047 = 10047;
|
||||
public static final int NULL_10048 = 10048;
|
||||
public static final int NULL_10049 = 10049;
|
||||
public static final int NULL_10050 = 10050;
|
||||
public static final int NULL_10051 = 10051;
|
||||
public static final int NULL_10052 = 10052;
|
||||
public static final int NULL_10053 = 10053;
|
||||
public static final int NULL_10054 = 10054;
|
||||
public static final int NULL_10055 = 10055;
|
||||
public static final int NULL_10056 = 10056;
|
||||
public static final int NULL_10057 = 10057;
|
||||
public static final int NULL_10058 = 10058;
|
||||
public static final int NULL_10059 = 10059;
|
||||
public static final int NULL_10060 = 10060;
|
||||
public static final int NULL_10061 = 10061;
|
||||
public static final int NULL_10062 = 10062;
|
||||
public static final int NULL_10063 = 10063;
|
||||
public static final int NULL_10064 = 10064;
|
||||
public static final int NULL_10065 = 10065;
|
||||
public static final int NULL_10066 = 10066;
|
||||
public static final int NULL_10067 = 10067;
|
||||
public static final int NULL_10068 = 10068;
|
||||
public static final int NULL_10069 = 10069;
|
||||
public static final int NULL_10070 = 10070;
|
||||
public static final int NULL_10071 = 10071;
|
||||
public static final int NULL_10072 = 10072;
|
||||
public static final int NULL_10073 = 10073;
|
||||
public static final int NULL_10074 = 10074;
|
||||
public static final int NULL_10075 = 10075;
|
||||
public static final int NULL_10076 = 10076;
|
||||
public static final int NULL_10077 = 10077;
|
||||
public static final int NULL_10078 = 10078;
|
||||
public static final int NULL_10079 = 10079;
|
||||
public static final int NULL_10080 = 10080;
|
||||
public static final int NULL_10081 = 10081;
|
||||
public static final int NULL_10082 = 10082;
|
||||
public static final int NULL_10083 = 10083;
|
||||
public static final int NULL_10084 = 10084;
|
||||
public static final int NULL_10085 = 10085;
|
||||
public static final int NULL_10086 = 10086;
|
||||
public static final int NULL_10087 = 10087;
|
||||
public static final int NULL_10088 = 10088;
|
||||
public static final int NULL_10089 = 10089;
|
||||
public static final int NULL_10090 = 10090;
|
||||
public static final int NULL_10091 = 10091;
|
||||
public static final int NULL_10092 = 10092;
|
||||
public static final int NULL_10093 = 10093;
|
||||
public static final int NULL_10094 = 10094;
|
||||
public static final int NULL_10095 = 10095;
|
||||
public static final int NULL_10096 = 10096;
|
||||
public static final int NULL_10097 = 10097;
|
||||
public static final int NULL_10098 = 10098;
|
||||
public static final int NULL_10099 = 10099;
|
||||
public static final int NULL_10100 = 10100;
|
||||
public static final int NULL_10101 = 10101;
|
||||
public static final int NULL_10102 = 10102;
|
||||
public static final int NULL_10103 = 10103;
|
||||
public static final int NULL_10104 = 10104;
|
||||
public static final int NULL_10105 = 10105;
|
||||
public static final int NULL_10106 = 10106;
|
||||
public static final int NULL_10107 = 10107;
|
||||
public static final int NULL_10108 = 10108;
|
||||
public static final int NULL_10109 = 10109;
|
||||
public static final int NULL_10110 = 10110;
|
||||
public static final int NULL_10111 = 10111;
|
||||
public static final int NULL_10112 = 10112;
|
||||
public static final int NULL_10113 = 10113;
|
||||
public static final int NULL_10114 = 10114;
|
||||
public static final int NULL_10115 = 10115;
|
||||
public static final int NULL_10116 = 10116;
|
||||
public static final int NULL_10117 = 10117;
|
||||
public static final int NULL_10118 = 10118;
|
||||
public static final int NULL_10119 = 10119;
|
||||
public static final int NULL_10120 = 10120;
|
||||
public static final int NULL_10121 = 10121;
|
||||
public static final int NULL_10122 = 10122;
|
||||
public static final int NULL_10123 = 10123;
|
||||
public static final int NULL_10124 = 10124;
|
||||
public static final int NULL_10125 = 10125;
|
||||
public static final int NULL_10126 = 10126;
|
||||
public static final int NULL_10127 = 10127;
|
||||
public static final int NULL_10128 = 10128;
|
||||
public static final int NULL_10129 = 10129;
|
||||
public static final int NULL_10130 = 10130;
|
||||
public static final int NULL_10131 = 10131;
|
||||
public static final int NULL_10132 = 10132;
|
||||
public static final int NULL_10133 = 10133;
|
||||
public static final int NULL_10134 = 10134;
|
||||
public static final int NULL_10135 = 10135;
|
||||
public static final int NULL_10136 = 10136;
|
||||
public static final int NULL_10137 = 10137;
|
||||
public static final int NULL_10138 = 10138;
|
||||
public static final int NULL_10139 = 10139;
|
||||
public static final int NULL_10140 = 10140;
|
||||
public static final int NULL_10141 = 10141;
|
||||
public static final int NULL_10142 = 10142;
|
||||
public static final int NULL_10143 = 10143;
|
||||
public static final int NULL_10144 = 10144;
|
||||
public static final int NULL_10145 = 10145;
|
||||
public static final int NULL_10146 = 10146;
|
||||
public static final int NULL_10147 = 10147;
|
||||
public static final int NULL_10148 = 10148;
|
||||
public static final int NULL_10149 = 10149;
|
||||
public static final int NULL_10150 = 10150;
|
||||
public static final int NULL_10151 = 10151;
|
||||
public static final int NULL_10152 = 10152;
|
||||
public static final int NULL_10153 = 10153;
|
||||
public static final int NULL_10154 = 10154;
|
||||
public static final int NULL_10155 = 10155;
|
||||
public static final int NULL_10156 = 10156;
|
||||
public static final int NULL_10157 = 10157;
|
||||
public static final int NULL_10158 = 10158;
|
||||
public static final int NULL_10159 = 10159;
|
||||
public static final int NULL_10160 = 10160;
|
||||
public static final int NULL_10161 = 10161;
|
||||
public static final int NULL_10162 = 10162;
|
||||
public static final int NULL_10163 = 10163;
|
||||
public static final int NULL_10164 = 10164;
|
||||
public static final int NULL_10165 = 10165;
|
||||
public static final int NULL_10166 = 10166;
|
||||
public static final int NULL_10167 = 10167;
|
||||
public static final int NULL_10168 = 10168;
|
||||
public static final int NULL_10169 = 10169;
|
||||
public static final int NULL_10170 = 10170;
|
||||
public static final int NULL_10171 = 10171;
|
||||
public static final int NULL_10172 = 10172;
|
||||
public static final int NULL_10173 = 10173;
|
||||
public static final int NULL_10174 = 10174;
|
||||
public static final int NULL_10175 = 10175;
|
||||
public static final int NULL_10176 = 10176;
|
||||
public static final int NULL_10177 = 10177;
|
||||
public static final int NULL_10178 = 10178;
|
||||
public static final int NULL_10179 = 10179;
|
||||
public static final int NULL_10180 = 10180;
|
||||
public static final int NULL_10181 = 10181;
|
||||
public static final int NULL_10182 = 10182;
|
||||
public static final int NULL_10183 = 10183;
|
||||
public static final int NULL_10184 = 10184;
|
||||
public static final int NULL_10185 = 10185;
|
||||
public static final int NULL_10186 = 10186;
|
||||
public static final int NULL_10187 = 10187;
|
||||
public static final int NULL_10188 = 10188;
|
||||
public static final int NULL_10189 = 10189;
|
||||
public static final int NULL_10190 = 10190;
|
||||
public static final int NULL_10191 = 10191;
|
||||
public static final int NULL_10192 = 10192;
|
||||
public static final int NULL_10193 = 10193;
|
||||
public static final int NULL_10194 = 10194;
|
||||
public static final int NULL_10195 = 10195;
|
||||
public static final int NULL_10196 = 10196;
|
||||
public static final int NULL_10197 = 10197;
|
||||
public static final int NULL_10198 = 10198;
|
||||
public static final int NULL_10199 = 10199;
|
||||
public static final int NULL_10200 = 10200;
|
||||
public static final int NULL_10201 = 10201;
|
||||
public static final int NULL_10202 = 10202;
|
||||
public static final int NULL_10203 = 10203;
|
||||
public static final int NULL_10204 = 10204;
|
||||
public static final int NULL_10205 = 10205;
|
||||
public static final int NULL_10206 = 10206;
|
||||
public static final int NULL_10207 = 10207;
|
||||
public static final int NULL_10208 = 10208;
|
||||
public static final int NULL_10209 = 10209;
|
||||
public static final int NULL_10210 = 10210;
|
||||
public static final int NULL_10211 = 10211;
|
||||
public static final int NULL_10212 = 10212;
|
||||
public static final int NULL_10213 = 10213;
|
||||
public static final int NULL_10214 = 10214;
|
||||
public static final int NULL_10215 = 10215;
|
||||
public static final int NULL_10216 = 10216;
|
||||
public static final int NULL_10217 = 10217;
|
||||
public static final int NULL_10218 = 10218;
|
||||
public static final int NULL_10219 = 10219;
|
||||
public static final int NULL_10220 = 10220;
|
||||
public static final int NULL_10221 = 10221;
|
||||
public static final int NULL_10222 = 10222;
|
||||
public static final int NULL_10223 = 10223;
|
||||
public static final int NULL_10224 = 10224;
|
||||
public static final int NULL_10225 = 10225;
|
||||
public static final int NULL_10226 = 10226;
|
||||
public static final int NULL_10227 = 10227;
|
||||
public static final int NULL_10228 = 10228;
|
||||
public static final int NULL_10229 = 10229;
|
||||
public static final int NULL_10230 = 10230;
|
||||
public static final int NULL_10231 = 10231;
|
||||
public static final int NULL_10232 = 10232;
|
||||
public static final int NULL_10233 = 10233;
|
||||
public static final int NULL_10234 = 10234;
|
||||
public static final int NULL_10235 = 10235;
|
||||
public static final int NULL_10236 = 10236;
|
||||
public static final int NULL_10237 = 10237;
|
||||
public static final int NULL_10238 = 10238;
|
||||
public static final int NULL_10239 = 10239;
|
||||
public static final int NULL_10240 = 10240;
|
||||
public static final int NULL_10241 = 10241;
|
||||
public static final int NULL_10242 = 10242;
|
||||
public static final int NULL_10243 = 10243;
|
||||
public static final int NULL_10244 = 10244;
|
||||
public static final int NULL_10245 = 10245;
|
||||
public static final int NULL_10246 = 10246;
|
||||
public static final int NULL_10247 = 10247;
|
||||
public static final int NULL_10248 = 10248;
|
||||
public static final int NULL_10249 = 10249;
|
||||
public static final int NULL_10250 = 10250;
|
||||
public static final int NULL_10251 = 10251;
|
||||
public static final int NULL_10252 = 10252;
|
||||
public static final int NULL_10253 = 10253;
|
||||
public static final int NULL_10254 = 10254;
|
||||
public static final int NULL_10255 = 10255;
|
||||
public static final int NULL_10256 = 10256;
|
||||
public static final int NULL_10257 = 10257;
|
||||
public static final int NULL_10258 = 10258;
|
||||
public static final int NULL_10259 = 10259;
|
||||
public static final int NULL_10260 = 10260;
|
||||
public static final int NULL_10261 = 10261;
|
||||
public static final int NULL_10262 = 10262;
|
||||
public static final int NULL_10263 = 10263;
|
||||
public static final int NULL_10264 = 10264;
|
||||
public static final int NULL_10265 = 10265;
|
||||
public static final int NULL_10266 = 10266;
|
||||
public static final int NULL_10267 = 10267;
|
||||
public static final int NULL_10268 = 10268;
|
||||
public static final int NULL_10269 = 10269;
|
||||
public static final int NULL_10270 = 10270;
|
||||
public static final int NULL_10271 = 10271;
|
||||
public static final int NULL_10272 = 10272;
|
||||
public static final int NULL_10273 = 10273;
|
||||
public static final int NULL_10274 = 10274;
|
||||
public static final int NULL_10275 = 10275;
|
||||
public static final int NULL_10276 = 10276;
|
||||
public static final int NULL_10277 = 10277;
|
||||
public static final int NULL_10278 = 10278;
|
||||
public static final int NULL_10279 = 10279;
|
||||
public static final int NULL_10280 = 10280;
|
||||
public static final int NULL_10281 = 10281;
|
||||
public static final int NULL_10282 = 10282;
|
||||
public static final int NULL_10283 = 10283;
|
||||
public static final int NULL_10284 = 10284;
|
||||
public static final int NULL_10285 = 10285;
|
||||
public static final int NULL_10286 = 10286;
|
||||
public static final int NULL_10287 = 10287;
|
||||
public static final int NULL_10288 = 10288;
|
||||
public static final int NULL_10289 = 10289;
|
||||
public static final int NULL_10290 = 10290;
|
||||
public static final int NULL_10291 = 10291;
|
||||
public static final int NULL_10292 = 10292;
|
||||
public static final int NULL_10293 = 10293;
|
||||
public static final int NULL_10294 = 10294;
|
||||
public static final int NULL_10295 = 10295;
|
||||
public static final int NULL_10296 = 10296;
|
||||
public static final int NULL_10297 = 10297;
|
||||
public static final int NULL_10298 = 10298;
|
||||
public static final int NULL_10299 = 10299;
|
||||
public static final int NULL_10300 = 10300;
|
||||
public static final int NULL_10301 = 10301;
|
||||
public static final int NULL_10302 = 10302;
|
||||
public static final int NULL_10303 = 10303;
|
||||
public static final int NULL_10304 = 10304;
|
||||
public static final int NULL_10305 = 10305;
|
||||
public static final int NULL_10306 = 10306;
|
||||
public static final int NULL_10307 = 10307;
|
||||
public static final int NULL_10308 = 10308;
|
||||
public static final int NULL_10309 = 10309;
|
||||
public static final int NULL_10310 = 10310;
|
||||
public static final int NULL_10311 = 10311;
|
||||
public static final int NULL_10312 = 10312;
|
||||
public static final int NULL_10313 = 10313;
|
||||
public static final int NULL_10314 = 10314;
|
||||
public static final int NULL_10315 = 10315;
|
||||
public static final int NULL_10316 = 10316;
|
||||
public static final int NULL_10317 = 10317;
|
||||
public static final int NULL_10318 = 10318;
|
||||
public static final int NULL_10319 = 10319;
|
||||
public static final int NULL_10320 = 10320;
|
||||
public static final int NULL_10321 = 10321;
|
||||
public static final int NULL_10322 = 10322;
|
||||
public static final int NULL_10323 = 10323;
|
||||
public static final int NULL_10324 = 10324;
|
||||
public static final int NULL_10325 = 10325;
|
||||
public static final int NULL_10326 = 10326;
|
||||
public static final int NULL_10327 = 10327;
|
||||
public static final int NULL_10328 = 10328;
|
||||
public static final int NULL_10329 = 10329;
|
||||
public static final int NULL_10330 = 10330;
|
||||
public static final int NULL_10331 = 10331;
|
||||
public static final int NULL_10332 = 10332;
|
||||
public static final int NULL_10333 = 10333;
|
||||
public static final int NULL_10334 = 10334;
|
||||
public static final int NULL_10335 = 10335;
|
||||
public static final int NULL_10336 = 10336;
|
||||
public static final int NULL_10337 = 10337;
|
||||
public static final int NULL_10338 = 10338;
|
||||
public static final int NULL_10339 = 10339;
|
||||
public static final int NULL_10340 = 10340;
|
||||
public static final int NULL_10341 = 10341;
|
||||
public static final int NULL_10342 = 10342;
|
||||
public static final int NULL_10343 = 10343;
|
||||
public static final int NULL_10344 = 10344;
|
||||
public static final int NULL_10345 = 10345;
|
||||
public static final int NULL_10346 = 10346;
|
||||
public static final int NULL_10347 = 10347;
|
||||
public static final int NULL_10348 = 10348;
|
||||
public static final int NULL_10349 = 10349;
|
||||
public static final int NULL_10350 = 10350;
|
||||
public static final int NULL_10351 = 10351;
|
||||
public static final int NULL_10352 = 10352;
|
||||
public static final int NULL_10353 = 10353;
|
||||
public static final int NULL_10354 = 10354;
|
||||
public static final int NULL_10355 = 10355;
|
||||
public static final int NULL_10356 = 10356;
|
||||
public static final int NULL_10357 = 10357;
|
||||
public static final int NULL_10358 = 10358;
|
||||
public static final int NULL_10359 = 10359;
|
||||
public static final int NULL_10360 = 10360;
|
||||
public static final int NULL_10361 = 10361;
|
||||
public static final int NULL_10362 = 10362;
|
||||
public static final int NULL_10363 = 10363;
|
||||
public static final int NULL_10364 = 10364;
|
||||
public static final int NULL_10365 = 10365;
|
||||
public static final int NULL_10366 = 10366;
|
||||
public static final int NULL_10367 = 10367;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -19463,5 +19463,59 @@ public final class NullObjectID
|
||||
public static final int NULL_39543 = 39543;
|
||||
public static final int NULL_39544 = 39544;
|
||||
public static final int NULL_39545 = 39545;
|
||||
public static final int NULL_39551 = 39551;
|
||||
public static final int NULL_39552 = 39552;
|
||||
public static final int NULL_39553 = 39553;
|
||||
public static final int NULL_39554 = 39554;
|
||||
public static final int NULL_39555 = 39555;
|
||||
public static final int NULL_39556 = 39556;
|
||||
public static final int NULL_39557 = 39557;
|
||||
public static final int NULL_39558 = 39558;
|
||||
public static final int NULL_39559 = 39559;
|
||||
public static final int NULL_39560 = 39560;
|
||||
public static final int NULL_39561 = 39561;
|
||||
public static final int NULL_39562 = 39562;
|
||||
public static final int NULL_39563 = 39563;
|
||||
public static final int NULL_39564 = 39564;
|
||||
public static final int NULL_39565 = 39565;
|
||||
public static final int NULL_39566 = 39566;
|
||||
public static final int NULL_39567 = 39567;
|
||||
public static final int NULL_39568 = 39568;
|
||||
public static final int NULL_39569 = 39569;
|
||||
public static final int NULL_39582 = 39582;
|
||||
public static final int NULL_39583 = 39583;
|
||||
public static final int NULL_39584 = 39584;
|
||||
public static final int NULL_39585 = 39585;
|
||||
public static final int NULL_39586 = 39586;
|
||||
public static final int NULL_39587 = 39587;
|
||||
public static final int NULL_39588 = 39588;
|
||||
public static final int NULL_39589 = 39589;
|
||||
public static final int NULL_39590 = 39590;
|
||||
public static final int NULL_39591 = 39591;
|
||||
public static final int NULL_39592 = 39592;
|
||||
public static final int NULL_39593 = 39593;
|
||||
public static final int NULL_39594 = 39594;
|
||||
public static final int NULL_39595 = 39595;
|
||||
public static final int NULL_39596 = 39596;
|
||||
public static final int NULL_39597 = 39597;
|
||||
public static final int NULL_39598 = 39598;
|
||||
public static final int NULL_39599 = 39599;
|
||||
public static final int NULL_39600 = 39600;
|
||||
public static final int NULL_39601 = 39601;
|
||||
public static final int NULL_39602 = 39602;
|
||||
public static final int NULL_39603 = 39603;
|
||||
public static final int NULL_39604 = 39604;
|
||||
public static final int NULL_39605 = 39605;
|
||||
public static final int NULL_39606 = 39606;
|
||||
public static final int NULL_39607 = 39607;
|
||||
public static final int NULL_39610 = 39610;
|
||||
public static final int NULL_39611 = 39611;
|
||||
public static final int NULL_39612 = 39612;
|
||||
public static final int NULL_39613 = 39613;
|
||||
public static final int NULL_39614 = 39614;
|
||||
public static final int NULL_39615 = 39615;
|
||||
public static final int NULL_39616 = 39616;
|
||||
public static final int NULL_39618 = 39618;
|
||||
public static final int NULL_39619 = 39619;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -19728,6 +19728,7 @@ public final class ObjectID
|
||||
public static final int WIZARD_STATUE_38423 = 38423;
|
||||
public static final int WIZARD_STATUE_38424 = 38424;
|
||||
public static final int WIZARD_STATUE_38425 = 38425;
|
||||
public static final int DEATHS_DOMAIN = 38426;
|
||||
public static final int FIRE_38427 = 38427;
|
||||
public static final int KNIGHT_STATUE = 38428;
|
||||
public static final int KNIGHT_STATUE_38429 = 38429;
|
||||
@@ -20067,5 +20068,27 @@ public final class ObjectID
|
||||
public static final int GATE_39512 = 39512;
|
||||
public static final int GATE_39513 = 39513;
|
||||
public static final int CHAIR_39514 = 39514;
|
||||
public static final int DEATHS_DOMAIN_39535 = 39535;
|
||||
public static final int DEATHS_DOMAIN_39546 = 39546;
|
||||
public static final int DEATHS_DOMAIN_39547 = 39547;
|
||||
public static final int DEATHS_DOMAIN_39548 = 39548;
|
||||
public static final int PORTAL_39549 = 39549;
|
||||
public static final int DEATHS_COFFER = 39550;
|
||||
public static final int DESK_39570 = 39570;
|
||||
public static final int MUNCHER = 39571;
|
||||
public static final int CHAIR_39572 = 39572;
|
||||
public static final int CHAIR_39573 = 39573;
|
||||
public static final int DEATHS_SCYTHE = 39574;
|
||||
public static final int CHEST_39575 = 39575;
|
||||
public static final int CHEST_39576 = 39576;
|
||||
public static final int CHEST_39577 = 39577;
|
||||
public static final int CHEST_39578 = 39578;
|
||||
public static final int WEAPONS = 39579;
|
||||
public static final int BOOKS_39580 = 39580;
|
||||
public static final int BOOKS_39581 = 39581;
|
||||
public static final int COFFIN_39608 = 39608;
|
||||
public static final int STAIRS_39609 = 39609;
|
||||
public static final int CRYPT = 39617;
|
||||
public static final int COFFIN_39620 = 39620;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -321,7 +321,7 @@ public final class ScriptID
|
||||
/**
|
||||
* Called to build the combat interface
|
||||
*/
|
||||
@ScriptArguments
|
||||
@ScriptArguments()
|
||||
public static final int COMBAT_INTERFACE_SETUP = 420;
|
||||
|
||||
/**
|
||||
|
||||
@@ -379,7 +379,9 @@ public enum Varbits
|
||||
*/
|
||||
PYRAMID_PLUNDER_SARCO_OPEN(2362),
|
||||
PYRAMID_PLUNDER_CHEST_OPEN(2363),
|
||||
PYRAMID_PLUNDER_ROOM_LOCATION(2365),
|
||||
PYRAMID_PLUNDER_TIMER(2375),
|
||||
PYRAMID_PLUNDER_THIEVING_LEVEL(2376),
|
||||
PYRAMID_PLUNDER_ROOM(2377),
|
||||
|
||||
/**
|
||||
|
||||
@@ -158,7 +158,6 @@ public class WidgetID
|
||||
public static final int BEGINNER_CLUE_MAP_NORTH_OF_FALADOR = 351;
|
||||
public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356;
|
||||
public static final int SEED_BOX_GROUP_ID = 128;
|
||||
public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4;
|
||||
public static final int SEED_VAULT_GROUP_ID = 631;
|
||||
public static final int EXPLORERS_RING_ALCH_GROUP_ID = 483;
|
||||
public static final int LMS_GROUP_ID = 333;
|
||||
@@ -169,7 +168,7 @@ public class WidgetID
|
||||
public static final int THEATRE_OF_BLOOD_PARTY_GROUP_ID = 28;
|
||||
public static final int GWD_KC_GROUP_ID = 406;
|
||||
public static final int ADVENTURE_LOG_ID = 187;
|
||||
public static final int COUNTERS_LOG_GROUP_ID = 625;
|
||||
public static final int GENERIC_SCROLL_GROUP_ID = 625;
|
||||
public static final int GAUNTLET_TIMER_GROUP_ID = 637;
|
||||
|
||||
static class WorldMap
|
||||
@@ -313,6 +312,7 @@ public class WidgetID
|
||||
static final int BANK_CONTAINER = 1;
|
||||
static final int INVENTORY_ITEM_CONTAINER = 3;
|
||||
static final int BANK_TITLE_BAR = 3;
|
||||
static final int TUTORIAL_BUTTON = 4;
|
||||
static final int ITEM_COUNT_TOP = 5;
|
||||
static final int ITEM_COUNT_BAR = 6;
|
||||
static final int ITEM_COUNT_BOTTOM = 7;
|
||||
@@ -325,6 +325,7 @@ public class WidgetID
|
||||
static final int INCINERATOR = 45;
|
||||
static final int INCINERATOR_CONFIRM = 46;
|
||||
static final int EQUIPMENT_CONTENT_CONTAINER = 68;
|
||||
static final int SETTINGS_BUTTON = 108;
|
||||
static final int EQUIPMENT_BUTTON = 109;
|
||||
}
|
||||
|
||||
@@ -454,10 +455,10 @@ public class WidgetID
|
||||
{
|
||||
static final int MINIMAP_RESIZABLE_WIDGET = 19;
|
||||
static final int MINIMAP_RESIZABLE_CLICKBOX = 20;
|
||||
static final int MINIMAP_RESIZABLE_DRAW_AREA = 27;
|
||||
static final int MINIMAP_RESIZABLE_DECORATIONS = 29;
|
||||
static final int MINIMAP_RESIZABLE_ORB_HOLDER = 30;
|
||||
static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 32;
|
||||
static final int MINIMAP_RESIZABLE_DRAW_AREA = 28;
|
||||
static final int MINIMAP_RESIZABLE_DECORATIONS = 30;
|
||||
static final int MINIMAP_RESIZABLE_ORB_HOLDER = 31;
|
||||
static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 33;
|
||||
static final int FIXED_VIEWPORT = 17;
|
||||
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 14;
|
||||
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 14;
|
||||
@@ -468,110 +469,106 @@ public class WidgetID
|
||||
static final int MINIMAP = 3;
|
||||
static final int MINIMAP_DRAW_AREA = 8;
|
||||
static final int MULTICOMBAT_INDICATOR = 21;
|
||||
static final int BANK_PIN = 22;
|
||||
static final int FRIENDS_CHAT_TAB = 33;
|
||||
static final int FRIENDS_TAB = 35;
|
||||
static final int IGNORES_TAB = 34;
|
||||
static final int LOGOUT_TAB = 36;
|
||||
static final int OPTIONS_TAB = 37;
|
||||
static final int EMOTES_TAB = 38;
|
||||
static final int MUSIC_TAB = 39;
|
||||
static final int FRIENDS_CHAT_ICON = 40;
|
||||
static final int FRIENDS_ICON = 42;
|
||||
static final int IGNORES_ICON = 41;
|
||||
static final int LOGOUT_ICON = 43;
|
||||
static final int OPTIONS_ICON = 44;
|
||||
static final int EMOTES_ICON = 45;
|
||||
static final int MUSIC_ICON = 46;
|
||||
static final int COMBAT_TAB = 50;
|
||||
static final int STATS_TAB = 51;
|
||||
static final int QUESTS_TAB = 52;
|
||||
static final int INVENTORY_TAB = 53;
|
||||
static final int EQUIPMENT_TAB = 54;
|
||||
static final int PRAYER_TAB = 55;
|
||||
static final int MAGIC_TAB = 56;
|
||||
static final int COMBAT_ICON = 57;
|
||||
static final int STATS_ICON = 58;
|
||||
static final int QUESTS_ICON = 59;
|
||||
static final int INVENTORY_ICON = 60;
|
||||
static final int EQUIPMENT_ICON = 61;
|
||||
static final int PRAYER_ICON = 62;
|
||||
static final int MAGIC_ICON = 63;
|
||||
static final int ROOT_INTERFACE_CONTAINER = 64;
|
||||
static final int BANK_CONTAINER = 66;
|
||||
static final int INTERFACE_CONTAINER = 67;
|
||||
static final int INVENTORY_CONTAINER = 71;
|
||||
static final int FRIENDS_CHAT_TAB = 34;
|
||||
static final int FRIENDS_TAB = 36;
|
||||
static final int IGNORES_TAB = 35;
|
||||
static final int LOGOUT_TAB = 37;
|
||||
static final int OPTIONS_TAB = 38;
|
||||
static final int EMOTES_TAB = 39;
|
||||
static final int MUSIC_TAB = 40;
|
||||
static final int FRIENDS_CHAT_ICON = 41;
|
||||
static final int FRIENDS_ICON = 43;
|
||||
static final int IGNORES_ICON = 42;
|
||||
static final int LOGOUT_ICON = 44;
|
||||
static final int OPTIONS_ICON = 45;
|
||||
static final int EMOTES_ICON = 46;
|
||||
static final int MUSIC_ICON = 47;
|
||||
static final int COMBAT_TAB = 51;
|
||||
static final int STATS_TAB = 52;
|
||||
static final int QUESTS_TAB = 53;
|
||||
static final int INVENTORY_TAB = 54;
|
||||
static final int EQUIPMENT_TAB = 55;
|
||||
static final int PRAYER_TAB = 56;
|
||||
static final int MAGIC_TAB = 57;
|
||||
static final int COMBAT_ICON = 58;
|
||||
static final int STATS_ICON = 59;
|
||||
static final int QUESTS_ICON = 60;
|
||||
static final int INVENTORY_ICON = 61;
|
||||
static final int EQUIPMENT_ICON = 62;
|
||||
static final int PRAYER_ICON = 63;
|
||||
static final int MAGIC_ICON = 64;
|
||||
static final int ROOT_INTERFACE_CONTAINER = 65;
|
||||
static final int BANK_CONTAINER = 67;
|
||||
static final int INTERFACE_CONTAINER = 68;
|
||||
static final int INVENTORY_CONTAINER = 72;
|
||||
}
|
||||
|
||||
static class ResizableViewport
|
||||
{
|
||||
static final int ITEMS_KEPT_ON_DEATH = 13;
|
||||
static final int BANK_PIN = 13;
|
||||
static final int MULTICOMBAT_INDICATOR = 17;
|
||||
static final int FRIENDS_CHAT_TAB = 37;
|
||||
static final int FRIENDS_TAB = 39;
|
||||
static final int IGNORES_TAB = 38;
|
||||
static final int LOGOUT_TAB = 40;
|
||||
static final int OPTIONS_TAB = 41;
|
||||
static final int EMOTES_TAB = 42;
|
||||
static final int MUSIC_TAB = 43;
|
||||
static final int FRIENDS_CHAT_ICON = 44;
|
||||
static final int FRIENDS_ICON = 46;
|
||||
static final int IGNORES_ICON = 45;
|
||||
static final int LOGOUT_ICON = 47;
|
||||
static final int OPTIONS_ICON = 48;
|
||||
static final int EMOTES_ICON = 49;
|
||||
static final int MUSIC_ICON = 50;
|
||||
static final int COMBAT_TAB = 53;
|
||||
static final int STATS_TAB = 54;
|
||||
static final int QUESTS_TAB = 55;
|
||||
static final int INVENTORY_TAB = 56;
|
||||
static final int EQUIPMENT_TAB = 57;
|
||||
static final int PRAYER_TAB = 58;
|
||||
static final int MAGIC_TAB = 59;
|
||||
static final int COMBAT_ICON = 60;
|
||||
static final int STATS_ICON = 61;
|
||||
static final int QUESTS_ICON = 62;
|
||||
static final int INVENTORY_ICON = 63;
|
||||
static final int EQUIPMENT_ICON = 64;
|
||||
static final int PRAYER_ICON = 65;
|
||||
static final int MAGIC_ICON = 66;
|
||||
static final int INTERFACE_CONTAINER = 67;
|
||||
static final int INVENTORY_CONTAINER = 73;
|
||||
static final int FRIENDS_CHAT_TAB = 38;
|
||||
static final int FRIENDS_TAB = 40;
|
||||
static final int IGNORES_TAB = 39;
|
||||
static final int LOGOUT_TAB = 41;
|
||||
static final int OPTIONS_TAB = 42;
|
||||
static final int EMOTES_TAB = 43;
|
||||
static final int MUSIC_TAB = 44;
|
||||
static final int FRIENDS_CHAT_ICON = 45;
|
||||
static final int FRIENDS_ICON = 47;
|
||||
static final int IGNORES_ICON = 46;
|
||||
static final int LOGOUT_ICON = 48;
|
||||
static final int OPTIONS_ICON = 49;
|
||||
static final int EMOTES_ICON = 50;
|
||||
static final int MUSIC_ICON = 51;
|
||||
static final int COMBAT_TAB = 54;
|
||||
static final int STATS_TAB = 55;
|
||||
static final int QUESTS_TAB = 56;
|
||||
static final int INVENTORY_TAB = 57;
|
||||
static final int EQUIPMENT_TAB = 58;
|
||||
static final int PRAYER_TAB = 59;
|
||||
static final int MAGIC_TAB = 60;
|
||||
static final int COMBAT_ICON = 61;
|
||||
static final int STATS_ICON = 62;
|
||||
static final int QUESTS_ICON = 63;
|
||||
static final int INVENTORY_ICON = 64;
|
||||
static final int EQUIPMENT_ICON = 65;
|
||||
static final int PRAYER_ICON = 66;
|
||||
static final int MAGIC_ICON = 67;
|
||||
static final int INTERFACE_CONTAINER = 68;
|
||||
static final int INVENTORY_CONTAINER = 74;
|
||||
}
|
||||
|
||||
static class ResizableViewportBottomLine
|
||||
{
|
||||
static final int BANK_PIN = 13;
|
||||
static final int LOGOUT_BUTTON_OVERLAY = 31;
|
||||
static final int LOGOUT_BUTTON_OVERLAY = 32;
|
||||
static final int CMB_TAB = 50;
|
||||
static final int CMB_ICON = 59;
|
||||
static final int CMB_ICON = 60;
|
||||
static final int SKILLS_TAB = 51;
|
||||
static final int SKILLS_ICON = 60;
|
||||
static final int SKILLS_ICON = 61;
|
||||
static final int QUESTS_TAB = 52;
|
||||
static final int QUESTS_ICON = 61;
|
||||
static final int INVENTORY_TAB = 55;
|
||||
static final int INVENTORY_ICON = 62;
|
||||
static final int QUESTS_ICON = 62;
|
||||
static final int INVENTORY_TAB = 56;
|
||||
static final int INVENTORY_ICON = 63;
|
||||
static final int EQUIP_TAB = 54;
|
||||
static final int EQUIP_ICON = 63;
|
||||
static final int PRAYER_TAB = 57;
|
||||
static final int PRAYER_ICON = 64;
|
||||
static final int EQUIP_ICON = 64;
|
||||
static final int PRAYER_TAB = 58;
|
||||
static final int PRAYER_ICON = 65;
|
||||
static final int SPELL_TAB = 56;
|
||||
static final int SPELL_ICON = 53;
|
||||
static final int FC_TAB = 35;
|
||||
static final int FC_ICON = 43;
|
||||
static final int FC_ICON = 44;
|
||||
static final int IGNORE_TAB = 36;
|
||||
static final int IGNORE_ICON = 42;
|
||||
static final int FRIEND_TAB = 37;
|
||||
static final int FRIEND_ICON = 45;
|
||||
static final int FRIEND_ICON = 46;
|
||||
static final int SETTINGS_TAB = 38;
|
||||
static final int SETTINGS_ICON = 46;
|
||||
static final int SETTINGS_ICON = 47;
|
||||
static final int EMOTE_TAB = 39;
|
||||
static final int EMOTE_ICON = 47;
|
||||
static final int EMOTE_ICON = 48;
|
||||
static final int MUSIC_TAB = 40;
|
||||
static final int MUSIC_ICON = 48;
|
||||
static final int MAGIC_ICON = 65;
|
||||
static final int INVENTORY_CONTAINER = 73;
|
||||
static final int MUSIC_ICON = 49;
|
||||
static final int MAGIC_ICON = 66;
|
||||
static final int INVENTORY_CONTAINER = 74;
|
||||
}
|
||||
|
||||
static class Chatbox
|
||||
@@ -1239,19 +1236,6 @@ public class WidgetID
|
||||
static final int ANSWER3 = 17;
|
||||
}
|
||||
|
||||
static class KeptOnDeath
|
||||
{
|
||||
static final int KEPT_ITEMS_CONTAINER = 18;
|
||||
static final int KEPT_ITEMS_TEXT = 17;
|
||||
static final int LOST_ITEMS_TEXT = 20;
|
||||
static final int LOST_ITEMS_CONTAINER = 21;
|
||||
static final int LOST_ITEMS_VALUE = 23;
|
||||
static final int INFORMATION_CONTAINER = 29;
|
||||
static final int MAX_ITEMS_KEPT_ON_DEATH = 30;
|
||||
static final int SAFE_ZONE_CONTAINER = 31;
|
||||
static final int CUSTOM_TEXT_CONTAINER = 33;
|
||||
}
|
||||
|
||||
public static class TradeScreen
|
||||
{
|
||||
public static final int FIRST_TRADING_WITH = 31;
|
||||
@@ -1366,9 +1350,8 @@ public class WidgetID
|
||||
static final int CONTAINER = 0;
|
||||
}
|
||||
|
||||
static class CountersLog
|
||||
static class GenericScroll
|
||||
{
|
||||
static final int OWNER = 4;
|
||||
static final int TEXT = 6;
|
||||
}
|
||||
|
||||
|
||||
@@ -166,6 +166,8 @@ public enum WidgetInfo
|
||||
BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR),
|
||||
BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM),
|
||||
BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER),
|
||||
BANK_SETTINGS_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SETTINGS_BUTTON),
|
||||
BANK_TUTORIAL_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TUTORIAL_BUTTON),
|
||||
|
||||
GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER),
|
||||
GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER),
|
||||
@@ -312,7 +314,6 @@ public enum WidgetInfo
|
||||
RESIZABLE_VIEWPORT_OPTIONS_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.OPTIONS_ICON),
|
||||
RESIZABLE_VIEWPORT_EMOTES_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.EMOTES_ICON),
|
||||
RESIZABLE_VIEWPORT_MUSIC_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MUSIC_ICON),
|
||||
RESIZABLE_VIEWPORT_KEPT_ON_DEATH(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.ITEMS_KEPT_ON_DEATH),
|
||||
|
||||
RESIZABLE_VIEWPORT_BOTTOM_LINE(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.RESIZABLE_VIEWPORT_BOTTOM_LINE),
|
||||
RESIZABLE_VIEWPORT_BOTTOM_LINE_LOGOUT_BUTTON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.LOGOUT_BUTTON_OVERLAY),
|
||||
@@ -590,7 +591,7 @@ public enum WidgetInfo
|
||||
|
||||
ADVENTURE_LOG(WidgetID.ADVENTURE_LOG_ID, WidgetID.AdventureLog.CONTAINER),
|
||||
|
||||
COUNTERS_LOG_TEXT(WidgetID.COUNTERS_LOG_GROUP_ID, WidgetID.CountersLog.TEXT),
|
||||
GENERIC_SCROLL_TEXT(WidgetID.GENERIC_SCROLL_GROUP_ID, WidgetID.GenericScroll.TEXT),
|
||||
|
||||
WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST),
|
||||
|
||||
@@ -836,9 +837,6 @@ public enum WidgetInfo
|
||||
EQUIPMENT_MAGIC_DAMAGE(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.MAGIC_DAMAGE),
|
||||
EQUIP_YOUR_CHARACTER(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.EQUIP_YOUR_CHARACTER),
|
||||
|
||||
FIXED_BANK_PIN(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.BANK_PIN),
|
||||
RESIZABLE_BANK_PIN(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.BANK_PIN),
|
||||
RESIZABLE_BOTTOM_LINE_BANK_PIN(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.BANK_PIN),
|
||||
BANK_PIN_TOP_LEFT_TEXT(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.TOP_LEFT_TEXT),
|
||||
BANK_PIN_EXIT_BUTTON(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.EXIT_BUTTON),
|
||||
BANK_PIN_FORGOT_BUTTON(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.FORGOT_BUTTON),
|
||||
@@ -866,16 +864,6 @@ public enum WidgetInfo
|
||||
XP_DROP_6(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_6),
|
||||
XP_DROP_7(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_7),
|
||||
|
||||
ITEMS_KEPT_CUSTOM_TEXT_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.CUSTOM_TEXT_CONTAINER),
|
||||
ITEMS_KEPT_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_TEXT),
|
||||
ITEMS_KEPT_ON_DEATH_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_CONTAINER),
|
||||
ITEMS_LOST_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_TEXT),
|
||||
ITEMS_LOST_ON_DEATH_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_CONTAINER),
|
||||
ITEMS_KEPT_INFORMATION_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.INFORMATION_CONTAINER),
|
||||
ITEMS_KEPT_SAFE_ZONE_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.SAFE_ZONE_CONTAINER),
|
||||
ITEMS_LOST_VALUE(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_VALUE),
|
||||
ITEMS_KEPT_MAX(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.MAX_ITEMS_KEPT_ON_DEATH),
|
||||
|
||||
SEED_VAULT_TITLE_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.TITLE_CONTAINER),
|
||||
SEED_VAULT_ITEM_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_CONTAINER),
|
||||
SEED_VAULT_ITEM_TEXT(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_TEXT),
|
||||
|
||||
@@ -44,7 +44,7 @@ import okhttp3.HttpUrl;
|
||||
@Slf4j
|
||||
public class ClientLoader implements Supplier<Applet>
|
||||
{
|
||||
private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws";
|
||||
private static final String CONFIG_URL = "https://oldschool.runescape.com/jav_config.ws";
|
||||
private static final String BACKUP_CONFIG_URL = "https://raw.githubusercontent.com/open-osrs/hosting/master/jav_config.ws";
|
||||
|
||||
private static final int NUM_ATTEMPTS = 10;
|
||||
|
||||
@@ -115,6 +115,7 @@ public class ClientUI
|
||||
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized";
|
||||
private static final String CONFIG_OPACITY = "enableOpacity";
|
||||
private static final String CONFIG_OPACITY_AMOUNT = "opacityPercentage";
|
||||
private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed";
|
||||
private static final int CLIENT_WELL_HIDDEN_MARGIN = 160;
|
||||
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
|
||||
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/openosrs.png");
|
||||
@@ -502,7 +503,8 @@ public class ClientUI
|
||||
sidebarNavigationButton = NavigationButton
|
||||
.builder()
|
||||
.priority(100)
|
||||
.icon(sidebarClosedIcon)
|
||||
.icon(sidebarOpenIcon)
|
||||
.tooltip("Open SideBar")
|
||||
.onClick(this::toggleSidebar)
|
||||
.build();
|
||||
|
||||
@@ -512,7 +514,12 @@ public class ClientUI
|
||||
null);
|
||||
|
||||
titleToolbar.addComponent(sidebarNavigationButton, sidebarNavigationJButton);
|
||||
toggleSidebar();
|
||||
|
||||
// Open sidebar if the config closed state is unset
|
||||
if (configManager.getConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED) == null)
|
||||
{
|
||||
toggleSidebar();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -918,6 +925,7 @@ public class ClientUI
|
||||
{
|
||||
sidebarNavigationJButton.setIcon(new ImageIcon(sidebarOpenIcon));
|
||||
sidebarNavigationJButton.setToolTipText("Open SideBar");
|
||||
configManager.setConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED, true);
|
||||
|
||||
contract();
|
||||
|
||||
@@ -928,6 +936,7 @@ public class ClientUI
|
||||
{
|
||||
sidebarNavigationJButton.setIcon(new ImageIcon(sidebarClosedIcon));
|
||||
sidebarNavigationJButton.setToolTipText("Close SideBar");
|
||||
configManager.unsetConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED);
|
||||
|
||||
// Try to restore last panel
|
||||
expand(currentNavButton);
|
||||
@@ -1164,15 +1173,8 @@ public class ClientUI
|
||||
}
|
||||
else
|
||||
{
|
||||
// Try to expand sidebar
|
||||
if (!sidebarOpen)
|
||||
{
|
||||
bounds.width += pluginToolbar.getWidth();
|
||||
}
|
||||
|
||||
if (config.automaticResizeType() == ExpandResizeType.KEEP_GAME_SIZE)
|
||||
{
|
||||
|
||||
// Try to contract plugin panel
|
||||
if (pluginPanel != null)
|
||||
{
|
||||
|
||||
@@ -2470,7 +2470,6 @@
|
||||
22519,
|
||||
22520,
|
||||
24367,
|
||||
24418,
|
||||
24426
|
||||
],
|
||||
"empty cup": [
|
||||
@@ -7904,7 +7903,8 @@
|
||||
],
|
||||
"soft clay pack": [
|
||||
12009,
|
||||
12010
|
||||
12010,
|
||||
24851
|
||||
],
|
||||
"black wizard robe": [
|
||||
12449,
|
||||
@@ -8617,6 +8617,10 @@
|
||||
13652,
|
||||
20784
|
||||
],
|
||||
"bag of gems": [
|
||||
19473,
|
||||
24853
|
||||
],
|
||||
"heavy ballista": [
|
||||
19481,
|
||||
23630
|
||||
@@ -9752,6 +9756,10 @@
|
||||
24403,
|
||||
24411
|
||||
],
|
||||
"gravestone": [
|
||||
24418,
|
||||
24524
|
||||
],
|
||||
"iced gingerbread shield": [
|
||||
24438,
|
||||
24439,
|
||||
|
||||
@@ -1 +1 @@
|
||||
62A149F6CCCF18FEEA3F247F12F10BBC349239EFD5F87CF83DC5629636D790ED
|
||||
85382CB95B13EA567E72410A58D18DAD6754D3361E584DFF0A1E417989E8214C
|
||||
@@ -62,7 +62,7 @@ LABEL49:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 6
|
||||
iconst 10551327
|
||||
iconst 10551328
|
||||
enum
|
||||
if_getheight
|
||||
add
|
||||
|
||||
@@ -1 +1 @@
|
||||
8CD8829FDF85B9AD7748CE4EA9CA4DD31138ACA1AF4BB35038A982B75F32791C
|
||||
91023012B55ED61B5DA93FAD2CB6A92EBB9AA8C8633AC5AC6FB337C2AFC6365F
|
||||
@@ -20,11 +20,11 @@
|
||||
1131: LABEL9
|
||||
jump LABEL201
|
||||
LABEL9:
|
||||
iconst 10747938
|
||||
iconst 10747939
|
||||
if_getwidth
|
||||
iconst 33
|
||||
sub
|
||||
iconst 10747938
|
||||
iconst 10747939
|
||||
if_getheight
|
||||
istore 3
|
||||
istore 2
|
||||
@@ -33,7 +33,7 @@ LABEL9:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551327
|
||||
iconst 10551328
|
||||
enum
|
||||
if_getwidth
|
||||
sub
|
||||
@@ -47,7 +47,7 @@ LABEL9:
|
||||
LABEL29:
|
||||
iconst 0
|
||||
iload 3
|
||||
iconst 10747953
|
||||
iconst 10747954
|
||||
if_getheight
|
||||
add
|
||||
iconst 2
|
||||
@@ -55,14 +55,14 @@ LABEL29:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10747970
|
||||
iconst 10747971
|
||||
enum
|
||||
if_setposition
|
||||
iconst 0
|
||||
iload 3
|
||||
iconst 2
|
||||
iconst 2
|
||||
iconst 10747953
|
||||
iconst 10747954
|
||||
if_setposition
|
||||
jump LABEL65
|
||||
LABEL49:
|
||||
@@ -73,14 +73,14 @@ LABEL49:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10747970
|
||||
iconst 10747971
|
||||
enum
|
||||
if_setposition
|
||||
iload 2
|
||||
iconst 0
|
||||
iconst 2
|
||||
iconst 2
|
||||
iconst 10747953
|
||||
iconst 10747954
|
||||
if_setposition
|
||||
LABEL65:
|
||||
get_varbit 4084
|
||||
@@ -92,7 +92,7 @@ LABEL69:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
jump LABEL84
|
||||
@@ -101,7 +101,7 @@ LABEL77:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
LABEL84:
|
||||
@@ -118,7 +118,7 @@ LABEL91:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
jump LABEL106
|
||||
@@ -127,7 +127,7 @@ LABEL99:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
LABEL106:
|
||||
@@ -144,7 +144,7 @@ LABEL113:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
jump LABEL128
|
||||
@@ -153,7 +153,7 @@ LABEL121:
|
||||
iconst 73
|
||||
iconst 73
|
||||
iload 1
|
||||
iconst 10551323
|
||||
iconst 10551324
|
||||
enum
|
||||
2122
|
||||
LABEL128:
|
||||
@@ -165,15 +165,15 @@ LABEL129:
|
||||
jump LABEL137
|
||||
LABEL133:
|
||||
iconst 1
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_sethide
|
||||
jump LABEL192
|
||||
LABEL137:
|
||||
iconst 0
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_sethide
|
||||
iconst 1
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
2308
|
||||
get_varbit 6255
|
||||
switch
|
||||
@@ -183,38 +183,38 @@ LABEL137:
|
||||
jump LABEL170
|
||||
LABEL146:
|
||||
iconst 1718
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_setgraphic
|
||||
iconst 1
|
||||
sconst "Toggle single-tap mode"
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_setop
|
||||
jump LABEL177
|
||||
LABEL154:
|
||||
iconst 1717
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_setgraphic
|
||||
iconst 1
|
||||
sconst "Toggle tap-to-drop mode"
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_setop
|
||||
jump LABEL177
|
||||
LABEL162:
|
||||
iconst 1716
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_setgraphic
|
||||
iconst 1
|
||||
sconst "Show Keyboard"
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_setop
|
||||
jump LABEL177
|
||||
LABEL170:
|
||||
iconst 1715
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_setgraphic
|
||||
iconst 1
|
||||
sconst ""
|
||||
iconst 39387168
|
||||
iconst 39387169
|
||||
if_setop
|
||||
LABEL177:
|
||||
get_varbit 6255
|
||||
@@ -228,18 +228,18 @@ LABEL181:
|
||||
jump LABEL189
|
||||
LABEL185:
|
||||
iconst 155
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_settrans
|
||||
jump LABEL192
|
||||
LABEL189:
|
||||
iconst 0
|
||||
iconst 39387170
|
||||
iconst 39387171
|
||||
if_settrans
|
||||
LABEL192:
|
||||
invoke 2581
|
||||
get_varbit 6254
|
||||
invoke 633
|
||||
iconst 39387159
|
||||
iconst 39387160
|
||||
if_sethide
|
||||
invoke 2526
|
||||
pop_int
|
||||
|
||||
Reference in New Issue
Block a user