From b23a3108322e90b9f6783bdf6e8bc33a74725964 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Fri, 6 Aug 2021 00:19:12 -0600 Subject: [PATCH] itemstats: remove quest field this has always been unused and isn't particularly useful to us anyway --- .../main/java/net/runelite/http/api/item/ItemStats.java | 3 +-- .../client/plugins/itemstats/ItemStatOverlay.java | 2 +- .../client/plugins/itemstats/ItemStatOverlayTest.java | 8 ++++---- .../runelite/client/plugins/prayer/PrayerPluginTest.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java b/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java index 55a1bf76dd..5b86dd336d 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemStats.java @@ -30,7 +30,6 @@ import lombok.Value; @Value public class ItemStats { - private boolean quest; private boolean equipable; private double weight; @SerializedName("ge_limit") @@ -79,7 +78,7 @@ public class ItemStats newEquipment = equipment; } - return new ItemStats(quest, equipable, newWeight, 0, newEquipment); + return new ItemStats(equipable, newWeight, 0, newEquipment); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index ff3922fd92..4465c0b338 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -55,7 +55,7 @@ public class ItemStatOverlay extends Overlay { // Unarmed attack speed is 4 @VisibleForTesting - static final ItemStats UNARMED = new ItemStats(false, true, 0, 0, + static final ItemStats UNARMED = new ItemStats(true, 0, 0, ItemEquipmentStats.builder() .aspeed(4) .build()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java index 3151ff91c1..f9bc39ba80 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java @@ -53,7 +53,7 @@ import org.mockito.junit.MockitoJUnitRunner; public class ItemStatOverlayTest { // Weapon definitions - private static final ItemStats ABYSSAL_DAGGER = new ItemStats(false, true, 0.453, 8, + private static final ItemStats ABYSSAL_DAGGER = new ItemStats(true, 0.453, 8, ItemEquipmentStats.builder() .slot(EquipmentInventorySlot.WEAPON.getSlotIdx()) .isTwoHanded(false) @@ -65,7 +65,7 @@ public class ItemStatOverlayTest .str(75) .aspeed(4) .build()); - private static final ItemStats KATANA = new ItemStats(false, true, 0, 8, + private static final ItemStats KATANA = new ItemStats(true, 0, 8, ItemEquipmentStats.builder() .slot(EquipmentInventorySlot.WEAPON.getSlotIdx()) .isTwoHanded(true) @@ -78,7 +78,7 @@ public class ItemStatOverlayTest .str(40) .aspeed(4) .build()); - private static final ItemStats BLOWPIPE = new ItemStats(false, true, 0, 0, + private static final ItemStats BLOWPIPE = new ItemStats(true, 0, 0, ItemEquipmentStats.builder() .slot(EquipmentInventorySlot.WEAPON.getSlotIdx()) .isTwoHanded(true) @@ -86,7 +86,7 @@ public class ItemStatOverlayTest .rstr(40) .aspeed(3) .build()); - private static final ItemStats HEAVY_BALLISTA = new ItemStats(false, true, 4, 8, + private static final ItemStats HEAVY_BALLISTA = new ItemStats(true, 4, 8, ItemEquipmentStats.builder() .slot(EquipmentInventorySlot.WEAPON.getSlotIdx()) .isTwoHanded(true) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/prayer/PrayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/prayer/PrayerPluginTest.java index c6d001f1a8..db2581bc90 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/prayer/PrayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/prayer/PrayerPluginTest.java @@ -55,7 +55,7 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class PrayerPluginTest { - private static final ItemStats HIGH_PRAYER_BONUS_WEAPON = new ItemStats(false, false, 0, 0, + private static final ItemStats HIGH_PRAYER_BONUS_WEAPON = new ItemStats(false, 0, 0, ItemEquipmentStats.builder() .slot(EquipmentInventorySlot.WEAPON.getSlotIdx()) .prayer(50)