ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master' into master

Browse Source
This commit is contained in:
Owain van Brakel
2020-08-28 03:17:10 +02:00
parent 7010955ae9 29e0b92590
commit 6d342d7abc
22 changed files with 909 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+1 -1
View File
@@ -25,7 +25,7 @@
object ProjectVersions { object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.24" const val rlVersion = "1.6.25"
const val openosrsVersion = "3.4.3" const val openosrsVersion = "3.4.3"
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java
+64 -27
View File
@@ -25,8 +25,11 @@
package net.runelite.http.api.hiscore; package net.runelite.http.api.hiscore;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
@@ -46,16 +49,14 @@ public class HiscoreClient
return lookup(username, endpoint.getHiscoreURL()); return lookup(username, endpoint.getHiscoreURL());
} }
public CompletableFuture<HiscoreResult> lookupAsync(String username, HiscoreEndpoint endpoint)
{
return lookupAsync(username, endpoint.getHiscoreURL());
}
public HiscoreResult lookup(String username, HttpUrl endpoint) throws IOException public HiscoreResult lookup(String username, HttpUrl endpoint) throws IOException
{ {
HiscoreResultBuilder resultBuilder = lookupUsername(username, endpoint); return lookupSync(username, endpoint);
if (resultBuilder == null)
{
return null;
}
return resultBuilder.build();
} }
public HiscoreResult lookup(String username) throws IOException public HiscoreResult lookup(String username) throws IOException
@@ -65,15 +66,13 @@ public class HiscoreClient
public SingleHiscoreSkillResult lookup(String username, HiscoreSkill skill, HiscoreEndpoint endpoint) throws IOException public SingleHiscoreSkillResult lookup(String username, HiscoreSkill skill, HiscoreEndpoint endpoint) throws IOException
{ {
HiscoreResultBuilder resultBuilder = lookupUsername(username, endpoint.getHiscoreURL()); HiscoreResult result = lookupSync(username, endpoint.getHiscoreURL());
if (resultBuilder == null) if (result == null)
{ {
return null; return null;
} }
HiscoreResult result = resultBuilder.build();
Skill requested = result.getSkill(skill); Skill requested = result.getSkill(skill);
SingleHiscoreSkillResult skillResult = new SingleHiscoreSkillResult(); SingleHiscoreSkillResult skillResult = new SingleHiscoreSkillResult();
skillResult.setPlayer(username); skillResult.setPlayer(username);
@@ -87,7 +86,44 @@ public class HiscoreClient
return lookup(username, skill, HiscoreEndpoint.NORMAL); return lookup(username, skill, HiscoreEndpoint.NORMAL);
} }
private HiscoreResultBuilder lookupUsername(String username, HttpUrl hiscoreUrl) throws IOException private HiscoreResult lookupSync(String username, HttpUrl hiscoreUrl) throws IOException
{
try (Response response = client.newCall(buildRequest(username, hiscoreUrl)).execute())
{
return processResponse(username, response);
}
}
private CompletableFuture<HiscoreResult> lookupAsync(String username, HttpUrl hiscoreUrl)
{
CompletableFuture<HiscoreResult> future = new CompletableFuture<>();
client.newCall(buildRequest(username, hiscoreUrl)).enqueue(new Callback()
{
@Override
public void onFailure(Call call, IOException e)
{
future.completeExceptionally(e);
}
@Override
public void onResponse(Call call, Response response) throws IOException
{
try
{
future.complete(processResponse(username, response));
}
finally
{
response.close();
}
}
});
return future;
}
private static Request buildRequest(String username, HttpUrl hiscoreUrl)
{ {
HttpUrl url = hiscoreUrl.newBuilder() HttpUrl url = hiscoreUrl.newBuilder()
.addQueryParameter("player", username) .addQueryParameter("player", username)
@@ -95,28 +131,29 @@ public class HiscoreClient
log.debug("Built URL {}", url); log.debug("Built URL {}", url);
Request okrequest = new Request.Builder() return new Request.Builder()
.url(url) .url(url)
.build(); .build();
}
String responseStr; private static HiscoreResult processResponse(String username, Response response) throws IOException
{
try (Response okresponse = client.newCall(okrequest).execute()) if (!response.isSuccessful())
{ {
if (!okresponse.isSuccessful()) if (response.code() == 404)
{ {
switch (okresponse.code()) return null;
{
case 404:
return null;
default:
throw new IOException("Error retrieving data from Jagex Hiscores: " + okresponse);
}
} }
responseStr = okresponse.body().string(); throw new IOException("Error retrieving data from Jagex Hiscores: " + response);
} }
String responseStr = response.body().string();
return parseResponse(username, responseStr);
}
private static HiscoreResult parseResponse(String username, String responseStr) throws IOException
{
CSVParser parser = CSVParser.parse(responseStr, CSVFormat.DEFAULT); CSVParser parser = CSVParser.parse(responseStr, CSVFormat.DEFAULT);
HiscoreResultBuilder hiscoreBuilder = new HiscoreResultBuilder(); HiscoreResultBuilder hiscoreBuilder = new HiscoreResultBuilder();
@@ -147,6 +184,6 @@ public class HiscoreClient
hiscoreBuilder.setNextSkill(skill); hiscoreBuilder.setNextSkill(skill);
} }
return hiscoreBuilder; return hiscoreBuilder.build();
} }
} }
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java
+1 -1
View File
@@ -37,7 +37,7 @@ public enum HiscoreEndpoint
HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"), HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"),
ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"), ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"),
DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"), DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"),
LEAGUE("Twisted League", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws"), LEAGUE("Leagues", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws"),
TOURNAMENT("Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws"); TOURNAMENT("Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws");
private final String name; private final String name;
http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java
+8 -1
View File
@@ -82,7 +82,14 @@ public class LootTrackerClient
@Override @Override
public void onResponse(Call call, Response response) public void onResponse(Call call, Response response)
{ {
log.debug("Submitted loot"); if (response.isSuccessful())
{
log.debug("Submitted loot");
}
else
{
log.warn("Error submitting loot: {} - {}", response.code(), response.message());
}
response.close(); response.close();
future.complete(null); future.complete(null);
} }
runelite-api/src/main/java/net/runelite/api/GraphicID.java
+1
View File
@@ -58,4 +58,5 @@ public class GraphicID
public static final int OLM_CRYSTAL = 1447; public static final int OLM_CRYSTAL = 1447;
public static final int XERIC_TELEPORT = 1612; public static final int XERIC_TELEPORT = 1612;
public static final int HYDRA_LIGHTNING = 1666; public static final int HYDRA_LIGHTNING = 1666;
public static final int GRAPHICS_OBJECT_ROCKFALL = 1727;
} }
runelite-api/src/main/java/net/runelite/api/GraphicsObject.java
+18 -1
View File
@@ -27,7 +27,7 @@ package net.runelite.api;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
/** /**
* Represents a graphics object. * Represents a graphics object/spotanim.
*/ */
public interface GraphicsObject extends Entity public interface GraphicsObject extends Entity
{ {
@@ -45,8 +45,18 @@ public interface GraphicsObject extends Entity
*/ */
LocalPoint getLocation(); LocalPoint getLocation();
/**
* Get the time this spotanim starts
*
* @return
*/
int getStartCycle(); int getStartCycle();
/**
* The plane the spotanim is on.
*
* @return
*/
int getLevel(); int getLevel();
/** /**
@@ -55,4 +65,11 @@ public interface GraphicsObject extends Entity
* @return the height * @return the height
*/ */
int getHeight(); int getHeight();
/**
* Checks if this spotanim is done animating
*
* @return
*/
boolean finished();
} }
runelite-api/src/main/java/net/runelite/api/ItemID.java
+96 -28
View File
@@ -2573,22 +2573,22 @@ public final class ItemID
public static final int MODEL_SHIP = 4253; public static final int MODEL_SHIP = 4253;
public static final int MODEL_SHIP_4254 = 4254; public static final int MODEL_SHIP_4254 = 4254;
public static final int BONEMEAL = 4255; public static final int BONEMEAL = 4255;
public static final int BONEMEAL_4256 = 4256; public static final int BAT_BONEMEAL = 4256;
public static final int BONEMEAL_4257 = 4257; public static final int BIG_BONEMEAL = 4257;
public static final int BONEMEAL_4258 = 4258; public static final int BURNT_BONEMEAL = 4258;
public static final int BONEMEAL_4259 = 4259; public static final int BURNT_JOGRE_BONEMEAL = 4259;
public static final int BONEMEAL_4260 = 4260; public static final int BABY_DRAGON_BONEMEAL = 4260;
public static final int BONEMEAL_4261 = 4261; public static final int DRAGON_BONEMEAL = 4261;
public static final int BONEMEAL_4262 = 4262; public static final int WOLF_BONEMEAL = 4262;
public static final int BONEMEAL_4263 = 4263; public static final int SMALL_NINJA_BONEMEAL = 4263;
public static final int BONEMEAL_4264 = 4264; public static final int MEDIUM_NINJA_BONEMEAL = 4264;
public static final int BONEMEAL_4265 = 4265; public static final int GORILLA_BONEMEAL = 4265;
public static final int BONEMEAL_4266 = 4266; public static final int BEARDED_GORILLA_BONEMEAL = 4266;
public static final int BONEMEAL_4267 = 4267; public static final int MONKEY_BONEMEAL = 4267;
public static final int BONEMEAL_4268 = 4268; public static final int SMALL_ZOMBIE_MONKEY_BONEMEAL = 4268;
public static final int BONEMEAL_4269 = 4269; public static final int LARGE_ZOMBIE_MONKEY_BONEMEAL = 4269;
public static final int BONEMEAL_4270 = 4270; public static final int SKELETON_BONEMEAL = 4270;
public static final int BONEMEAL_4271 = 4271; public static final int JOGRE_BONEMEAL = 4271;
public static final int BONE_KEY_4272 = 4272; public static final int BONE_KEY_4272 = 4272;
public static final int CHEST_KEY_4273 = 4273; public static final int CHEST_KEY_4273 = 4273;
public static final int MAP_SCRAP = 4274; public static final int MAP_SCRAP = 4274;
@@ -2925,10 +2925,10 @@ public final class ItemID
public static final int RELICYMS_BALM2 = 4846; public static final int RELICYMS_BALM2 = 4846;
public static final int RELICYMS_BALM1 = 4848; public static final int RELICYMS_BALM1 = 4848;
public static final int OGRE_COFFIN_KEY = 4850; public static final int OGRE_COFFIN_KEY = 4850;
public static final int BONEMEAL_4852 = 4852; public static final int ZOGRE_BONEMEAL = 4852;
public static final int BONEMEAL_4853 = 4853; public static final int FAYRG_BONEMEAL = 4853;
public static final int BONEMEAL_4854 = 4854; public static final int RAURG_BONEMEAL = 4854;
public static final int BONEMEAL_4855 = 4855; public static final int OURG_BONEMEAL = 4855;
public static final int AHRIMS_HOOD_100 = 4856; public static final int AHRIMS_HOOD_100 = 4856;
public static final int AHRIMS_HOOD_75 = 4857; public static final int AHRIMS_HOOD_75 = 4857;
public static final int AHRIMS_HOOD_50 = 4858; public static final int AHRIMS_HOOD_50 = 4858;
@@ -3370,7 +3370,7 @@ public final class ItemID
public static final int CHICKEN = 5609; public static final int CHICKEN = 5609;
public static final int HOURGLASS = 5610; public static final int HOURGLASS = 5610;
public static final int MAGIC_CARPET = 5614; public static final int MAGIC_CARPET = 5614;
public static final int BONEMEAL_5615 = 5615; public static final int SHAIKAHAN_BONEMEAL = 5615;
public static final int BRONZE_ARROWP_5616 = 5616; public static final int BRONZE_ARROWP_5616 = 5616;
public static final int IRON_ARROWP_5617 = 5617; public static final int IRON_ARROWP_5617 = 5617;
public static final int STEEL_ARROWP_5618 = 5618; public static final int STEEL_ARROWP_5618 = 5618;
@@ -4013,7 +4013,7 @@ public final class ItemID
public static final int RUSTY_SCIMITAR = 6721; public static final int RUSTY_SCIMITAR = 6721;
public static final int ZOMBIE_HEAD = 6722; public static final int ZOMBIE_HEAD = 6722;
public static final int SEERCULL = 6724; public static final int SEERCULL = 6724;
public static final int BONEMEAL_6728 = 6728; public static final int DAGANNOTHKING_BONEMEAL = 6728;
public static final int DAGANNOTH_BONES = 6729; public static final int DAGANNOTH_BONES = 6729;
public static final int SEERS_RING = 6731; public static final int SEERS_RING = 6731;
public static final int ARCHERS_RING = 6733; public static final int ARCHERS_RING = 6733;
@@ -4079,7 +4079,7 @@ public final class ItemID
public static final int ZOMBIE_CHAMPION_SCROLL = 6807; public static final int ZOMBIE_CHAMPION_SCROLL = 6807;
public static final int LEONS_CHAMPION_SCROLL = 6808; public static final int LEONS_CHAMPION_SCROLL = 6808;
public static final int GRANITE_LEGS = 6809; public static final int GRANITE_LEGS = 6809;
public static final int BONEMEAL_6810 = 6810; public static final int WYVERN_BONEMEAL = 6810;
public static final int SKELETAL_WYVERN = 6811; public static final int SKELETAL_WYVERN = 6811;
public static final int WYVERN_BONES = 6812; public static final int WYVERN_BONES = 6812;
public static final int FUR = 6814; public static final int FUR = 6814;
@@ -7485,7 +7485,7 @@ public final class ItemID
public static final int BIRTHDAY_PRESENT = 11918; public static final int BIRTHDAY_PRESENT = 11918;
public static final int COW_MASK = 11919; public static final int COW_MASK = 11919;
public static final int DRAGON_PICKAXE = 11920; public static final int DRAGON_PICKAXE = 11920;
public static final int BONEMEAL_11922 = 11922; public static final int LAVA_DRAGON_BONEMEAL = 11922;
public static final int BROKEN_PICKAXE_11923 = 11923; public static final int BROKEN_PICKAXE_11923 = 11923;
public static final int MALEDICTION_WARD = 11924; public static final int MALEDICTION_WARD = 11924;
public static final int ODIUM_WARD = 11926; public static final int ODIUM_WARD = 11926;
@@ -9367,6 +9367,11 @@ public final class ItemID
public static final int AHRIMS_ROBETOP_20598 = 20598; public static final int AHRIMS_ROBETOP_20598 = 20598;
public static final int AHRIMS_ROBESKIRT_20599 = 20599; public static final int AHRIMS_ROBESKIRT_20599 = 20599;
public static final int RUNE_ARROW_20600 = 20600; public static final int RUNE_ARROW_20600 = 20600;
public static final int WOODEN_TABLE = 20601;
public static final int WAXWOOD_BED = 20602;
public static final int CARPET = 20603;
public static final int WOODEN_STOOL = 20604;
public static final int WOODEN_CHAIR_20605 = 20605;
public static final int RUNE_ARROW_PACK = 20607; public static final int RUNE_ARROW_PACK = 20607;
public static final int BLOODIER_KEY = 20608; public static final int BLOODIER_KEY = 20608;
public static final int FAIRY_ENCHANTMENT = 20609; public static final int FAIRY_ENCHANTMENT = 20609;
@@ -10234,7 +10239,7 @@ public final class ItemID
public static final int AVAS_ASSEMBLER = 22109; public static final int AVAS_ASSEMBLER = 22109;
public static final int DRAGONBONE_NECKLACE = 22111; public static final int DRAGONBONE_NECKLACE = 22111;
public static final int MYTHICAL_CAPE_22114 = 22114; public static final int MYTHICAL_CAPE_22114 = 22114;
public static final int BONEMEAL_22116 = 22116; public static final int SUPERIOR_DRAGON_BONEMEAL = 22116;
public static final int WRATH_TALISMAN = 22118; public static final int WRATH_TALISMAN = 22118;
public static final int WRATH_TIARA = 22121; public static final int WRATH_TIARA = 22121;
public static final int SUPERIOR_DRAGON_BONES = 22124; public static final int SUPERIOR_DRAGON_BONES = 22124;
@@ -10540,9 +10545,9 @@ public final class ItemID
public static final int IKKLE_HYDRA_22748 = 22748; public static final int IKKLE_HYDRA_22748 = 22748;
public static final int IKKLE_HYDRA_22750 = 22750; public static final int IKKLE_HYDRA_22750 = 22750;
public static final int IKKLE_HYDRA_22752 = 22752; public static final int IKKLE_HYDRA_22752 = 22752;
public static final int BONEMEAL_22754 = 22754; public static final int WYRM_BONEMEAL = 22754;
public static final int BONEMEAL_22756 = 22756; public static final int DRAKE_BONEMEAL = 22756;
public static final int BONEMEAL_22758 = 22758; public static final int HYDRA_BONEMEAL = 22758;
public static final int LOVAKENGJ_FAVOUR_CERTIFICATE = 22760; public static final int LOVAKENGJ_FAVOUR_CERTIFICATE = 22760;
public static final int DINHS_HAMMER = 22761; public static final int DINHS_HAMMER = 22761;
public static final int GENERATOR_CRANK = 22762; public static final int GENERATOR_CRANK = 22762;
@@ -11593,5 +11598,68 @@ public final class ItemID
public static final int GOLDEN_BANDOS_SPECIAL_ATTACK = 24869; public static final int GOLDEN_BANDOS_SPECIAL_ATTACK = 24869;
public static final int GOLDEN_SARADOMIN_SPECIAL_ATTACK = 24870; public static final int GOLDEN_SARADOMIN_SPECIAL_ATTACK = 24870;
public static final int GOLDEN_ZAMORAK_SPECIAL_ATTACK = 24871; public static final int GOLDEN_ZAMORAK_SPECIAL_ATTACK = 24871;
public static final int CARPENTERS_HELMET = 24872;
public static final int CARPENTERS_SHIRT = 24874;
public static final int CARPENTERS_TROUSERS = 24876;
public static final int CARPENTERS_BOOTS = 24878;
public static final int AMYS_SAW = 24880;
public static final int PLANK_SACK = 24882;
public static final int SUPPLY_CRATE_24884 = 24884;
public static final int HOSIDIUS_BLUEPRINTS = 24885;
public static final int WOODEN_TABLE_24886 = 24886;
public static final int OAK_TABLE = 24887;
public static final int TEAK_TABLE_24888 = 24888;
public static final int MAHOGANY_TABLE_24889 = 24889;
public static final int WOODEN_TABLE_24890 = 24890;
public static final int OAK_TABLE_24891 = 24891;
public static final int TEAK_TABLE_24892 = 24892;
public static final int MAHOGANY_TABLE_24893 = 24893;
public static final int WOODEN_TABLE_24894 = 24894;
public static final int OAK_TABLE_24895 = 24895;
public static final int TEAK_TABLE_24896 = 24896;
public static final int MAHOGANY_TABLE_24897 = 24897;
public static final int WOODEN_CABINET = 24898;
public static final int OAK_CABINET = 24899;
public static final int TEAK_CABINET = 24900;
public static final int MAHOGANY_CABINET = 24901;
public static final int WOODEN_BOOKCASE_24902 = 24902;
public static final int OAK_BOOKCASE_24903 = 24903;
public static final int TEAK_BOOKCASE = 24904;
public static final int MAHOGANY_BOOKCASE_24905 = 24905;
public static final int WOODEN_WARDROBE = 24906;
public static final int OAK_WARDROBE_24907 = 24907;
public static final int TEAK_WARDROBE_24908 = 24908;
public static final int MAHOGANY_WARDROBE_24909 = 24909;
public static final int WOODEN_DRESSER = 24910;
public static final int OAK_DRESSER_24911 = 24911;
public static final int TEAK_DRESSER_24912 = 24912;
public static final int MAHOGANY_DRESSER_24913 = 24913;
public static final int WOODEN_SHELVES = 24914;
public static final int OAK_SHELVES = 24915;
public static final int TEAK_SHELVES = 24916;
public static final int MAHOGANY_SHELVES = 24917;
public static final int WOODEN_BED_24918 = 24918;
public static final int OAK_BED_24919 = 24919;
public static final int TEAK_BED_24920 = 24920;
public static final int MAHOGANY_BED = 24921;
public static final int WOODEN_BED_24922 = 24922;
public static final int OAK_BED_24923 = 24923;
public static final int TEAK_BED_24924 = 24924;
public static final int MAHOGANY_BED_24925 = 24925;
public static final int WOODEN_DRAWER = 24926;
public static final int OAK_DRAWER = 24927;
public static final int TEAK_DRAWER = 24928;
public static final int MAHOGANY_DRAWER = 24929;
public static final int WOODEN_CHAIR_24930 = 24930;
public static final int OAK_CHAIR_24931 = 24931;
public static final int TEAK_CHAIR = 24932;
public static final int MAHOGANY_CHAIR = 24933;
public static final int WOODEN_CUPBOARD = 24934;
public static final int OAK_CUPBOARD = 24935;
public static final int TEAK_CUPBOARD = 24936;
public static final int MAHOGANY_CUPBOARD = 24937;
public static final int WAXWOOD_LOG = 24938;
public static final int WAXWOOD_PLANK = 24939;
public static final int MARLOS_CRATE = 24940;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NpcID.java
+31 -5
View File
@@ -3057,7 +3057,7 @@ public final class NpcID
public static final int DRUNKEN_MAN = 3263; public static final int DRUNKEN_MAN = 3263;
public static final int MAN_3264 = 3264; public static final int MAN_3264 = 3264;
public static final int MAN_3265 = 3265; public static final int MAN_3265 = 3265;
public static final int MAN_3266 = 3266; public static final int NORMAN = 3266;
public static final int CECILIA = 3267; public static final int CECILIA = 3267;
public static final int WOMAN_3268 = 3268; public static final int WOMAN_3268 = 3268;
public static final int GUARD_3269 = 3269; public static final int GUARD_3269 = 3269;
@@ -5872,7 +5872,7 @@ public final class NpcID
public static final int CAVE_GOBLIN_6436 = 6436; public static final int CAVE_GOBLIN_6436 = 6436;
public static final int CAVE_GOBLIN_6437 = 6437; public static final int CAVE_GOBLIN_6437 = 6437;
public static final int ANIMATED_STEEL_ARMOUR_6438 = 6438; public static final int ANIMATED_STEEL_ARMOUR_6438 = 6438;
public static final int ODOVACAR = 6439; public static final int AMY = 6439;
public static final int GIANT_SKELETON_6440 = 6440; public static final int GIANT_SKELETON_6440 = 6440;
public static final int SKELETON_6441 = 6441; public static final int SKELETON_6441 = 6441;
public static final int SKELETON_6442 = 6442; public static final int SKELETON_6442 = 6442;
@@ -6721,7 +6721,7 @@ public final class NpcID
public static final int COUNT_CHECK = 7414; public static final int COUNT_CHECK = 7414;
public static final int BOLOGA = 7415; public static final int BOLOGA = 7415;
public static final int OBOR = 7416; public static final int OBOR = 7416;
public static final int ENIOLA = 7417; public static final int AMY_7417 = 7417;
public static final int ZAMORAK_WARRIOR = 7418; public static final int ZAMORAK_WARRIOR = 7418;
public static final int ZAMORAK_WARRIOR_7419 = 7419; public static final int ZAMORAK_WARRIOR_7419 = 7419;
public static final int ZAMORAK_RANGER = 7420; public static final int ZAMORAK_RANGER = 7420;
@@ -7331,8 +7331,8 @@ public final class NpcID
public static final int ROBERT_THE_STRONG_8129 = 8129; public static final int ROBERT_THE_STRONG_8129 = 8129;
public static final int ODYSSEUS_8130 = 8130; public static final int ODYSSEUS_8130 = 8130;
public static final int TORFINN = 8131; public static final int TORFINN = 8131;
public static final int TORFINN_8132 = 8132; public static final int ENIOLA = 8132;
public static final int TORFINN_8133 = 8133; public static final int ODOVACAR = 8133;
public static final int SARAH_8134 = 8134; public static final int SARAH_8134 = 8134;
public static final int DRAGONKIN_8135 = 8135; public static final int DRAGONKIN_8135 = 8135;
public static final int ZORGOTH = 8136; public static final int ZORGOTH = 8136;
@@ -8305,6 +8305,7 @@ public final class NpcID
public static final int TRADER_STAN_9303 = 9303; public static final int TRADER_STAN_9303 = 9303;
public static final int TRADER_STAN_9304 = 9304; public static final int TRADER_STAN_9304 = 9304;
public static final int TRADER_STAN_9305 = 9305; public static final int TRADER_STAN_9305 = 9305;
public static final int LOKAR_SEARUNNER_9306 = 9306;
public static final int TRADER_STAN_9307 = 9307; public static final int TRADER_STAN_9307 = 9307;
public static final int TRADER_STAN_9308 = 9308; public static final int TRADER_STAN_9308 = 9308;
public static final int TRADER_STAN_9309 = 9309; public static final int TRADER_STAN_9309 = 9309;
@@ -8791,5 +8792,30 @@ public final class NpcID
public static final int GUARDIAN_DRAKE = 10400; public static final int GUARDIAN_DRAKE = 10400;
public static final int GUARDIAN_DRAKE_10401 = 10401; public static final int GUARDIAN_DRAKE_10401 = 10401;
public static final int COLOSSAL_HYDRA = 10402; public static final int COLOSSAL_HYDRA = 10402;
public static final int TORFINN_10403 = 10403;
public static final int TORFINN_10404 = 10404;
public static final int TORFINN_10405 = 10405;
public static final int TORFINN_10406 = 10406;
public static final int JARVALD_10407 = 10407;
public static final int MARLO = 10408;
public static final int MARLO_10409 = 10409;
public static final int ELLIE = 10410;
public static final int ELLIE_10411 = 10411;
public static final int ANGELO = 10412;
public static final int ANGELO_10413 = 10413;
public static final int BOB_10414 = 10414;
public static final int JEFF_10415 = 10415;
public static final int SARAH_10416 = 10416;
public static final int TAU = 10417;
public static final int LARRY_10418 = 10418;
public static final int NOELLA = 10419;
public static final int ROSS = 10420;
public static final int JESS = 10421;
public static final int MARIAH = 10422;
public static final int LEELA_10423 = 10423;
public static final int BARBARA = 10424;
public static final int OLD_MAN_YARLO = 10425;
public static final int OLD_MAN_YARLO_10426 = 10426;
public static final int OLD_MAN_YARLO_10427 = 10427;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+6 -5
View File
@@ -11047,11 +11047,6 @@ public final class NullItemID
public static final int NULL_20592 = 20592; public static final int NULL_20592 = 20592;
public static final int NULL_20596 = 20596; public static final int NULL_20596 = 20596;
public static final int NULL_20597 = 20597; public static final int NULL_20597 = 20597;
public static final int NULL_20601 = 20601;
public static final int NULL_20602 = 20602;
public static final int NULL_20603 = 20603;
public static final int NULL_20604 = 20604;
public static final int NULL_20605 = 20605;
public static final int NULL_20606 = 20606; public static final int NULL_20606 = 20606;
public static final int NULL_20610 = 20610; public static final int NULL_20610 = 20610;
public static final int NULL_20612 = 20612; public static final int NULL_20612 = 20612;
@@ -13070,5 +13065,11 @@ public final class NullItemID
public static final int NULL_24854 = 24854; public static final int NULL_24854 = 24854;
public static final int NULL_24856 = 24856; public static final int NULL_24856 = 24856;
public static final int NULL_24858 = 24858; public static final int NULL_24858 = 24858;
public static final int NULL_24873 = 24873;
public static final int NULL_24875 = 24875;
public static final int NULL_24877 = 24877;
public static final int NULL_24879 = 24879;
public static final int NULL_24881 = 24881;
public static final int NULL_24883 = 24883;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+4
View File
@@ -1593,5 +1593,9 @@ public final class NullNpcID
public static final int NULL_10366 = 10366; public static final int NULL_10366 = 10366;
public static final int NULL_10367 = 10367; public static final int NULL_10367 = 10367;
public static final int NULL_10396 = 10396; public static final int NULL_10396 = 10396;
public static final int NULL_10428 = 10428;
public static final int NULL_10429 = 10429;
public static final int NULL_10430 = 10430;
public static final int NULL_10431 = 10431;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+114 -2
View File
@@ -5889,6 +5889,8 @@ public final class NullObjectID
public static final int NULL_13506 = 13506; public static final int NULL_13506 = 13506;
public static final int NULL_13581 = 13581; public static final int NULL_13581 = 13581;
public static final int NULL_13582 = 13582; public static final int NULL_13582 = 13582;
public static final int NULL_13600 = 13600;
public static final int NULL_13601 = 13601;
public static final int NULL_13610 = 13610; public static final int NULL_13610 = 13610;
public static final int NULL_13611 = 13611; public static final int NULL_13611 = 13611;
public static final int NULL_13612 = 13612; public static final int NULL_13612 = 13612;
@@ -13098,8 +13100,6 @@ public final class NullObjectID
public static final int NULL_27507 = 27507; public static final int NULL_27507 = 27507;
public static final int NULL_27508 = 27508; public static final int NULL_27508 = 27508;
public static final int NULL_27509 = 27509; public static final int NULL_27509 = 27509;
public static final int NULL_27514 = 27514;
public static final int NULL_27515 = 27515;
public static final int NULL_27549 = 27549; public static final int NULL_27549 = 27549;
public static final int NULL_27550 = 27550; public static final int NULL_27550 = 27550;
public static final int NULL_27551 = 27551; public static final int NULL_27551 = 27551;
@@ -19579,5 +19579,117 @@ public final class NullObjectID
public static final int NULL_39745 = 39745; public static final int NULL_39745 = 39745;
public static final int NULL_39746 = 39746; public static final int NULL_39746 = 39746;
public static final int NULL_39747 = 39747; public static final int NULL_39747 = 39747;
public static final int NULL_39883 = 39883;
public static final int NULL_39884 = 39884;
public static final int NULL_39885 = 39885;
public static final int NULL_39886 = 39886;
public static final int NULL_39887 = 39887;
public static final int NULL_39888 = 39888;
public static final int NULL_39889 = 39889;
public static final int NULL_39890 = 39890;
public static final int NULL_39981 = 39981;
public static final int NULL_39982 = 39982;
public static final int NULL_39983 = 39983;
public static final int NULL_39984 = 39984;
public static final int NULL_39985 = 39985;
public static final int NULL_39986 = 39986;
public static final int NULL_39987 = 39987;
public static final int NULL_39988 = 39988;
public static final int NULL_39989 = 39989;
public static final int NULL_39990 = 39990;
public static final int NULL_39991 = 39991;
public static final int NULL_39992 = 39992;
public static final int NULL_39993 = 39993;
public static final int NULL_39994 = 39994;
public static final int NULL_39995 = 39995;
public static final int NULL_39996 = 39996;
public static final int NULL_39997 = 39997;
public static final int NULL_39998 = 39998;
public static final int NULL_39999 = 39999;
public static final int NULL_40000 = 40000;
public static final int NULL_40001 = 40001;
public static final int NULL_40002 = 40002;
public static final int NULL_40003 = 40003;
public static final int NULL_40004 = 40004;
public static final int NULL_40005 = 40005;
public static final int NULL_40006 = 40006;
public static final int NULL_40007 = 40007;
public static final int NULL_40008 = 40008;
public static final int NULL_40009 = 40009;
public static final int NULL_40010 = 40010;
public static final int NULL_40011 = 40011;
public static final int NULL_40012 = 40012;
public static final int NULL_40013 = 40013;
public static final int NULL_40014 = 40014;
public static final int NULL_40015 = 40015;
public static final int NULL_40083 = 40083;
public static final int NULL_40084 = 40084;
public static final int NULL_40085 = 40085;
public static final int NULL_40086 = 40086;
public static final int NULL_40087 = 40087;
public static final int NULL_40088 = 40088;
public static final int NULL_40089 = 40089;
public static final int NULL_40090 = 40090;
public static final int NULL_40091 = 40091;
public static final int NULL_40092 = 40092;
public static final int NULL_40093 = 40093;
public static final int NULL_40094 = 40094;
public static final int NULL_40095 = 40095;
public static final int NULL_40096 = 40096;
public static final int NULL_40097 = 40097;
public static final int NULL_40098 = 40098;
public static final int NULL_40099 = 40099;
public static final int NULL_40156 = 40156;
public static final int NULL_40157 = 40157;
public static final int NULL_40158 = 40158;
public static final int NULL_40159 = 40159;
public static final int NULL_40160 = 40160;
public static final int NULL_40161 = 40161;
public static final int NULL_40162 = 40162;
public static final int NULL_40163 = 40163;
public static final int NULL_40164 = 40164;
public static final int NULL_40165 = 40165;
public static final int NULL_40166 = 40166;
public static final int NULL_40167 = 40167;
public static final int NULL_40168 = 40168;
public static final int NULL_40169 = 40169;
public static final int NULL_40170 = 40170;
public static final int NULL_40171 = 40171;
public static final int NULL_40172 = 40172;
public static final int NULL_40173 = 40173;
public static final int NULL_40174 = 40174;
public static final int NULL_40175 = 40175;
public static final int NULL_40176 = 40176;
public static final int NULL_40177 = 40177;
public static final int NULL_40223 = 40223;
public static final int NULL_40224 = 40224;
public static final int NULL_40234 = 40234;
public static final int NULL_40235 = 40235;
public static final int NULL_40238 = 40238;
public static final int NULL_40239 = 40239;
public static final int NULL_40241 = 40241;
public static final int NULL_40242 = 40242;
public static final int NULL_40285 = 40285;
public static final int NULL_40286 = 40286;
public static final int NULL_40287 = 40287;
public static final int NULL_40288 = 40288;
public static final int NULL_40289 = 40289;
public static final int NULL_40290 = 40290;
public static final int NULL_40291 = 40291;
public static final int NULL_40292 = 40292;
public static final int NULL_40293 = 40293;
public static final int NULL_40294 = 40294;
public static final int NULL_40295 = 40295;
public static final int NULL_40296 = 40296;
public static final int NULL_40297 = 40297;
public static final int NULL_40298 = 40298;
public static final int NULL_40299 = 40299;
public static final int NULL_40300 = 40300;
public static final int NULL_40301 = 40301;
public static final int NULL_40302 = 40302;
public static final int NULL_40303 = 40303;
public static final int NULL_40304 = 40304;
public static final int NULL_40305 = 40305;
public static final int NULL_40306 = 40306;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+332 -4
View File
@@ -3975,7 +3975,7 @@ public final class ObjectID
public static final int BENCH_7430 = 7430; public static final int BENCH_7430 = 7430;
public static final int BOOKCASE_7431 = 7431; public static final int BOOKCASE_7431 = 7431;
public static final int OAK_CHAIR = 7433; public static final int OAK_CHAIR = 7433;
public static final int CLOCK_7434 = 7434; public static final int GRANDFATHER_CLOCK_7434 = 7434;
public static final int DESK_7438 = 7438; public static final int DESK_7438 = 7438;
public static final int CHAIR_7439 = 7439; public static final int CHAIR_7439 = 7439;
public static final int DESK_7440 = 7440; public static final int DESK_7440 = 7440;
@@ -7714,10 +7714,8 @@ public final class ObjectID
public static final int SHELVES_13597 = 13597; public static final int SHELVES_13597 = 13597;
public static final int CRATES_13598 = 13598; public static final int CRATES_13598 = 13598;
public static final int CRATES_13599 = 13599; public static final int CRATES_13599 = 13599;
public static final int BARREL_13600 = 13600;
public static final int LARGE_BARREL = 13601;
public static final int RACK_OF_BARRELS = 13602; public static final int RACK_OF_BARRELS = 13602;
public static final int LARGE_BARREL_13603 = 13603; public static final int LARGE_BARREL = 13603;
public static final int BARROW = 13604; public static final int BARROW = 13604;
public static final int BARROW_13605 = 13605; public static final int BARROW_13605 = 13605;
public static final int BARROW_13606 = 13606; public static final int BARROW_13606 = 13606;
@@ -14404,6 +14402,8 @@ public final class ObjectID
public static final int BENCH_27511 = 27511; public static final int BENCH_27511 = 27511;
public static final int CHAIR_27512 = 27512; public static final int CHAIR_27512 = 27512;
public static final int CHAIR_27513 = 27513; public static final int CHAIR_27513 = 27513;
public static final int TABLE_27514 = 27514;
public static final int TABLE_27515 = 27515;
public static final int RANGE_27516 = 27516; public static final int RANGE_27516 = 27516;
public static final int RANGE_27517 = 27517; public static final int RANGE_27517 = 27517;
public static final int BAR_27518 = 27518; public static final int BAR_27518 = 27518;
@@ -19392,11 +19392,26 @@ public final class ObjectID
public static final int ROUGH_WALL_37431 = 37431; public static final int ROUGH_WALL_37431 = 37431;
public static final int STREAK_INFO = 37434; public static final int STREAK_INFO = 37434;
public static final int SWAMPY_SINK = 37435; public static final int SWAMPY_SINK = 37435;
public static final int DOOR_HOTSPOT_37436 = 37436;
public static final int DOOR_HOTSPOT_37437 = 37437;
public static final int WINDOW_SPACE_37438 = 37438;
public static final int SHUTTERED_WINDOW_37441 = 37441; public static final int SHUTTERED_WINDOW_37441 = 37441;
public static final int DECORATIVE_WINDOW_37442 = 37442; public static final int DECORATIVE_WINDOW_37442 = 37442;
public static final int STAINEDGLASS_WINDOW_37443 = 37443; public static final int STAINEDGLASS_WINDOW_37443 = 37443;
public static final int LOG_PILE_37444 = 37444; public static final int LOG_PILE_37444 = 37444;
public static final int SHUTTERED_WINDOW_37445 = 37445;
public static final int DECORATIVE_WINDOW_37446 = 37446;
public static final int STAINEDGLASS_WINDOW_37447 = 37447;
public static final int DECORATIVE_WINDOW_37448 = 37448;
public static final int STAINEDGLASS_WINDOW_37449 = 37449;
public static final int DECORATIVE_WINDOW_37450 = 37450; public static final int DECORATIVE_WINDOW_37450 = 37450;
public static final int DECORATIVE_WINDOW_37451 = 37451;
public static final int STAINEDGLASS_WINDOW_37452 = 37452;
public static final int DECORATIVE_WINDOW_37453 = 37453;
public static final int STAINEDGLASS_WINDOW_37454 = 37454;
public static final int DOOR_37455 = 37455;
public static final int DOOR_37456 = 37456;
public static final int DOOR_37457 = 37457;
public static final int STAINEDGLASS_WINDOW_37458 = 37458; public static final int STAINEDGLASS_WINDOW_37458 = 37458;
public static final int DECORATIVE_WINDOW_37459 = 37459; public static final int DECORATIVE_WINDOW_37459 = 37459;
public static final int STAINEDGLASS_WINDOW_37460 = 37460; public static final int STAINEDGLASS_WINDOW_37460 = 37460;
@@ -20274,5 +20289,318 @@ public final class ObjectID
public static final int HERBS_39879 = 39879; public static final int HERBS_39879 = 39879;
public static final int HERBS_39880 = 39880; public static final int HERBS_39880 = 39880;
public static final int HERBS_39881 = 39881; public static final int HERBS_39881 = 39881;
public static final int DOOR_39882 = 39882;
public static final int BROKEN_TABLE_39891 = 39891;
public static final int TEAK_TABLE_39892 = 39892;
public static final int WOODEN_TABLE_39893 = 39893;
public static final int OAK_TABLE_39894 = 39894;
public static final int TEAK_TABLE_39895 = 39895;
public static final int MAHOGANY_TABLE_39896 = 39896;
public static final int BROKEN_GRANDFATHER_CLOCK = 39897;
public static final int BROKEN_CABINET = 39898;
public static final int CABINET_39899 = 39899;
public static final int CABINET_39900 = 39900;
public static final int CABINET_39901 = 39901;
public static final int CABINET_39902 = 39902;
public static final int CABINET_39903 = 39903;
public static final int BROKEN_CABINET_39904 = 39904;
public static final int CABINET_39905 = 39905;
public static final int CABINET_39906 = 39906;
public static final int CABINET_39907 = 39907;
public static final int CABINET_39908 = 39908;
public static final int CABINET_39909 = 39909;
public static final int BOOKCASE_39910 = 39910;
public static final int BOOKCASE_39911 = 39911;
public static final int BOOKCASE_39912 = 39912;
public static final int BOOKCASE_39913 = 39913;
public static final int BOOKCASE_39914 = 39914;
public static final int BOOKCASE_39915 = 39915;
public static final int WARDROBE_39916 = 39916;
public static final int WARDROBE_39917 = 39917;
public static final int WARDROBE_39918 = 39918;
public static final int WARDROBE_39919 = 39919;
public static final int WARDROBE_39920 = 39920;
public static final int WARDROBE_39921 = 39921;
public static final int BROKEN_DRAWERS = 39922;
public static final int DRAWERS_39923 = 39923;
public static final int DRAWERS_39924 = 39924;
public static final int DRAWERS_39925 = 39925;
public static final int DRAWERS_39926 = 39926;
public static final int DRAWERS_39927 = 39927;
public static final int BROKEN_TABLE_39928 = 39928;
public static final int TABLE_39929 = 39929;
public static final int TABLE_39930 = 39930;
public static final int TABLE_39931 = 39931;
public static final int TABLE_39932 = 39932;
public static final int TABLE_39933 = 39933;
public static final int BROKEN_SHELVES = 39934;
public static final int SHELVES_39935 = 39935;
public static final int SHELVES_39936 = 39936;
public static final int SHELVES_39937 = 39937;
public static final int SHELVES_39938 = 39938;
public static final int SHELVES_39939 = 39939;
public static final int BED_39940 = 39940;
public static final int BROKEN_BED_39941 = 39941;
public static final int BED_39942 = 39942;
public static final int BED_39943 = 39943;
public static final int BED_39944 = 39944;
public static final int BED_39945 = 39945;
public static final int BED_39946 = 39946;
public static final int BROKEN_DRESSER = 39947;
public static final int DRESSER_39948 = 39948;
public static final int DRESSER_39949 = 39949;
public static final int DRESSER_39950 = 39950;
public static final int DRESSER_39951 = 39951;
public static final int DRESSER_39952 = 39952;
public static final int BROKEN_MIRROR = 39953;
public static final int BROKEN_CHAIR = 39954;
public static final int CHAIR_39955 = 39955;
public static final int CHAIR_39956 = 39956;
public static final int CHAIR_39957 = 39957;
public static final int CHAIR_39958 = 39958;
public static final int CHAIR_39959 = 39959;
public static final int TABLE_39960 = 39960;
public static final int TABLE_39961 = 39961;
public static final int TABLE_39962 = 39962;
public static final int TABLE_39963 = 39963;
public static final int TABLE_39964 = 39964;
public static final int TABLE_39965 = 39965;
public static final int TABLE_39966 = 39966;
public static final int TABLE_39967 = 39967;
public static final int TABLE_39968 = 39968;
public static final int TABLE_39969 = 39969;
public static final int TABLE_39970 = 39970;
public static final int TABLE_39971 = 39971;
public static final int BED_39972 = 39972;
public static final int BED_39973 = 39973;
public static final int BED_39974 = 39974;
public static final int BED_39975 = 39975;
public static final int BED_39976 = 39976;
public static final int BED_39977 = 39977;
public static final int BED_39978 = 39978;
public static final int BROKEN_RANGE_39979 = 39979;
public static final int BROKEN_RANGE_39980 = 39980;
public static final int BROKEN_TABLE_40016 = 40016;
public static final int TABLE_40017 = 40017;
public static final int TABLE_40018 = 40018;
public static final int TABLE_40019 = 40019;
public static final int TABLE_40020 = 40020;
public static final int TABLE_40021 = 40021;
public static final int BROKEN_SINK = 40022;
public static final int SINK_40023 = 40023;
public static final int COOKING_SHELVES_40024 = 40024;
public static final int COOKING_SHELVES_40025 = 40025;
public static final int COOKING_SHELVES_40026 = 40026;
public static final int COOKING_SHELVES_40027 = 40027;
public static final int COOKING_SHELVES_40028 = 40028;
public static final int COOKING_SHELVES_40029 = 40029;
public static final int BROKEN_TABLE_40030 = 40030;
public static final int TABLE_40031 = 40031;
public static final int TABLE_40032 = 40032;
public static final int TABLE_40033 = 40033;
public static final int TABLE_40034 = 40034;
public static final int TABLE_40035 = 40035;
public static final int CUPBOARD_40036 = 40036;
public static final int CUPBOARD_40037 = 40037;
public static final int CUPBOARD_40038 = 40038;
public static final int CUPBOARD_40039 = 40039;
public static final int CUPBOARD_40040 = 40040;
public static final int CUPBOARD_40041 = 40041;
public static final int BED_40042 = 40042;
public static final int BED_40043 = 40043;
public static final int BED_40044 = 40044;
public static final int BED_40045 = 40045;
public static final int BED_40046 = 40046;
public static final int BED_40047 = 40047;
public static final int BED_40048 = 40048;
public static final int BED_40049 = 40049;
public static final int BED_40050 = 40050;
public static final int BED_40051 = 40051;
public static final int BED_40052 = 40052;
public static final int BED_40053 = 40053;
public static final int BED_40054 = 40054;
public static final int DRAWERS_40055 = 40055;
public static final int DRAWERS_40056 = 40056;
public static final int DRAWERS_40057 = 40057;
public static final int DRAWERS_40058 = 40058;
public static final int DRAWERS_40059 = 40059;
public static final int DRAWERS_40060 = 40060;
public static final int CHAIR_40061 = 40061;
public static final int CHAIR_40062 = 40062;
public static final int CHAIR_40063 = 40063;
public static final int CHAIR_40064 = 40064;
public static final int CHAIR_40065 = 40065;
public static final int CHAIR_40066 = 40066;
public static final int BROKEN_RANGE_40067 = 40067;
public static final int RANGE_40068 = 40068;
public static final int TABLE_SPACE_40069 = 40069;
public static final int TABLE_SPACE_40070 = 40070;
public static final int TABLE_SPACE_40071 = 40071;
public static final int TABLE_SPACE_40072 = 40072;
public static final int CABINET_SPACE = 40073;
public static final int BOOKCASE_SPACE_40074 = 40074;
public static final int WARDROBE_SPACE_40075 = 40075;
public static final int DRESSER_SPACE_40076 = 40076;
public static final int SHELVES_SPACE = 40077;
public static final int CUPBOARD_SPACE = 40078;
public static final int CHAIR_SPACE_40079 = 40079;
public static final int BED_SPACE_40080 = 40080;
public static final int BED_SPACE_40081 = 40081;
public static final int DRAWER_SPACE = 40082;
public static final int BROKEN_SINK_40100 = 40100;
public static final int BROKEN_TABLE_40101 = 40101;
public static final int TABLE_40102 = 40102;
public static final int TABLE_40103 = 40103;
public static final int TABLE_40104 = 40104;
public static final int TABLE_40105 = 40105;
public static final int TABLE_40106 = 40106;
public static final int TABLE_40107 = 40107;
public static final int TABLE_40108 = 40108;
public static final int TABLE_40109 = 40109;
public static final int TABLE_40110 = 40110;
public static final int TABLE_40111 = 40111;
public static final int TABLE_40112 = 40112;
public static final int CUPBOARD_40113 = 40113;
public static final int BROKEN_CUPBOARD = 40114;
public static final int CUPBOARD_40115 = 40115;
public static final int CUPBOARD_40116 = 40116;
public static final int CUPBOARD_40117 = 40117;
public static final int CUPBOARD_40118 = 40118;
public static final int CUPBOARD_40119 = 40119;
public static final int BROKEN_SHELVES_40120 = 40120;
public static final int SHELVES_40121 = 40121;
public static final int SHELVES_40122 = 40122;
public static final int SHELVES_40123 = 40123;
public static final int SHELVES_40124 = 40124;
public static final int SHELVES_40125 = 40125;
public static final int BED_40126 = 40126;
public static final int BROKEN_BED_40127 = 40127;
public static final int BED_40128 = 40128;
public static final int BED_40129 = 40129;
public static final int BED_40130 = 40130;
public static final int BED_40131 = 40131;
public static final int BED_40132 = 40132;
public static final int BROKEN_OLD_BOOKSHELF = 40133;
public static final int OLD_BOOKSHELF_40134 = 40134;
public static final int OLD_BOOKSHELF_40135 = 40135;
public static final int OLD_BOOKSHELF_40136 = 40136;
public static final int OLD_BOOKSHELF_40137 = 40137;
public static final int OLD_BOOKSHELF_40138 = 40138;
public static final int HAT_STAND_40139 = 40139;
public static final int HAT_STAND_40140 = 40140;
public static final int GRANDFATHER_CLOCK_40141 = 40141;
public static final int DRAWERS_40142 = 40142;
public static final int DRAWERS_40143 = 40143;
public static final int DRAWERS_40144 = 40144;
public static final int DRAWERS_40145 = 40145;
public static final int DRAWERS_40146 = 40146;
public static final int DRAWERS_40147 = 40147;
public static final int BROKEN_RANGE_40148 = 40148;
public static final int RANGE_40149 = 40149;
public static final int DRAWERS_40150 = 40150;
public static final int DRAWERS_40151 = 40151;
public static final int DRAWERS_40152 = 40152;
public static final int DRAWERS_40153 = 40153;
public static final int DRAWERS_40154 = 40154;
public static final int DRAWERS_40155 = 40155;
public static final int DOOR_40178 = 40178;
public static final int BROKEN_MIRROR_40179 = 40179;
public static final int DRAWERS_40180 = 40180;
public static final int DRAWERS_40181 = 40181;
public static final int DRAWERS_40182 = 40182;
public static final int DRAWERS_40183 = 40183;
public static final int DRAWERS_40184 = 40184;
public static final int DRAWERS_40185 = 40185;
public static final int DRAWERS_40186 = 40186;
public static final int DRAWERS_40187 = 40187;
public static final int DRAWERS_40188 = 40188;
public static final int DRAWERS_40189 = 40189;
public static final int DRAWERS_40190 = 40190;
public static final int DRAWERS_40191 = 40191;
public static final int BROKEN_BED_40192 = 40192;
public static final int BED_40193 = 40193;
public static final int BED_40194 = 40194;
public static final int BED_40195 = 40195;
public static final int BED_40196 = 40196;
public static final int BED_40197 = 40197;
public static final int BED_40198 = 40198;
public static final int BROKEN_BED_40199 = 40199;
public static final int BED_40200 = 40200;
public static final int BED_40201 = 40201;
public static final int BED_40202 = 40202;
public static final int BED_40203 = 40203;
public static final int BED_40204 = 40204;
public static final int BED_40205 = 40205;
public static final int BED_40206 = 40206;
public static final int BED_40207 = 40207;
public static final int BED_40208 = 40208;
public static final int BED_40209 = 40209;
public static final int BED_40210 = 40210;
public static final int BED_40211 = 40211;
public static final int BROKEN_BATH = 40212;
public static final int BATH_40213 = 40213;
public static final int CRATES_40214 = 40214;
public static final int BROKEN_STOOL = 40215;
public static final int BROKEN_STOOL_40216 = 40216;
public static final int STOOL_HOTSPOT = 40217;
public static final int STOOL_40218 = 40218;
public static final int BROKEN_CHAIR_40219 = 40219;
public static final int BROKEN_CHAIR_40220 = 40220;
public static final int CHAIR_HOTSPOT = 40221;
public static final int CHAIR_40222 = 40222;
public static final int BROKEN_TABLE_40225 = 40225;
public static final int BROKEN_TABLE_40226 = 40226;
public static final int TABLE_HOTSPOT = 40227;
public static final int TABLE_40228 = 40228;
public static final int CAMPBED = 40229;
public static final int CAMPBED_40230 = 40230;
public static final int BED_HOTSPOT = 40231;
public static final int BED_40232 = 40232;
public static final int ROTTEN_CARPET = 40233;
public static final int ROTTEN_CARPET_40236 = 40236;
public static final int CARPET_HOTSPOT = 40237;
public static final int CARPET = 40240;
public static final int PITFALL_40243 = 40243;
public static final int DAGANNOTH_SUPREME_JR = 40244;
public static final int VASA_MINIRIO = 40245;
public static final int GENERAL_GRAARDOR_JR = 40246;
public static final int SMOLCANO = 40247;
public static final int BABY_MOLE = 40248;
public static final int KALPHITE_PRINCESS = 40249;
public static final int SMOKE_DEVIL = 40250;
public static final int CHOMPY_CHICK = 40251;
public static final int DARK_SQUIRREL = 40252;
public static final int TANGLEROOT = 40253;
public static final int CAT_40254 = 40254;
public static final int CAT_40255 = 40255;
public static final int CAT_40256 = 40256;
public static final int CAT_40257 = 40257;
public static final int CAT_40258 = 40258;
public static final int CAT_40259 = 40259;
public static final int HELLCAT = 40260;
public static final int OVERGROWN_CAT = 40261;
public static final int OVERGROWN_CAT_40262 = 40262;
public static final int OVERGROWN_CAT_40263 = 40263;
public static final int OVERGROWN_CAT_40264 = 40264;
public static final int OVERGROWN_CAT_40265 = 40265;
public static final int OVERGROWN_CAT_40266 = 40266;
public static final int OVERGROWN_HELLCAT = 40267;
public static final int LAZY_CAT = 40268;
public static final int LAZY_CAT_40269 = 40269;
public static final int LAZY_CAT_40270 = 40270;
public static final int LAZY_CAT_40271 = 40271;
public static final int LAZY_CAT_40272 = 40272;
public static final int LAZY_CAT_40273 = 40273;
public static final int LAZY_HELLCAT = 40274;
public static final int WILY_CAT = 40275;
public static final int WILY_CAT_40276 = 40276;
public static final int WILY_CAT_40277 = 40277;
public static final int WILY_CAT_40278 = 40278;
public static final int WILY_CAT_40279 = 40279;
public static final int WILY_CAT_40280 = 40280;
public static final int WILY_HELLCAT = 40281;
public static final int DRAWERS_40282 = 40282;
public static final int DRAWERS_40283 = 40283;
public static final int BOXES_40284 = 40284;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-client/src/main/java/net/runelite/client/Notifier.java
+4 -3
View File
@@ -205,14 +205,15 @@ public class Notifier
public void processFlash(final Graphics2D graphics) public void processFlash(final Graphics2D graphics)
{ {
if (flashStart == null || client.getGameState() != GameState.LOGGED_IN) FlashNotification flashNotification = runeLiteConfig.flashNotification();
if (flashStart == null || client.getGameState() != GameState.LOGGED_IN
|| flashNotification == FlashNotification.DISABLED)
{ {
flashStart = null; flashStart = null;
return; return;
} }
FlashNotification flashNotification = runeLiteConfig.flashNotification();
if (Instant.now().minusMillis(MINIMUM_FLASH_DURATION_MILLIS).isAfter(flashStart)) if (Instant.now().minusMillis(MINIMUM_FLASH_DURATION_MILLIS).isAfter(flashStart))
{ {
switch (flashNotification) switch (flashNotification)
runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
+9 -2
View File
@@ -182,12 +182,15 @@ public class DiscordService implements AutoCloseable
* *
* @param userId The id of the user to respond to * @param userId The id of the user to respond to
* @param reply The reply type * @param reply The reply type
* @see DiscordRPC#DISCORD_REPLY_NO
* @see DiscordRPC#DISCORD_REPLY_YES
* @see DiscordRPC#DISCORD_REPLY_IGNORE
*/ */
public void respondToRequest(String userId, DiscordReplyType reply) public void respondToRequest(String userId, int reply)
{ {
if (discordRPC != null) if (discordRPC != null)
{ {
discordRPC.Discord_Respond(userId, reply.ordinal()); discordRPC.Discord_Respond(userId, reply);
} }
} }
@@ -204,6 +207,7 @@ public class DiscordService implements AutoCloseable
private void disconnected(int errorCode, String message) private void disconnected(int errorCode, String message)
{ {
log.debug("Discord disconnected {}: {}", errorCode, message);
eventBus.post(DiscordDisconnected.class, new DiscordDisconnected(errorCode, message)); eventBus.post(DiscordDisconnected.class, new DiscordDisconnected(errorCode, message));
} }
@@ -215,16 +219,19 @@ public class DiscordService implements AutoCloseable
private void joinGame(String joinSecret) private void joinGame(String joinSecret)
{ {
log.debug("Discord join game: {}", joinSecret);
eventBus.post(DiscordJoinGame.class, new DiscordJoinGame(joinSecret)); eventBus.post(DiscordJoinGame.class, new DiscordJoinGame(joinSecret));
} }
private void spectateGame(String spectateSecret) private void spectateGame(String spectateSecret)
{ {
log.debug("Discord spectate game: {}", spectateSecret);
eventBus.post(DiscordSpectateGame.class, new DiscordSpectateGame(spectateSecret)); eventBus.post(DiscordSpectateGame.class, new DiscordSpectateGame(spectateSecret));
} }
private void joinRequest(DiscordUser user) private void joinRequest(DiscordUser user)
{ {
log.debug("Discord join request: {}", user);
eventBus.post(DiscordJoinRequest.class, new DiscordJoinRequest( eventBus.post(DiscordJoinRequest.class, new DiscordJoinRequest(
user.userId, user.userId,
user.username, user.username,
runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+1 -1
View File
@@ -189,7 +189,7 @@ public enum ItemMapping
ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE), ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE),
ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE), ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE),
ITEM_BRYOPHYTAS_STAFF(BRYOPHYTAS_STAFF_UNCHARGED, BRYOPHYTAS_STAFF), ITEM_BRYOPHYTAS_STAFF(BRYOPHYTAS_STAFF_UNCHARGED, BRYOPHYTAS_STAFF),
ITEM_RING_OF_ENDURANCE(RING_OF_ENDURANCE_UNCHARGED, RING_OF_ENDURANCE), ITEM_RING_OF_ENDURANCE(RING_OF_ENDURANCE_UNCHARGED_24844, RING_OF_ENDURANCE),
// Infinity colour kits // Infinity colour kits
ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP), ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP),
runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java
+2 -1
View File
@@ -55,6 +55,7 @@ public class WorldMapOverlay extends Overlay
private static final int TOOLTIP_OFFSET_WIDTH = 5; private static final int TOOLTIP_OFFSET_WIDTH = 5;
private static final int TOOLTIP_PADDING_HEIGHT = 1; private static final int TOOLTIP_PADDING_HEIGHT = 1;
private static final int TOOLTIP_PADDING_WIDTH = 2; private static final int TOOLTIP_PADDING_WIDTH = 2;
private static final int TOOLTIP_TEXT_OFFSET_HEIGHT = -2;
private static final Splitter TOOLTIP_SPLITTER = Splitter.on("<br>").trimResults().omitEmptyStrings(); private static final Splitter TOOLTIP_SPLITTER = Splitter.on("<br>").trimResults().omitEmptyStrings();
@@ -290,7 +291,7 @@ public class WorldMapOverlay extends Overlay
graphics.setColor(JagexColors.TOOLTIP_TEXT); graphics.setColor(JagexColors.TOOLTIP_TEXT);
for (int i = 0; i < rows.size(); i++) for (int i = 0; i < rows.size(); i++)
{ {
graphics.drawString(rows.get(i), drawPoint.getX(), drawPoint.getY() + (i + 1) * height); graphics.drawString(rows.get(i), drawPoint.getX(), drawPoint.getY() + TOOLTIP_TEXT_OFFSET_HEIGHT + (i + 1) * height);
} }
} }
runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
+9 -5
View File
@@ -65,7 +65,7 @@ public class PartyService
private UUID localPartyId = UUID.randomUUID(); private UUID localPartyId = UUID.randomUUID();
@Getter @Getter
private UUID partyId = localPartyId; private UUID partyId;
@Setter @Setter
private String username; private String username;
@@ -97,7 +97,6 @@ public class PartyService
if (partyId == null) if (partyId == null)
{ {
localPartyId = UUID.randomUUID(); // cycle local party id so that a new party is created now localPartyId = UUID.randomUUID(); // cycle local party id so that a new party is created now
partyId = localPartyId;
// close the websocket if the session id isn't for an account // close the websocket if the session id isn't for an account
if (sessionManager.getAccountSession() == null) if (sessionManager.getAccountSession() == null)
@@ -122,7 +121,7 @@ public class PartyService
wsClient.send(new Join(partyId, username)); wsClient.send(new Join(partyId, username));
} }
private void onUserJoin(final UserJoin message) public void onUserJoin(final UserJoin message)
{ {
if (!partyId.equals(message.getPartyId())) if (!partyId.equals(message.getPartyId()))
{ {
@@ -206,8 +205,13 @@ public class PartyService
return Collections.unmodifiableList(members); return Collections.unmodifiableList(members);
} }
public boolean isOwner() public boolean isInParty()
{ {
return partyId == null || localPartyId.equals(partyId); return partyId != null;
}
public boolean isPartyOwner()
{
return localPartyId.equals(partyId);
} }
} }
runelite-client/src/main/resources/item_variations.json
+67 -49
View File
@@ -3719,37 +3719,6 @@
4253, 4253,
4254 4254
], ],
"bonemeal": [
4255,
4256,
4257,
4258,
4259,
4260,
4261,
4262,
4263,
4264,
4265,
4266,
4267,
4268,
4269,
4270,
4271,
4852,
4853,
4854,
4855,
5615,
6728,
6810,
11922,
22116,
22754,
22756,
22758
],
"map scrap": [ "map scrap": [
4274, 4274,
4275, 4275,
@@ -5814,11 +5783,15 @@
], ],
"wooden bed": [ "wooden bed": [
8031, 8031,
8576 8576,
24918,
24922
], ],
"oak bed": [ "oak bed": [
8032, 8032,
8578 8578,
24919,
24923
], ],
"large oak bed": [ "large oak bed": [
8033, 8033,
@@ -5826,7 +5799,9 @@
], ],
"teak bed": [ "teak bed": [
8034, 8034,
8582 8582,
24920,
24924
], ],
"large teak bed": [ "large teak bed": [
8035, 8035,
@@ -5843,7 +5818,8 @@
"oak wardrobe": [ "oak wardrobe": [
8040, 8040,
8614, 8614,
9829 9829,
24907
], ],
"teak drawers": [ "teak drawers": [
8041, 8041,
@@ -5852,12 +5828,14 @@
"teak wardrobe": [ "teak wardrobe": [
8042, 8042,
8618, 8618,
9831 9831,
24908
], ],
"mahogany wardrobe": [ "mahogany wardrobe": [
8043, 8043,
8620, 8620,
9833 9833,
24909
], ],
"gilded wardrobe": [ "gilded wardrobe": [
8044, 8044,
@@ -5874,11 +5852,13 @@
], ],
"oak dresser": [ "oak dresser": [
8047, 8047,
8600 8600,
24911
], ],
"teak dresser": [ "teak dresser": [
8048, 8048,
8602 8602,
24912
], ],
"fancy teak dresser": [ "fancy teak dresser": [
8049, 8049,
@@ -5886,7 +5866,8 @@
], ],
"mahogany dresser": [ "mahogany dresser": [
8050, 8050,
8606 8606,
24913
], ],
"gilded dresser": [ "gilded dresser": [
8051, 8051,
@@ -5946,7 +5927,10 @@
], ],
"teak table": [ "teak table": [
8118, 8118,
8554 8554,
24888,
24892,
24896
], ],
"carved teak table": [ "carved teak table": [
8119, 8119,
@@ -5954,7 +5938,10 @@
], ],
"mahogany table": [ "mahogany table": [
8120, 8120,
8558 8558,
24889,
24893,
24897
], ],
"opulent table": [ "opulent table": [
8121, 8121,
@@ -6004,15 +5991,18 @@
"wooden shelves": [ "wooden shelves": [
8223, 8223,
8224, 8224,
8225 8225,
24914
], ],
"oak shelves": [ "oak shelves": [
8226, 8226,
8227 8227,
24915
], ],
"teak shelves": [ "teak shelves": [
8228, 8228,
8229 8229,
24916
], ],
"beer barrel": [ "beer barrel": [
8239, 8239,
@@ -6065,7 +6055,9 @@
], ],
"wooden chair": [ "wooden chair": [
8310, 8310,
8498 8498,
20605,
24930
], ],
"rocking chair": [ "rocking chair": [
8311, 8311,
@@ -6073,7 +6065,8 @@
], ],
"oak chair": [ "oak chair": [
8312, 8312,
8502 8502,
24931
], ],
"oak armchair": [ "oak armchair": [
8313, 8313,
@@ -6087,13 +6080,19 @@
8315, 8315,
8508 8508
], ],
"wooden bookcase": [
8319,
24902
],
"oak bookcase": [ "oak bookcase": [
8320, 8320,
8512 8512,
24903
], ],
"mahogany bookcase": [ "mahogany bookcase": [
8321, 8321,
8514 8514,
24905
], ],
"oak lectern": [ "oak lectern": [
8334, 8334,
@@ -8726,6 +8725,12 @@
20536, 20536,
23416 23416
], ],
"wooden table": [
20601,
24886,
24890,
24894
],
"dark altar": [ "dark altar": [
20619, 20619,
22778 22778
@@ -8774,6 +8779,10 @@
20701, 20701,
20702 20702
], ],
"supply crate": [
20703,
24884
],
"tome of fire": [ "tome of fire": [
20714, 20714,
20716 20716
@@ -9873,5 +9882,14 @@
24808, 24808,
24824, 24824,
24840 24840
],
"oak table": [
24887,
24891,
24895
],
"mahogany bed": [
24921,
24925
] ]
} }
runelite-client/src/main/scripts/ChatBuilder.hash
+1 -1
View File
@@ -1 +1 @@
0622D1B98983E9C4CB40422AF9C1C7E5C37978B5748B73F8E2A317D100B95E9B E5BD8C9AD501548FDE7AA21B76E6186E5E2B30B7824959D09E517989EFE30687
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+51 -81
View File
@@ -167,12 +167,12 @@ LABEL153:
iload 9 iload 9
iconst -1 iconst -1
if_icmpne LABEL157 if_icmpne LABEL157
jump LABEL714 jump LABEL689
LABEL157: LABEL157:
iload 8 iload 8
iconst -1 iconst -1
if_icmpne LABEL161 if_icmpne LABEL161
jump LABEL714 jump LABEL689
LABEL161: LABEL161:
iload 9 iload 9
chat_gethistory_byuid chat_gethistory_byuid
@@ -188,7 +188,7 @@ LABEL161:
invoke 193 invoke 193
iconst 1 iconst 1
if_icmpeq CHAT_FILTER if_icmpeq CHAT_FILTER
jump LABEL710 jump LABEL685
CHAT_FILTER: CHAT_FILTER:
sload 11 ; Load the message sload 11 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked iconst 1 ; Gets changed to 0 if message is blocked
@@ -201,7 +201,7 @@ CHAT_FILTER:
iconst 1 ; 2nd half of conditional iconst 1 ; 2nd half of conditional
sstore 11 ; Override the message with our filtered message sstore 11 ; Override the message with our filtered message
if_icmpeq LABEL176 ; Check if we are building this message if_icmpeq LABEL176 ; Check if we are building this message
jump LABEL710 ; continue to next message, skipping this jump LABEL685 ; continue to next message, skipping this
LABEL176: LABEL176:
iload 10 iload 10
sload 9 sload 9
@@ -213,7 +213,7 @@ LABEL176:
invoke 90 invoke 90
iconst 1 iconst 1
if_icmpeq LABEL187 if_icmpeq LABEL187
jump LABEL710 jump LABEL685
LABEL187: LABEL187:
iload 10 iload 10
switch switch
@@ -565,7 +565,7 @@ LABEL445:
14: LABEL599 14: LABEL599
90: LABEL450 90: LABEL450
91: LABEL450 91: LABEL450
jump LABEL684 jump LABEL659
LABEL450: LABEL450:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
@@ -639,7 +639,7 @@ LABEL510:
iload 8 iload 8
if_setop if_setop
LABEL514: LABEL514:
jump LABEL696 jump LABEL671
LABEL515: LABEL515:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
@@ -685,7 +685,7 @@ LABEL548:
iload 8 iload 8
if_setop if_setop
LABEL556: LABEL556:
jump LABEL696 jump LABEL671
LABEL557: LABEL557:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
@@ -731,38 +731,19 @@ LABEL590:
iload 8 iload 8
if_setop if_setop
LABEL598: LABEL598:
jump LABEL696 jump LABEL671
LABEL599: LABEL599:
sload 12 sload 12
string_length string_length
iconst 0 iconst 0
if_icmpgt LABEL604 if_icmpgt LABEL604
jump LABEL658 jump LABEL633
LABEL604: LABEL604:
iload 12 iload 12
iconst -1 iconst -1
if_icmpne LABEL608 if_icmpne LABEL608
jump LABEL658 jump LABEL633
LABEL608: LABEL608:
iconst 105
iconst 49
iconst 2761
iload 12
enum
istore 13
clienttype
iconst 3
if_icmpne LABEL618
jump LABEL620
LABEL618:
iconst 0
istore 13
LABEL620:
iload 13
iconst 0
if_icmpeq LABEL624
jump LABEL649
LABEL624:
iconst 6 iconst 6
sconst "Open" sconst "Open"
iload 8 iload 8
@@ -787,8 +768,8 @@ LABEL624:
sconst "Iii" sconst "Iii"
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
jump LABEL657 jump LABEL641
LABEL649: LABEL633:
iconst -1 iconst -1
sconst "" sconst ""
iload 8 iload 8
@@ -797,18 +778,7 @@ LABEL649:
sconst "" sconst ""
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
LABEL657: LABEL641:
jump LABEL666
LABEL658:
iconst -1
sconst ""
iload 8
if_setonmouserepeat
iconst -1
sconst ""
iload 8
if_setonmouseleave
LABEL666:
iconst 9 iconst 9
sconst "Clear history" sconst "Clear history"
iload 8 iload 8
@@ -826,8 +796,8 @@ LABEL666:
sconst "isi" sconst "isi"
iload 8 iload 8
if_setonop if_setonop
jump LABEL696 jump LABEL671
LABEL684: LABEL659:
iconst -1 iconst -1
sconst "" sconst ""
iload 8 iload 8
@@ -840,7 +810,7 @@ LABEL684:
sconst "" sconst ""
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
LABEL696: LABEL671:
iload 5 iload 5
iload 6 iload 6
sub sub
@@ -855,20 +825,20 @@ LABEL696:
iload 7 iload 7
enum enum
istore 8 istore 8
LABEL710: LABEL685:
iload 9 iload 9
chat_getprevuid chat_getprevuid
istore 9 istore 9
jump LABEL153 jump LABEL153
LABEL714: LABEL689:
iload 7 iload 7
istore 15 istore 15
LABEL716: LABEL691:
iload 8 iload 8
iconst -1 iconst -1
if_icmpne LABEL720 if_icmpne LABEL695
jump LABEL777 jump LABEL752
LABEL720: LABEL695:
iload 8 iload 8
if_clearops if_clearops
iconst -1 iconst -1
@@ -895,14 +865,14 @@ LABEL720:
multiply multiply
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL748 if_icmpeq LABEL723
jump LABEL752 jump LABEL727
LABEL748: LABEL723:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL752: LABEL727:
iconst 10616891 iconst 10616891
iload 7 iload 7
iconst 2 iconst 2
@@ -911,14 +881,14 @@ LABEL752:
add add
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL762 if_icmpeq LABEL737
jump LABEL766 jump LABEL741
LABEL762: LABEL737:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL766: LABEL741:
iload 7 iload 7
iconst 1 iconst 1
add add
@@ -929,8 +899,8 @@ LABEL766:
iload 7 iload 7
enum enum
istore 8 istore 8
jump LABEL716 jump LABEL691
LABEL777: LABEL752:
iload 5 iload 5
iconst 2 iconst 2
sub sub
@@ -944,20 +914,20 @@ LABEL777:
istore 16 istore 16
iload 5 iload 5
iload 16 iload 16
if_icmpgt LABEL792 if_icmpgt LABEL767
jump LABEL794 jump LABEL769
LABEL792: LABEL767:
iload 5 iload 5
istore 16 istore 16
LABEL794: LABEL769:
iload 15 iload 15
istore 7 istore 7
LABEL796: LABEL771:
iload 7 iload 7
iconst 0 iconst 0
if_icmpgt LABEL800 if_icmpgt LABEL775
jump LABEL853 jump LABEL828
LABEL800: LABEL775:
iload 7 iload 7
iconst 1 iconst 1
sub sub
@@ -988,15 +958,15 @@ LABEL800:
multiply multiply
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL832 if_icmpeq LABEL807
jump LABEL837 jump LABEL812
LABEL832: LABEL807:
cc_getx cc_getx
iload 5 iload 5
iconst 0 iconst 0
iconst 0 iconst 0
cc_setposition cc_setposition
LABEL837: LABEL812:
iconst 10616891 iconst 10616891
iload 7 iload 7
iconst 2 iconst 2
@@ -1005,17 +975,17 @@ LABEL837:
add add
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL847 if_icmpeq LABEL822
jump LABEL852 jump LABEL827
LABEL847: LABEL822:
cc_getx cc_getx
iload 5 iload 5
iconst 0 iconst 0
iconst 0 iconst 0
cc_setposition cc_setposition
LABEL852: LABEL827:
jump LABEL796 jump LABEL771
LABEL853: LABEL828:
iconst 0 iconst 0
iload 16 iload 16
iconst 10616891 iconst 10616891
runelite-client/src/main/scripts/ChatSplitBuilder.hash
+1 -1
View File
@@ -1 +1 @@
85382CB95B13EA567E72410A58D18DAD6754D3361E584DFF0A1E417989E8214C C8549F688E1AEF9A485BFA552D7FEA8E0C9FDFAC006A879883320FFD82F5786B
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+88 -110
View File
@@ -190,20 +190,20 @@ LABEL156:
get_varc_int 55 get_varc_int 55
get_varc_int 202 get_varc_int 202
if_icmpge LABEL176 if_icmpge LABEL176
jump LABEL317 jump LABEL299
LABEL176: LABEL176:
get_varc_int 55 get_varc_int 55
clientclock clientclock
iconst 3000 iconst 3000
sub sub
if_icmpgt LABEL182 if_icmpgt LABEL182
jump LABEL317 jump LABEL299
LABEL182: LABEL182:
iconst 14 iconst 14
chat_gethistorylength chat_gethistorylength
iconst 0 iconst 0
if_icmpgt LABEL187 if_icmpgt LABEL187
jump LABEL317 jump LABEL299
LABEL187: LABEL187:
iconst 14 iconst 14
iconst 0 iconst 0
@@ -217,13 +217,21 @@ LABEL187:
iload 12 iload 12
iconst -1 iconst -1
if_icmpne LABEL200 if_icmpne LABEL200
jump LABEL317 jump LABEL299
LABEL200: LABEL200:
sload 0 sload 0
invoke 2066 invoke 2066
istore 15 istore 15
sstore 3 sstore 3
sstore 0 sstore 0
iload 15
iconst 4
if_icmpne LABEL212
reboottimer
iconst 0
if_icmple LABEL212
jump LABEL299
LABEL212:
iload 7 iload 7
sload 0 sload 0
iload 9 iload 9
@@ -245,33 +253,14 @@ LABEL200:
sload 3 sload 3
string_length string_length
iconst 0 iconst 0
if_icmpgt LABEL228 if_icmpgt LABEL235
jump LABEL282 jump LABEL264
LABEL228: LABEL235:
iload 15 iload 15
iconst -1 iconst -1
if_icmpne LABEL232 if_icmpne LABEL239
jump LABEL282 jump LABEL264
LABEL232: LABEL239:
iconst 105
iconst 49
iconst 2761
iload 15
enum
istore 16
clienttype
iconst 3
if_icmpne LABEL242
jump LABEL244
LABEL242:
iconst 0
istore 16
LABEL244:
iload 16
iconst 0
if_icmpeq LABEL248
jump LABEL273
LABEL248:
iconst 6 iconst 6
sconst "Open" sconst "Open"
iload 10 iload 10
@@ -296,8 +285,8 @@ LABEL248:
sconst "Iii" sconst "Iii"
iload 10 iload 10
if_setonmouseleave if_setonmouseleave
jump LABEL281 jump LABEL272
LABEL273: LABEL264:
iconst -1 iconst -1
sconst "" sconst ""
iload 10 iload 10
@@ -306,18 +295,7 @@ LABEL273:
sconst "" sconst ""
iload 10 iload 10
if_setonmouseleave if_setonmouseleave
LABEL281: LABEL272:
jump LABEL290
LABEL282:
iconst -1
sconst ""
iload 10
if_setonmouserepeat
iconst -1
sconst ""
iload 10
if_setonmouseleave
LABEL290:
iconst 9 iconst 9
sconst "Clear history" sconst "Clear history"
iload 10 iload 10
@@ -345,41 +323,41 @@ LABEL290:
iload 9 iload 9
enum enum
istore 10 istore 10
LABEL317: LABEL299:
iload 0 iload 0
istore 12 istore 12
iconst 0 iconst 0
istore 17 istore 17
get_varp 287 get_varp 287
iconst 1 iconst 1
if_icmpeq LABEL325 if_icmpeq LABEL307
jump LABEL514 jump LABEL496
LABEL325: LABEL307:
get_varc_int 41 get_varc_int 41
iconst 1337 iconst 1337
if_icmpne LABEL332 if_icmpne LABEL314
get_varbit 4089 get_varbit 4089
iconst 0 iconst 0
if_icmpeq LABEL332 if_icmpeq LABEL314
jump LABEL514 jump LABEL496
LABEL332: LABEL314:
iload 12 iload 12
iconst -1 iconst -1
if_icmpne LABEL336 if_icmpne LABEL318
jump LABEL514 jump LABEL496
LABEL336: LABEL318:
iload 10 iload 10
iconst -1 iconst -1
if_icmpne LABEL340 if_icmpne LABEL322
jump LABEL514 jump LABEL496
LABEL340: LABEL322:
iload 7 iload 7
iload 4 iload 4
sub sub
iconst 57 iconst 57
if_icmplt LABEL346 if_icmplt LABEL328
jump LABEL514 jump LABEL496
LABEL346: LABEL328:
iload 12 iload 12
chat_gethistory_byuid chat_gethistory_byuid
istore 14 istore 14
@@ -395,7 +373,7 @@ LABEL346:
invoke 91 invoke 91
iconst 1 iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead if_icmpeq CHAT_FILTER ; Jump to our new label instead
jump LABEL510 jump LABEL492
CHAT_FILTER: CHAT_FILTER:
sload 0 ; Load the message sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked iconst 1 ; Gets changed to 0 if message is blocked
@@ -407,16 +385,16 @@ CHAT_FILTER:
pop_int ; Pop the messageType pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL362 ; Check if we are building this message if_icmpeq LABEL344 ; Check if we are building this message
jump LABEL510 jump LABEL492
LABEL362: LABEL344:
iload 17 iload 17
switch switch
3: LABEL365 3: LABEL347
6: LABEL386 6: LABEL368
7: LABEL365 7: LABEL347
jump LABEL407 jump LABEL389
LABEL365: LABEL347:
iload 7 iload 7
iload 12 ; Load the id of the messageNode iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp sconst "" ; Push a container for the timestamp
@@ -444,8 +422,8 @@ LABEL365:
invoke 203 invoke 203
add add
istore 7 istore 7
jump LABEL442 jump LABEL424
LABEL386: LABEL368:
iload 7 iload 7
iload 12 ; Load the id of the messageNode iload 12 ; Load the id of the messageNode
sconst "" ; Push container for the timestamp sconst "" ; Push container for the timestamp
@@ -473,8 +451,8 @@ LABEL386:
invoke 203 invoke 203
add add
istore 7 istore 7
jump LABEL442 jump LABEL424
LABEL407: LABEL389:
iload 7 iload 7
iload 12 ; Load the id of the messageNode iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp sconst "" ; Push a container for the timestamp
@@ -499,14 +477,14 @@ LABEL407:
istore 7 istore 7
iload 17 iload 17
iconst 5 iconst 5
if_icmpeq LABEL427 if_icmpeq LABEL409
jump LABEL442 jump LABEL424
LABEL427: LABEL409:
get_varbit 1627 get_varbit 1627
iconst 0 iconst 0
if_icmpeq LABEL431 if_icmpeq LABEL413
jump LABEL442 jump LABEL424
LABEL431: LABEL413:
iload 13 iload 13
iconst 500 iconst 500
add add
@@ -518,31 +496,31 @@ LABEL431:
sconst "1" sconst "1"
iconst 10616832 iconst 10616832
if_setontimer if_setontimer
LABEL442: LABEL424:
iload 10 iload 10
if_clearops if_clearops
iload 17 iload 17
iconst 3 iconst 3
if_icmpeq LABEL454 if_icmpeq LABEL436
iload 17 iload 17
iconst 6 iconst 6
if_icmpeq LABEL454 if_icmpeq LABEL436
iload 17 iload 17
iconst 7 iconst 7
if_icmpeq LABEL454 if_icmpeq LABEL436
jump LABEL488 jump LABEL470
LABEL454: LABEL436:
iload 14 iload 14
iconst 1 iconst 1
if_icmpeq LABEL458 if_icmpeq LABEL440
jump LABEL463 jump LABEL445
LABEL458: LABEL440:
iconst 8 iconst 8
sconst "Message" sconst "Message"
iload 10 iload 10
if_setop if_setop
jump LABEL471 jump LABEL453
LABEL463: LABEL445:
iconst 8 iconst 8
sconst "Add friend" sconst "Add friend"
iload 10 iload 10
@@ -551,7 +529,7 @@ LABEL463:
sconst "Add ignore" sconst "Add ignore"
iload 10 iload 10
if_setop if_setop
LABEL471: LABEL453:
iconst 10 iconst 10
sconst "Report" sconst "Report"
iload 10 iload 10
@@ -568,13 +546,13 @@ LABEL471:
sconst "is" sconst "is"
iload 10 iload 10
if_setonop if_setonop
jump LABEL492 jump LABEL474
LABEL488: LABEL470:
iconst -1 iconst -1
sconst "" sconst ""
iload 10 iload 10
if_setonop if_setonop
LABEL492: LABEL474:
iconst -1 iconst -1
sconst "" sconst ""
iload 10 iload 10
@@ -593,17 +571,17 @@ LABEL492:
iload 9 iload 9
enum enum
istore 10 istore 10
LABEL510: LABEL492:
iload 12 iload 12
chat_getprevuid chat_getprevuid
istore 12 istore 12
jump LABEL332 jump LABEL314
LABEL514: LABEL496:
iload 10 iload 10
iconst -1 iconst -1
if_icmpne LABEL518 if_icmpne LABEL500
jump LABEL575 jump LABEL557
LABEL518: LABEL500:
iload 10 iload 10
if_clearops if_clearops
iconst -1 iconst -1
@@ -630,14 +608,14 @@ LABEL518:
multiply multiply
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL546 if_icmpeq LABEL528
jump LABEL550 jump LABEL532
LABEL546: LABEL528:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL550: LABEL532:
iconst 10682368 iconst 10682368
iload 9 iload 9
iconst 2 iconst 2
@@ -646,14 +624,14 @@ LABEL550:
add add
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL560 if_icmpeq LABEL542
jump LABEL564 jump LABEL546
LABEL560: LABEL542:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL564: LABEL546:
iload 9 iload 9
iconst 1 iconst 1
add add
@@ -664,6 +642,6 @@ LABEL564:
iload 9 iload 9
enum enum
istore 10 istore 10
jump LABEL514 jump LABEL496
LABEL575: LABEL557:
return return