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

examine service: use item descriptions from item service if available

Browse Source
This commit is contained in:
Adam
2019-01-20 16:13:56 -05:00
parent 5389bbe66d
commit 86b3ee6a8d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
http-service/src/main/java/net/runelite/http/service/examine/ExamineController.java
View File

@@ -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.ITEM;
import static net.runelite.http.service.examine.ExamineType.NPC; import static net.runelite.http.service.examine.ExamineType.NPC;
import static net.runelite.http.service.examine.ExamineType.OBJECT; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -39,11 +41,13 @@ import org.springframework.web.bind.annotation.RestController;
public class ExamineController public class ExamineController
{ {
private final ExamineService examineService; private final ExamineService examineService;
private final ItemService itemService;
@Autowired @Autowired
public ExamineController(ExamineService examineService) public ExamineController(ExamineService examineService, ItemService itemService)
{ {
this.examineService = examineService; this.examineService = examineService;
this.itemService = itemService;
} }
@RequestMapping("/npc/{id}") @RequestMapping("/npc/{id}")
@@ -61,6 +65,13 @@ public class ExamineController
@RequestMapping("/item/{id}") @RequestMapping("/item/{id}")
public String getItem(@PathVariable int 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); return examineService.get(ITEM, id);
} }

2
http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
View File

@@ -30,7 +30,7 @@ import net.runelite.http.api.item.Item;
import net.runelite.http.api.item.ItemType; import net.runelite.http.api.item.ItemType;
@Data @Data
class ItemEntry public class ItemEntry
{ {
private int id; private int id;
private String name; private String name;