diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2023-07-05 17:30:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-05 17:30:23 +0200 |
| commit | d12f0d3d6935b516066bd750322b61230b194910 (patch) | |
| tree | 69c26fde77d2c929611e386d09a2536549b4b732 /src/main/java/at/hannibal2/skyhanni/features/garden | |
| parent | a7e9a6c3aedaddfcdb7772d9164f9a32d5006bb7 (diff) | |
| download | skyhanni-d12f0d3d6935b516066bd750322b61230b194910.tar.gz skyhanni-d12f0d3d6935b516066bd750322b61230b194910.tar.bz2 skyhanni-d12f0d3d6935b516066bd750322b61230b194910.zip | |
Merge pull request #267
* added random code cleanups
* Merge branch 'beta' into random_code_cleanup
* ...
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt index 497c25f0e..ca7ad1cc5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt @@ -304,8 +304,8 @@ class EliteFarmingWeight { private fun specialMushroomWeight(weightPerCrop: MutableMap<CropType, Double>, totalWeight: Double): Double { val cactusWeight = weightPerCrop[CropType.CACTUS]!! val sugarCaneWeight = weightPerCrop[CropType.SUGAR_CANE]!! - val doubleBreakRatio = (cactusWeight + sugarCaneWeight) / totalWeight; - val normalRatio = (totalWeight - cactusWeight - sugarCaneWeight) / totalWeight; + val doubleBreakRatio = (cactusWeight + sugarCaneWeight) / totalWeight + val normalRatio = (totalWeight - cactusWeight - sugarCaneWeight) / totalWeight val mushroomFactor = CropType.MUSHROOM.getFactor() val mushroomCollection = CropType.MUSHROOM.getLocalCounter() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt index fb48d73fb..4d86c7a35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt @@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzUtils.chat import at.hannibal2.skyhanni.utils.NEUItems -import at.hannibal2.skyhanni.utils.StringUtils.removeColor import io.github.moulberry.notenoughupdates.events.ReplaceItemEvent import io.github.moulberry.notenoughupdates.events.SlotClickEvent import io.github.moulberry.notenoughupdates.util.Utils |