Implement Item#getHeldByPokemon, Item#getSprite, Pokemon#getHeldItems

Author: iamgio

src/main/java/eu/iamgio/pokedex/item/Item.java

@@ -61,9 +61,15 @@ public class Item {
      */
     private ItemCategory category;
 
-    //TODO sprites
+    /**
+     * The sprite used to depict this item in the game
+     */
+    private String sprite;
 
-    //TODO heldByPokemon
+    /**
+     * A list of Pokémon that might be found in the wild holding this item
+     */
+    private List<ItemHold> heldByPokemon;
 
     //TODO babyTriggerFor
 
@@ -128,6 +134,8 @@ public static Item fromName(String name) throws PokedexException {
                 flingEffect.isJsonNull() ? null :
                         ItemFlingEffect.valueOf(new NamedResource(flingEffect).toEnumName()),
                 ItemCategory.valueOf(new NamedResource(json.get("category")).toEnumName()),
+                json.getAsJsonObject("sprites").get("default").getAsString(),
+                ItemHold.fromJson(json.getAsJsonArray("held_by_pokemon"), false),
                 gameIndices,
                 machines,
                 new LocalizedNames(json.getAsJsonArray("names"), "name"),

src/main/java/eu/iamgio/pokedex/item/ItemHold.java

@@ -0,0 +1,54 @@
+package eu.iamgio.pokedex.item;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import eu.iamgio.pokedex.util.JsonStream;
+import eu.iamgio.pokedex.util.NamedResource;
+import eu.iamgio.pokedex.version.Version;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Pokémon that might be found in the wild holding a specific item.
+ * @author Gio
+ */
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ItemHold {
+
+    /**
+     * Name of the Pokémon that holds this item or the item the referenced Pokémon holds
+     */
+    private String name;
+
+    /**
+     * How often the Pokémon holds this item in every version
+     */
+    private Map<Version, Integer> versionDetails;
+
+    /**
+     * @param json JSON containing data
+     * @return Parsed JSON into {@link ItemHold}
+     */
+    public static List<ItemHold> fromJson(JsonArray json, boolean ofPokemon) {
+        return new JsonStream(json)
+                .stream()
+                .map(JsonElement::getAsJsonObject)
+                .map(holder -> new ItemHold(
+                        new NamedResource(holder.get(ofPokemon ? "item" : "pokemon")).getName(),
+                        new JsonStream(holder.getAsJsonArray("version_details"))
+                                .stream()
+                                .map(JsonElement::getAsJsonObject)
+                                .collect(Collectors.toMap(
+                                        detail -> Version.valueOf(new NamedResource(detail.get("version")).toEnumName()),
+                                        detail -> detail.get("rarity").getAsInt()
+                                ))
+                ))
+                .collect(Collectors.toList());
+    }
+}

src/main/java/eu/iamgio/pokedex/pokemon/Pokemon.java

@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 import eu.iamgio.pokedex.connection.HttpConnection;
 import eu.iamgio.pokedex.exception.PokedexException;
+import eu.iamgio.pokedex.item.ItemHold;
 import eu.iamgio.pokedex.pokemon.move.PokemonPersonalMove;
 import eu.iamgio.pokedex.util.JsonStream;
 import eu.iamgio.pokedex.util.NamedResource;
@@ -62,6 +63,11 @@ public class Pokemon {
      */
     private Pair<PokemonType, PokemonType> types;
 
+    /**
+     * A list of items this Pokémon may be holding when encountered
+     */
+    private List<ItemHold> heldItems;
+
     /**
      * A list of game indices relevent to Pokémon item by generation
      */
@@ -164,6 +170,7 @@ public static Pokemon fromName(String name) throws PokedexException {
                 json.get("weight").getAsInt(),
                 json.get("base_experience").getAsInt(),
                 new Pair<>(types.get(0), types.size() > 1 ? types.get(1) : null),
+                ItemHold.fromJson(json.getAsJsonArray("held_items"), true),
                 new JsonStream(json.getAsJsonArray("game_indices"))
                         .stream()
                         .map(JsonElement::getAsJsonObject)

src/test/java/eu/iamgio/pokedex/Tests.java

@@ -1,8 +1,6 @@
 package eu.iamgio.pokedex;
 
-import eu.iamgio.pokedex.item.Item;
-import eu.iamgio.pokedex.item.ItemAttribute;
-import eu.iamgio.pokedex.item.ItemCategory;
+import eu.iamgio.pokedex.item.*;
 import eu.iamgio.pokedex.lang.Language;
 import eu.iamgio.pokedex.location.PalParkArea;
 import eu.iamgio.pokedex.machines.Machine;
@@ -34,6 +32,7 @@ void testBulbasaur() {
         assertEquals(69, bulbasaur.getWeight());
         assertEquals(64, bulbasaur.getBaseExperience());
         assertEquals(new Pair<>(PokemonType.GRASS, PokemonType.POISON), bulbasaur.getTypes());
+        assertEquals(0, bulbasaur.getHeldItems().size());
         assertEquals(153, bulbasaur.getGameIndices().get(Version.YELLOW).intValue());
         assertEquals("bulbasaur", bulbasaur.getSpeciesName());
         assertEquals("https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/1.png",
@@ -46,6 +45,14 @@ void testBulbasaur() {
         assertEquals(45, bulbasaur.getStat(Stat.Type.SPEED).getBaseStat());
     }
 
+    @Test
+    void testChanseyHeldItems() {
+        Pokemon chansey = Pokemon.fromName("chansey");
+        ItemHold holder = chansey.getHeldItems().get(0);
+        assertEquals("oval-stone", holder.getName());
+        assertEquals(50, holder.getVersionDetails().get(Version.PEARL).intValue());
+    }
+
     @Test
     void testLevitate() {
         PokemonAbility levitate = PokemonAbility.fromName("levitate");
@@ -169,10 +176,21 @@ void testMasterBall() {
         assertEquals(null, item.getFlingPower());
         assertEquals(null, item.getFlingEffect());
         assertEquals(ItemCategory.STANDARD_BALLS, item.getCategory());
+        assertEquals("https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/items/master-ball.png",
+                item.getSprite());
         assertEquals(1, item.getGameIndices().get(Generation.SUN_MOON).intValue());
         assertEquals(0, item.getMachines().size());
         assertEquals("Master Ball", item.getLocalizedNames().get(Language.ENGLISH).getName());
         assertEquals("The best BALL that\ncatches a POKéMON\nwithout fail.",
                 item.getFlavors().filterVersion(VersionGroup.RUBY_SAPPHIRE).get(Language.ENGLISH).getName());
+        assertEquals(0, item.getHeldByPokemon().size());
+    }
+
+    @Test
+    void testOvalStoneHolders() {
+        Item item = Item.fromName("oval-stone");
+        ItemHold holder = item.getHeldByPokemon().get(0);
+        assertEquals("chansey", holder.getName());
+        assertEquals(50, holder.getVersionDetails().get(Version.PEARL).intValue());
     }
 }