From 0303c7985ab1232182abed3c8f635679a6ac6531 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 15 Oct 2023 13:59:18 +0200 Subject: code cleanup --- .../skyhanni/features/garden/AnitaMedalProfit.kt | 2 +- .../features/garden/FarmingFortuneDisplay.kt | 2 +- .../skyhanni/features/garden/GardenLevelDisplay.kt | 2 +- .../features/garden/GardenNextJacobContest.kt | 2 +- .../skyhanni/features/garden/GardenOptimalSpeed.kt | 32 +++++++++++----------- .../skyhanni/features/garden/ToolTooltipTweaks.kt | 8 +++--- .../features/garden/composter/ComposterDisplay.kt | 2 +- .../garden/composter/ComposterInventoryNumbers.kt | 2 +- .../features/garden/composter/ComposterOverlay.kt | 2 +- .../composter/GardenComposterInventoryFeatures.kt | 2 +- .../contest/JacobFarmingContestsInventory.kt | 12 ++++---- .../features/garden/farming/CropMoneyDisplay.kt | 2 +- .../features/garden/farming/DicerRngDropCounter.kt | 2 +- .../features/garden/farming/FarmingArmorDrops.kt | 8 +++--- .../garden/farming/FarmingWeightDisplay.kt | 16 +++++------ .../features/garden/farming/GardenBestCropTime.kt | 2 +- .../garden/farming/GardenCropMilestoneDisplay.kt | 18 ++++++------ .../features/garden/farming/GardenCropSpeed.kt | 2 +- .../garden/farming/GardenCustomKeybinds.kt | 2 +- .../garden/inventory/AnitaExtraFarmingFortune.kt | 4 +-- .../inventory/GardenCropMilestoneInventory.kt | 4 +-- .../garden/inventory/GardenInventoryNumbers.kt | 8 +++--- .../garden/inventory/SkyMartCopperPrice.kt | 2 +- .../garden/visitor/GardenVisitorDropStatistics.kt | 2 +- 24 files changed, 70 insertions(+), 70 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index dca61807d..b0d0013a1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -149,7 +149,7 @@ class AnitaMedalProfit { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3,"garden.anitaMedalProfitEnabled", "garden.anitaShop.medalProfitEnabled") event.move(3,"garden.anitaMedalProfitPos", "garden.anitaShop.medalProfitPos") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt index 789c0f352..74defe1ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -284,7 +284,7 @@ class FarmingFortuneDisplay { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3,"garden.farmingFortuneDisplay", "garden.farmingFortunes.display") event.move(3,"garden.farmingFortuneDropMultiplier", "garden.farmingFortunes.dropMultiplier") event.move(3,"garden.farmingFortunePos", "garden.farmingFortunes.pos") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt index c10292032..dfb66bb82 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt @@ -113,7 +113,7 @@ class GardenLevelDisplay { private fun isEnabled() = GardenAPI.inGarden() && config.display @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.gardenLevelDisplay", "garden.gardenLevels.display") event.move(3, "garden.gardenLevelPos", "garden.gardenLevels.pos") } 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 26dc9e7dd..e1f069cdf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -501,7 +501,7 @@ object GardenNextJacobContest { fun isNextCrop(cropName: CropType) = nextContestCrops.contains(cropName) && config.otherGuis @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.nextJacobContestDisplay", "garden.nextJacobContests.display") event.move(3, "garden.nextJacobContestEverywhere", "garden.nextJacobContests.everywhere") event.move(3, "garden.nextJacobContestOtherGuis", "garden.nextJacobContests.otherGuis") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 7dc971a23..60d54038c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -111,21 +111,21 @@ class GardenOptimalSpeed { private fun isEnabled() = GardenAPI.inGarden() && config.enabled @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.optimalSpeedEnabled", "garden.optimalSpeeds.enabled") - event.move(3,"garden.optimalSpeedWarning", "garden.optimalSpeeds.warning") - event.move(3,"garden.optimalSpeedSignEnabled", "garden.optimalSpeeds.signEnabled") - event.move(3,"garden.optimalSpeedSignPosition", "garden.optimalSpeeds.signPosition") - event.move(3,"garden.optimalSpeedPos", "garden.optimalSpeeds.pos") - event.move(3,"garden.optimalSpeedCustom.wheat", "garden.optimalSpeeds.customSpeed.wheat") - event.move(3,"garden.optimalSpeedCustom.carrot", "garden.optimalSpeeds.customSpeed.carrot") - event.move(3,"garden.optimalSpeedCustom.potato", "garden.optimalSpeeds.customSpeed.potato") - event.move(3,"garden.optimalSpeedCustom.netherWart", "garden.optimalSpeeds.customSpeed.netherWart") - event.move(3,"garden.optimalSpeedCustom.pumpkin", "garden.optimalSpeeds.customSpeed.pumpkin") - event.move(3,"garden.optimalSpeedCustom.melon", "garden.optimalSpeeds.customSpeed.melon") - event.move(3,"garden.optimalSpeedCustom.cocoaBeans", "garden.optimalSpeeds.customSpeed.cocoaBeans") - event.move(3,"garden.optimalSpeedCustom.sugarCane", "garden.optimalSpeeds.customSpeed.sugarCane") - event.move(3,"garden.optimalSpeedCustom.cactus", "garden.optimalSpeeds.customSpeed.cactus") - event.move(3,"garden.optimalSpeedCustom.mushroom", "garden.optimalSpeeds.customSpeed.mushroom") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.optimalSpeedEnabled", "garden.optimalSpeeds.enabled") + event.move(3, "garden.optimalSpeedWarning", "garden.optimalSpeeds.warning") + event.move(3, "garden.optimalSpeedSignEnabled", "garden.optimalSpeeds.signEnabled") + event.move(3, "garden.optimalSpeedSignPosition", "garden.optimalSpeeds.signPosition") + event.move(3, "garden.optimalSpeedPos", "garden.optimalSpeeds.pos") + event.move(3, "garden.optimalSpeedCustom.wheat", "garden.optimalSpeeds.customSpeed.wheat") + event.move(3, "garden.optimalSpeedCustom.carrot", "garden.optimalSpeeds.customSpeed.carrot") + event.move(3, "garden.optimalSpeedCustom.potato", "garden.optimalSpeeds.customSpeed.potato") + event.move(3, "garden.optimalSpeedCustom.netherWart", "garden.optimalSpeeds.customSpeed.netherWart") + event.move(3, "garden.optimalSpeedCustom.pumpkin", "garden.optimalSpeeds.customSpeed.pumpkin") + event.move(3, "garden.optimalSpeedCustom.melon", "garden.optimalSpeeds.customSpeed.melon") + event.move(3, "garden.optimalSpeedCustom.cocoaBeans", "garden.optimalSpeeds.customSpeed.cocoaBeans") + event.move(3, "garden.optimalSpeedCustom.sugarCane", "garden.optimalSpeeds.customSpeed.sugarCane") + event.move(3, "garden.optimalSpeedCustom.cactus", "garden.optimalSpeeds.customSpeed.cactus") + event.move(3, "garden.optimalSpeedCustom.mushroom", "garden.optimalSpeeds.customSpeed.mushroom") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt index 017cd8580..58371a771 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt @@ -155,9 +155,9 @@ class ToolTooltipTweaks { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.compactToolTooltips", "garden.tooltipTweak.compactToolTooltips") - event.move(3,"garden.fortuneTooltipKeybind", "garden.tooltipTweak.fortuneTooltipKeybind") - event.move(3,"garden.cropTooltipFortune", "garden.tooltipTweak.cropTooltipFortune") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.compactToolTooltips", "garden.tooltipTweak.compactToolTooltips") + event.move(3, "garden.fortuneTooltipKeybind", "garden.tooltipTweak.fortuneTooltipKeybind") + event.move(3, "garden.cropTooltipFortune", "garden.tooltipTweak.cropTooltipFortune") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt index 0e3540061..553d0cea0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt @@ -207,7 +207,7 @@ class ComposterDisplay { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.composterDisplayEnabled", "garden.composters.displayEnabled") event.move(3, "garden.composterDisplayOutsideGarden", "garden.composters.displayOutsideGarden") event.move(3, "garden.composterWarnAlmostClose", "garden.composters.warnAlmostClose") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt index 103f235c5..e344699c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt @@ -69,7 +69,7 @@ class ComposterInventoryNumbers { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.composterInventoryNumbers", "garden.composters.inventoryNumbers") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index aa1fc4d28..672d6fe4f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -568,7 +568,7 @@ class ComposterOverlay { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.composterOverlay", "garden.composters.overlay") event.move(3, "garden.composterOverlayPriceType", "garden.composters.overlayPriceType") event.move(3, "garden.composterOverlayRetrieveFrom", "garden.composters.retrieveFrom") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt index cb74cfde5..695092598 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt @@ -98,7 +98,7 @@ class GardenComposterInventoryFeatures { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.composterUpgradePrice", "garden.composters.upgradePrice") event.move(3, "garden.composterHighLightUpgrade", "garden.composters.highlightUpgrade") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt index bb4b36d3e..6150d60fc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt @@ -142,11 +142,11 @@ class JacobFarmingContestsInventory { } } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"inventory.jacobFarmingContestHighlightRewards","inventory.jacobFarmingContests.highlightRewards") - event.move(3,"inventory.jacobFarmingContestHideDuplicates","inventory.jacobFarmingContests.hideDuplicates") - event.move(3,"inventory.jacobFarmingContestRealTime","inventory.jacobFarmingContests.realTime") - event.move(3,"inventory.jacobFarmingContestFinneganIcon","inventory.jacobFarmingContests.finneganIcon") - event.move(3,"inventory.jacobFarmingContestMedalIcon","inventory.jacobFarmingContests.medalIcon") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "inventory.jacobFarmingContestHighlightRewards", "inventory.jacobFarmingContests.highlightRewards") + event.move(3, "inventory.jacobFarmingContestHideDuplicates", "inventory.jacobFarmingContests.hideDuplicates") + event.move(3, "inventory.jacobFarmingContestRealTime", "inventory.jacobFarmingContests.realTime") + event.move(3, "inventory.jacobFarmingContestFinneganIcon", "inventory.jacobFarmingContests.finneganIcon") + event.move(3, "inventory.jacobFarmingContestMedalIcon", "inventory.jacobFarmingContests.medalIcon") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index cd9a3f555..cf649b9be 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -420,7 +420,7 @@ object CropMoneyDisplay { private fun isEnabled() = GardenAPI.inGarden() && config.display @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.moneyPerHourDisplay", "garden.moneyPerHours.display") event.move(3, "garden.moneyPerHourShowOnlyBest", "garden.moneyPerHours.showOnlyBest") event.move(3, "garden.moneyPerHourShowCurrent", "garden.moneyPerHours.showCurrent") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt index 4282e5e8f..040ab1710 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt @@ -142,7 +142,7 @@ class DicerRngDropCounter { fun isEnabled() = GardenAPI.inGarden() && config.display @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.dicerCounterDisplay", "garden.dicerCounters.display") event.move(3, "garden.dicerCounterHideChat", "garden.dicerCounters.hideChat") event.move(3, "garden.dicerCounterPos", "garden.dicerCounters.pos") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt index db232600a..1718adf7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt @@ -145,9 +145,9 @@ class FarmingArmorDrops { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.farmingArmorDropsEnabled", "garden.farmingArmorDrop.enabled") - event.move(3,"garden.farmingArmorDropsHideChat", "garden.farmingArmorDrop.hideChat") - event.move(3,"garden.farmingArmorDropsPos", "garden.farmingArmorDrop.pos") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.farmingArmorDropsEnabled", "garden.farmingArmorDrop.enabled") + event.move(3, "garden.farmingArmorDropsHideChat", "garden.farmingArmorDrop.hideChat") + event.move(3, "garden.farmingArmorDropsPos", "garden.farmingArmorDrop.pos") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt index f7d9659dc..142d4f268 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt @@ -72,14 +72,14 @@ class FarmingWeightDisplay { @SubscribeEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(1, "garden.eliteFarmingWeightoffScreenDropMessage", "garden.eliteFarmingWeightOffScreenDropMessage") - event.move(3, "garden.eliteFarmingWeightDisplay","garden.eliteFarmingWeights.display") - event.move(3, "garden.eliteFarmingWeightPos","garden.eliteFarmingWeights.pos") - event.move(3, "garden.eliteFarmingWeightLeaderboard","garden.eliteFarmingWeights.leaderboard") - event.move(3, "garden.eliteFarmingWeightOvertakeETA","garden.eliteFarmingWeights.overtakeETA") - event.move(3, "garden.eliteFarmingWeightOffScreenDropMessage","garden.eliteFarmingWeights.offScreenDropMessage") - event.move(3, "garden.eliteFarmingWeightOvertakeETAAlways","garden.eliteFarmingWeights.overtakeETAAlways") - event.move(3, "garden.eliteFarmingWeightETAGoalRank","garden.eliteFarmingWeights.ETAGoalRank") - event.move(3, "garden.eliteFarmingWeightIgnoreLow","garden.eliteFarmingWeights.ignoreLow") + event.move(3, "garden.eliteFarmingWeightDisplay", "garden.eliteFarmingWeights.display") + event.move(3, "garden.eliteFarmingWeightPos", "garden.eliteFarmingWeights.pos") + event.move(3, "garden.eliteFarmingWeightLeaderboard", "garden.eliteFarmingWeights.leaderboard") + event.move(3, "garden.eliteFarmingWeightOvertakeETA", "garden.eliteFarmingWeights.overtakeETA") + event.move(3, "garden.eliteFarmingWeightOffScreenDropMessage", "garden.eliteFarmingWeights.offScreenDropMessage") + event.move(3, "garden.eliteFarmingWeightOvertakeETAAlways", "garden.eliteFarmingWeights.overtakeETAAlways") + event.move(3, "garden.eliteFarmingWeightETAGoalRank", "garden.eliteFarmingWeights.ETAGoalRank") + event.move(3, "garden.eliteFarmingWeightIgnoreLow", "garden.eliteFarmingWeights.ignoreLow") } companion object { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt index ba5945762..0ef03d090 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenBestCropTime.kt @@ -129,7 +129,7 @@ class GardenBestCropTime { private fun getGardenExpForTier(gardenLevel: Int) = if (gardenLevel > 30) 300 else gardenLevel * 10 @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.cropMilestoneBestType", "garden.cropMilestones.next.bestType") event.move(3, "garden.cropMilestoneShowOnlyBest", "garden.cropMilestones.next.showOnlyBest") event.move(3, "garden.cropMilestoneShowCurrent", "garden.cropMilestones.next.showCurrent") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt index a26365bcd..d2948b105 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt @@ -290,19 +290,19 @@ object GardenCropMilestoneDisplay { private fun isEnabled() = GardenAPI.inGarden() && config.progress @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.cropMilestoneProgress", "garden.cropMilestones.progress") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.cropMilestoneProgress", "garden.cropMilestones.progress") event.move(3, "garden.cropMilestoneWarnClose", "garden.cropMilestones.warnClose") - event.move(3, "garden.cropMilestoneHighestTimeFormat","garden.cropMilestones.highestTimeFormat") - event.move(3,"garden.cropMilestoneBestShowMaxedNeeded","garden.cropMilestones.bestShowMaxedNeeded") - event.move(3,"garden.cropMilestoneText","garden.cropMilestones.text") - event.move(3,"garden.blocksBrokenPrecision", "garden.cropMilestones.blocksBrokenPrecision") + event.move(3, "garden.cropMilestoneHighestTimeFormat", "garden.cropMilestones.highestTimeFormat") + event.move(3, "garden.cropMilestoneBestShowMaxedNeeded", "garden.cropMilestones.bestShowMaxedNeeded") + event.move(3, "garden.cropMilestoneText", "garden.cropMilestones.text") + event.move(3, "garden.blocksBrokenPrecision", "garden.cropMilestones.blocksBrokenPrecision") event.move(3, "garden.cropMilestoneProgressDisplayPos", "garden.cropMilestones.progressDisplayPos") event.move(3, "garden.cropMilestoneBestDisplay", "garden.cropMilestones.next.bestDisplay") event.move(3, "garden.cropMilestoneBestAlwaysOn", "garden.cropMilestones.next.bestAlwaysOn") event.move(3, "garden.cropMilestoneNextDisplayPos", "garden.cropMilestones.next.displayPos") - event.move(3,"garden.cropMilestoneMushroomPetPerkEnabled","garden.cropMilestones.mushroomPetPerk.enabled") - event.move(3,"garden.cropMilestoneMushroomPetPerkText","garden.cropMilestones.mushroomPetPerk.text") - event.move(3,"garden.cropMilestoneMushroomPetPerkPos","garden.cropMilestones.mushroomPetPerk.pos") + event.move(3, "garden.cropMilestoneMushroomPetPerkEnabled", "garden.cropMilestones.mushroomPetPerk.enabled") + event.move(3, "garden.cropMilestoneMushroomPetPerkText", "garden.cropMilestones.mushroomPetPerk.text") + event.move(3, "garden.cropMilestoneMushroomPetPerkPos", "garden.cropMilestones.mushroomPetPerk.pos") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index 0ac20c8bc..46b16ca1c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -197,7 +197,7 @@ object GardenCropSpeed { fun isSpeedDataEmpty() = cropsPerSecond?.values?.sum()?.let { it == 0 } ?: true @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3,"garden.blocksBrokenResetTime", "garden.cropMilestones.blocksBrokenResetTime") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt index 7c93f3b99..6b30cf3af 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCustomKeybinds.kt @@ -69,7 +69,7 @@ object GardenCustomKeybinds { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.keyBindEnabled", "garden.keyBind.enabled") event.move(3, "garden.keyBindAttack", "garden.keyBind.attack") event.move(3, "garden.keyBindUseItem", "garden.keyBind.useItem") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt index 01381e80a..4824e9de0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt @@ -82,7 +82,7 @@ class AnitaExtraFarmingFortune { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.extraFarmingFortune", "garden.anitaShop.extraFarmingFortune") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.extraFarmingFortune", "garden.anitaShop.extraFarmingFortune") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt index db3803c09..495696a3e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt @@ -77,8 +77,8 @@ class GardenCropMilestoneInventory { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.numberAverageCropMilestone", "garden.number.averageCropMilestone") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.numberAverageCropMilestone", "garden.number.averageCropMilestone") event.move(3, "garden.cropMilestoneTotalProgress", "garden.tooltipTweak.cropMilestoneTotalProgress") } } \ 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 87b496912..c030d4087 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 @@ -55,10 +55,10 @@ class GardenInventoryNumbers { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ - event.move(3,"garden.numberCropMilestone", "garden.number.cropMilestone") - event.move(3,"garden.numberCropUpgrades", "garden.number.cropUpgrades") - event.move(3,"garden.numberComposterUpgrades", "garden.number.composterUpgrades") + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(3, "garden.numberCropMilestone", "garden.number.cropMilestone") + event.move(3, "garden.numberCropUpgrades", "garden.number.cropUpgrades") + event.move(3, "garden.numberComposterUpgrades", "garden.number.composterUpgrades") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt index b9d73689c..ffd2dfa51 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt @@ -82,7 +82,7 @@ class SkyMartCopperPrice { private fun isEnabled() = GardenAPI.inGarden() && config.copperPrice @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.skyMartCopperPrice", "garden.skyMart.copperPrice") event.move(3, "garden.skyMartCopperPriceAdvancedStats", "garden.skyMart.copperPriceAdvancedStats") event.move(3, "garden.skyMartCopperPricePos", "garden.skyMart.copperPricePos") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 788023d1e..618f48e59 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -231,7 +231,7 @@ object GardenVisitorDropStatistics { } @SubscribeEvent - fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){ + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(3, "garden.visitorDropsStatistics.enabled", "garden.visitors.dropsStatistics.enabled") event.move(3, "garden.visitorDropsStatistics.textFormat", "garden.visitors.dropsStatistics.textFormat") event.move(3, "garden.visitorDropsStatistics.displayNumbersFirst", "garden.visitors.dropsStatistics.displayNumbersFirst") -- cgit