From 86b3ee6a8d4c46ea5db9eada2e8e2d932f65ca4f Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 20 Jan 2019 16:13:56 -0500 Subject: [PATCH] examine service: use item descriptions from item service if available --- .../http/service/examine/ExamineController.java | 13 ++++++++++++- .../net/runelite/http/service/item/ItemEntry.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/examine/ExamineController.java b/http-service/src/main/java/net/runelite/http/service/examine/ExamineController.java index 0bcfee9c8f..c689172e9b 100644 --- a/http-service/src/main/java/net/runelite/http/service/examine/ExamineController.java +++ b/http-service/src/main/java/net/runelite/http/service/examine/ExamineController.java @@ -27,6 +27,8 @@ package net.runelite.http.service.examine; import static net.runelite.http.service.examine.ExamineType.ITEM; import static net.runelite.http.service.examine.ExamineType.NPC; import static net.runelite.http.service.examine.ExamineType.OBJECT; +import net.runelite.http.service.item.ItemEntry; +import net.runelite.http.service.item.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -39,11 +41,13 @@ import org.springframework.web.bind.annotation.RestController; public class ExamineController { private final ExamineService examineService; + private final ItemService itemService; @Autowired - public ExamineController(ExamineService examineService) + public ExamineController(ExamineService examineService, ItemService itemService) { this.examineService = examineService; + this.itemService = itemService; } @RequestMapping("/npc/{id}") @@ -61,6 +65,13 @@ public class ExamineController @RequestMapping("/item/{id}") public String getItem(@PathVariable int id) { + // Tradeable item examine info is available from the Jagex item API + ItemEntry item = itemService.getItem(id); + if (item != null) + { + return item.getDescription(); + } + return examineService.get(ITEM, id); } diff --git a/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java b/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java index 634b2507c0..b92f171cc7 100644 --- a/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java +++ b/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java @@ -30,7 +30,7 @@ import net.runelite.http.api.item.Item; import net.runelite.http.api.item.ItemType; @Data -class ItemEntry +public class ItemEntry { private int id; private String name;