aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
authorThunderblade73 <85900443+Thunderblade73@users.noreply.github.com>2024-04-13 22:55:53 +0200
committerGitHub <noreply@github.com>2024-04-13 22:55:53 +0200
commit3bcdbbd286404fda21fab87a9b9d193be8338201 (patch)
tree5f4380262309e88801fc76de68537762d15ac54a /src/main/java/at/hannibal2
parent2509b0ea65afee9e5dadb1d9c43e24ea0e95e452 (diff)
downloadskyhanni-3bcdbbd286404fda21fab87a9b9d193be8338201.tar.gz
skyhanni-3bcdbbd286404fda21fab87a9b9d193be8338201.tar.bz2
skyhanni-3bcdbbd286404fda21fab87a9b9d193be8338201.zip
Fix: Item Size in Crop Milestones GUI (#1436)
Co-authored-by: martimavocado <martim.cavaco@tutanota.com> Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
index 3ad21dd0e..ad5dd28dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt
@@ -34,6 +34,7 @@ import at.hannibal2.skyhanni.utils.LorenzRarity
import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.NEUInternalName
+import at.hannibal2.skyhanni.utils.NEUItems
import at.hannibal2.skyhanni.utils.RenderUtils.addItemIcon
import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getCultivatingCounter
import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getHoeCounter
@@ -157,8 +158,12 @@ object GardenAPI {
fun readCounter(itemStack: ItemStack): Long = itemStack.getHoeCounter() ?: itemStack.getCultivatingCounter() ?: -1L
- fun MutableList<Any>.addCropIcon(crop: CropType, highlight: Boolean = false) =
- addItemIcon(crop.icon.copy(), highlight, scale = 1.0)
+ fun MutableList<Any>.addCropIcon(
+ crop: CropType,
+ scale: Double = NEUItems.itemFontSize,
+ highlight: Boolean = false,
+ ) =
+ addItemIcon(crop.icon.copy(), highlight, scale = scale)
fun hideExtraGuis() = ComposterOverlay.inInventory || AnitaMedalProfit.inInventory ||
SkyMartCopperPrice.inInventory || FarmingContestAPI.inInventory || VisitorAPI.inInventory || FFGuideGUI.isInGui()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 6be8da28f..e6f72d38f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -392,7 +392,7 @@ object GardenNextJacobContest {
duration -= contestDuration
}
for (crop in nextContest.crops) {
- list.addCropIcon(crop, highlight = (crop == boostedCrop))
+ list.addCropIcon(crop, 1.0, highlight = (crop == boostedCrop))
nextContestCrops.add(crop)
}
if (!activeContest) {