From 39ab7c63115ec5037c6c4558986074ac7d9212ac Mon Sep 17 00:00:00 2001 From: melkypie <5113962+melkypie@users.noreply.github.com> Date: Thu, 26 Mar 2020 13:13:54 +0200 Subject: [PATCH 01/10] worldmap: update desert amulet nardah teleport location --- .../runelite/client/plugins/worldmap/TeleportLocationData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java index 3be4f571fb..dcd7ddbbe0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java @@ -159,7 +159,7 @@ enum TeleportLocationData EXPLORERS_RING(TeleportType.OTHER, "Explorer's Ring", new WorldPoint(3052, 3292, 0), "explorers_ring_icon.png"), KARAMJA_GLOVES_GEM_MINE(TeleportType.OTHER, "Karamja Gloves", "Gem Mine (Underground)", new WorldPoint(2827, 2997, 0), "karamja_gloves_icon.png"), KARAMJA_GLOVES_DURADEL(TeleportType.OTHER, "Karamja Gloves", "Duradel", new WorldPoint(2870, 2981, 0), "karamja_gloves_icon.png"), - DESERT_AMULET_NARDAH(TeleportType.OTHER, "Desert Amulet", "Nardah", new WorldPoint(3432, 2914, 0), "desert_amulet_icon.png"), + DESERT_AMULET_NARDAH(TeleportType.OTHER, "Desert Amulet", "Nardah", new WorldPoint(3425, 2928, 0), "desert_amulet_icon.png"), DESERT_AMULKT_KALPHITE_CAVE(TeleportType.OTHER, "Desert Amulet", "Kalphite Cave", new WorldPoint(3322, 3122, 0), "desert_amulet_icon.png"), MORYTANIA_LEGS_SLIME_PIT(TeleportType.OTHER, "Morytania Legs", "Slime Pit (Underground)", new WorldPoint(3654, 3516, 0), "morytania_legs_icon.png"), MORYTANIA_LEGS_BURGH_DE_ROTT(TeleportType.OTHER, "Morytania Legs", "Burgh de Rott", new WorldPoint(3482, 3231, 0), "morytania_legs_icon.png"), From 2dcccd18956b46270f1122d8f479454c4b692923 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 26 Mar 2020 11:32:49 +0000 Subject: [PATCH 02/10] Update Item IDs to 2020-03-26-rev182 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 3 +++ runelite-api/src/main/java/net/runelite/api/NullItemID.java | 1 + 2 files changed, 4 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index d21bb9ddaa..026976a94b 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11410,5 +11410,8 @@ public final class ItemID public static final int HELL_CAT_EARS = 24527; public static final int LAMP_OF_THE_GATHERER = 24528; public static final int HARMONY = 24529; + public static final int RUNNER_HAT_BROKEN = 24531; + public static final int RUNNER_HAT_L = 24533; + public static final int MITHRIL_SEEDS_24534 = 24534; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index bf0dfd5bce..ca9521d21a 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12910,5 +12910,6 @@ public final class NullItemID 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; /* This file is automatically generated. Do not edit. */ } From 8dbd5897577bdf78bcf8dccb53d53301b915d903 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 26 Mar 2020 11:32:49 +0000 Subject: [PATCH 03/10] Update Item variations to 2020-03-26-rev182 --- runelite-client/src/main/resources/item_variations.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index b16e46af61..581da0850c 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -242,6 +242,10 @@ 296, 297 ], + "mithril seeds": [ + 299, + 24534 + ], "small fishing net": [ 303, 6209 @@ -7034,6 +7038,11 @@ 20507, 24173 ], + "runner hat": [ + 10549, + 24531, + 24533 + ], "ranger hat": [ 10550, 20509, From ceee89a3fd2c218858b9637ac64d88549d6e82d1 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 26 Mar 2020 11:32:50 +0000 Subject: [PATCH 04/10] Update NPC IDs to 2020-03-26-rev182 --- runelite-api/src/main/java/net/runelite/api/NpcID.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 6326854857..1520245928 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -5382,7 +5382,7 @@ public final class NpcID public static final int MASTER_FARMER_5731 = 5731; public static final int MARKET_GUARD_5732 = 5732; public static final int ELNOCK_INQUISITOR = 5734; - public static final int IMPLING = 5735; + public static final int IMMENIZZ = 5735; public static final int FAIRY_AERYKA = 5736; public static final int WANDERING_IMPLING = 5737; public static final int IMP_DEFENDER = 5738; @@ -5993,7 +5993,6 @@ public final class NpcID public static final int SISTER_SCAROPHIA = 6590; public static final int LAVA_DRAGON = 6593; public static final int ENT = 6594; - public static final int ENT_TRUNK = 6595; public static final int ZOMBIE_6596 = 6596; public static final int ZOMBIE_6597 = 6597; public static final int ZOMBIE_6598 = 6598; @@ -8482,5 +8481,6 @@ public final class NpcID public static final int SLEEPWALKER_9470 = 9470; public static final int SISTER_SENGA = 9471; public static final int SISTER_SENGA_9472 = 9472; + public static final int ENT_TRUNK = 9474; /* This file is automatically generated. Do not edit. */ } From 873a5bd5f1a4681ed2c4a3e333854aedc71e42c2 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 26 Mar 2020 11:40:03 +0000 Subject: [PATCH 05/10] Update 189 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed2af76b40..930b9540e5 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ true - 188 + 189 From 97d5dadbbaf2efb04bdf4be6ef437f629726cab5 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 26 Mar 2020 12:24:10 +0000 Subject: [PATCH 06/10] Release 1.6.10 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 7704cc1604..f2b7c897a4 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 9c9847557d..3875e7f321 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 1c3caf8802..3587ecd4ff 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 6aee0ecc98..74f8a88dea 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 98c70e6c50..9407840d4e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 Web Service diff --git a/pom.xml b/pom.xml index 930b9540e5..bfc4ed530c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 pom RuneLite @@ -60,7 +60,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.6.10 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 6b77242ec7..ad8920ef98 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index d9bd9b259e..94342b9f24 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 626201cd7b..6ce865f9cc 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10-SNAPSHOT + 1.6.10 script-assembler-plugin From 09c5a1d95112944d8a01a002227856f58710fefc Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 26 Mar 2020 12:24:21 +0000 Subject: [PATCH 07/10] Bump for 1.6.11-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index f2b7c897a4..9aa44eb21b 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 3875e7f321..1fc8c9fc5a 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 3587ecd4ff..2f0f45d072 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 74f8a88dea..e4942148e6 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 9407840d4e..73aa4a7a68 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index bfc4ed530c..b9fdc19d32 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT pom RuneLite @@ -60,7 +60,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.6.10 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index ad8920ef98..73e90207ce 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 94342b9f24..34a5d79902 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 6ce865f9cc..e7d59da776 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.10 + 1.6.11-SNAPSHOT script-assembler-plugin From b0a7e779be960491ccb68d5dee9d66935c0c99d1 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 26 Mar 2020 10:42:54 -0400 Subject: [PATCH 08/10] world controller: return service unavailable if world list isn't loaded --- .../runelite/http/service/worlds/WorldController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java index 537e252b96..a0c71af52c 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import net.runelite.http.api.worlds.WorldResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.GetMapping; @@ -45,8 +46,15 @@ public class WorldController private WorldResult worldResult; @GetMapping - public ResponseEntity listWorlds() throws IOException + public ResponseEntity listWorlds() { + if (worldResult == null) + { + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE) + .cacheControl(CacheControl.noCache()) + .build(); + } + return ResponseEntity.ok() .cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic()) .body(worldResult); From e03cc3c19db22c3530fc9315d4e4a9779349704f Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 26 Mar 2020 10:43:17 -0400 Subject: [PATCH 09/10] feed controller: return service unavailable if feed isn't loaded --- .../java/net/runelite/http/service/feed/FeedController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java b/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java index 66bd8582ce..a35a582d1e 100644 --- a/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java +++ b/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java @@ -38,6 +38,7 @@ import net.runelite.http.service.feed.osrsnews.OSRSNewsService; import net.runelite.http.service.feed.twitter.TwitterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.GetMapping; @@ -122,7 +123,8 @@ public class FeedController { if (memoizedFeed == null) { - return ResponseEntity.notFound() + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE) + .cacheControl(CacheControl.noCache()) .build(); } From 18a9a60b7d3b9bcfa55e89f364986628aefd020a Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 26 Mar 2020 10:43:27 -0400 Subject: [PATCH 10/10] client session manager: fix detecting logged in state --- .../main/java/net/runelite/client/ClientSessionManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java index 0741f31231..7b19f36d62 100644 --- a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java @@ -108,7 +108,8 @@ public class ClientSessionManager boolean loggedIn = false; if (client != null) { - loggedIn = client.getGameState() != GameState.LOGIN_SCREEN; + GameState gameState = client.getGameState(); + loggedIn = gameState.getState() >= GameState.LOADING.getState(); } try