From 26031387bb9408e20ad9aaf375300a400119e03c Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 27 Sep 2023 19:48:40 +1000
Subject: Feature: Armor drops to $/hr (#427)

Added Armor Drops to Money per Hour display. #427
---
 .../java/at/hannibal2/skyhanni/utils/InventoryUtils.kt |  5 ++---
 .../skyhanni/utils/jsonobjects/ArmorDropsJson.java     | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index 1cd9abdc8..8aefe5a2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -10,7 +10,6 @@ object InventoryUtils {
     var itemInHandId = NEUInternalName.NONE
     var recentItemsInHand = mutableMapOf<Long, NEUInternalName>()
     var latestItemInHand: ItemStack? = null
-
     fun getItemsInOpenChest() = buildList<Slot> {
         val guiChest = Minecraft.getMinecraft().currentScreen as? GuiChest ?: return emptyList<Slot>()
         val inventorySlots = guiChest.inventorySlots.inventorySlots
@@ -40,8 +39,6 @@ object InventoryUtils {
     fun countItemsInLowerInventory(predicate: (ItemStack) -> Boolean) =
         getItemsInOwnInventory().filter { predicate(it) }.sumOf { it.stackSize }
 
-    fun getArmor(): Array<ItemStack?> = Minecraft.getMinecraft().thePlayer.inventory.armorInventory
-
     fun inStorage() =
         openInventoryName().let {
             (it.contains("Storage") && !it.contains("Rift Storage")) || it.contains("Ender Chest") || it.contains(
@@ -50,4 +47,6 @@ object InventoryUtils {
         }
 
     fun getItemInHand(): ItemStack? = Minecraft.getMinecraft().thePlayer.heldItem
+
+    fun getArmor(): Array<ItemStack?> = Minecraft.getMinecraft().thePlayer.inventory.armorInventory
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java
new file mode 100644
index 000000000..5815e54ad
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java
@@ -0,0 +1,18 @@
+package at.hannibal2.skyhanni.utils.jsonobjects;
+
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Map;
+
+public class ArmorDropsJson {
+    @Expose
+    public Map<String, DropInfo> special_crops;
+
+    public static class DropInfo {
+        @Expose
+        public String armor_type;
+        @Expose
+        public List<Double> chance;
+    }
+}
\ No newline at end of file
-- 
cgit