diff options
Diffstat (limited to 'src/main')
4 files changed, 57 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index de4bc0c34..4707bf5eb 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -151,6 +151,7 @@ public class SkyHanniMod { loadModule(new MayorElection()); loadModule(new GardenComposterUpgradesData()); loadModule(new ActionBarStatsData()); + loadModule(new GardenCropMilestoneAverage()); // APIs loadModule(new BazaarApi()); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index 2a6f688bf..5608102eb 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -184,6 +184,12 @@ public class Garden { public boolean numberCropMilestone = true; @Expose + @ConfigOption(name = "Average Milestone", desc = "Show the average crop milestone in the crop milestone inventory.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 5) + public boolean numberAverageCropMilestone = true; + + @Expose @ConfigOption(name = "Crop Upgrades", desc = "Show the number of upgrades in the crop upgrades inventory.") @ConfigEditorBoolean @ConfigAccordionId(id = 5) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneAverage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneAverage.kt new file mode 100644 index 000000000..5faaac281 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneAverage.kt @@ -0,0 +1,45 @@ +package at.hannibal2.skyhanni.features.garden.inventory + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.data.GardenCropMilestones +import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.getCounter +import at.hannibal2.skyhanni.events.CropMilestoneUpdateEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent +import at.hannibal2.skyhanni.features.garden.CropType +import at.hannibal2.skyhanni.utils.LorenzUtils.round +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +class GardenCropMilestoneAverage { + private var average = -1.0 + + @SubscribeEvent + fun onCropMilestoneUpdate(event: CropMilestoneUpdateEvent) { + if (!SkyHanniMod.feature.garden.numberAverageCropMilestone) return + + val tiers = mutableListOf<Double>() + for (cropType in CropType.values()) { + val counter = cropType.getCounter() + val tier = GardenCropMilestones.getTierForCrops(counter) + tiers.add(tier.toDouble()) + } + average = tiers.average().round(2) + } + + @SubscribeEvent + fun onInventoryClose(event: InventoryCloseEvent) { + average = -1.0 + } + + @SubscribeEvent + fun onRenderItemTip(event: RenderInventoryItemTipEvent) { + if (average == -1.0) return + + if (event.slot.slotNumber == 38) { + event.offsetY = -23 + event.offsetX = -50 + event.alignLeft = false + event.stackTip = "§6Average Crop Milestone: §e$average" + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt index c2003186a..0bf7be4da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt @@ -11,6 +11,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNeeded import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class GardenInventoryNumbers { + private val config get() = SkyHanniMod.feature.garden + private var patternTierProgress = "§7Progress to Tier (.*): §e(?:.*)".toPattern() private var patternUpgradeTier = "§7Current Tier: §[ea](.*)§7/§a.*".toPattern() @@ -19,7 +21,7 @@ class GardenInventoryNumbers { if (!GardenAPI.inGarden()) return if (InventoryUtils.openInventoryName() == "Crop Milestones") { - if (!SkyHanniMod.feature.garden.numberCropMilestone) return + if (!config.numberCropMilestone) return event.stack.getLore() .map { patternTierProgress.matcher(it) } @@ -29,7 +31,7 @@ class GardenInventoryNumbers { } if (InventoryUtils.openInventoryName() == "Crop Upgrades") { - if (!SkyHanniMod.feature.garden.numberCropUpgrades) return + if (!config.numberCropUpgrades) return event.stack.getLore() .map { patternUpgradeTier.matcher(it) } @@ -39,7 +41,7 @@ class GardenInventoryNumbers { } if (InventoryUtils.openInventoryName() == "Composter Upgrades") { - if (!SkyHanniMod.feature.garden.numberComposterUpgrades) return + if (!config.numberComposterUpgrades) return event.stack.name?.let { val matcher = ComposterUpgrade.regex.matcher(it) |