diff options
| author | Luna <me@lunya.dev> | 2024-09-18 16:14:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 00:14:49 +1000 |
| commit | 17f900c1d54ba6007de7e6cf4f62ded5ce0655e3 (patch) | |
| tree | 8059aef8a34489f9cdfb81680fb42cbb836d5e8d | |
| parent | 7b4a810019ad5aab0b689f9294cbde3eaeccb188 (diff) | |
| download | skyhanni-17f900c1d54ba6007de7e6cf4f62ded5ce0655e3.tar.gz skyhanni-17f900c1d54ba6007de7e6cf4f62ded5ce0655e3.tar.bz2 skyhanni-17f900c1d54ba6007de7e6cf4f62ded5ce0655e3.zip | |
Fix: Revert Gauntlet item category change (#2534)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt index 3fb643c7c..987a864af 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt @@ -75,7 +75,7 @@ object ReforgeAPI { fun isValid(itemCategory: ItemCategory?, internalName: NEUInternalName) = when (type) { ReforgeType.SWORD -> setOf( ItemCategory.SWORD, - ItemCategory.PICKAXE_AND_SWORD, + ItemCategory.GAUNTLET, ItemCategory.LONGSWORD, ItemCategory.FISHING_WEAPON, ).contains(itemCategory) @@ -98,7 +98,7 @@ object ReforgeAPI { ReforgeType.PICKAXE -> itemCategory == ItemCategory.PICKAXE || itemCategory == ItemCategory.DRILL || - itemCategory == ItemCategory.PICKAXE_AND_SWORD + itemCategory == ItemCategory.GAUNTLET ReforgeType.EQUIPMENT -> setOf( ItemCategory.CLOAK, @@ -111,7 +111,7 @@ object ReforgeAPI { ReforgeType.ROD -> itemCategory == ItemCategory.FISHING_ROD || itemCategory == ItemCategory.FISHING_WEAPON ReforgeType.SWORD_AND_ROD -> setOf( ItemCategory.SWORD, - ItemCategory.PICKAXE_AND_SWORD, + ItemCategory.GAUNTLET, ItemCategory.LONGSWORD, ItemCategory.FISHING_ROD, ItemCategory.FISHING_WEAPON, diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt index 08272ed08..43961f61d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemCategory.kt @@ -12,7 +12,7 @@ enum class ItemCategory { FISHING_WEAPON, FISHING_ROD, AXE, - PICKAXE_AND_SWORD, + GAUNTLET, HOE, PICKAXE, SHOVEL, @@ -66,7 +66,7 @@ enum class ItemCategory { fun Collection<ItemCategory>.containsItem(stack: ItemStack?) = stack?.getItemCategoryOrNull()?.let { this.contains(it) } ?: false - val miningTools = listOf(PICKAXE, DRILL, PICKAXE_AND_SWORD) + val miningTools = listOf(PICKAXE, DRILL, GAUNTLET) val armor = setOf(HELMET, CHESTPLATE, LEGGINGS, BOOTS) } |