diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-06-02 18:37:56 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-02 10:37:56 +0200 |
| commit | e8ce0e0664aa4449b2a934c4f2c89b3f2b43e1a1 (patch) | |
| tree | 64e425fd680bcb547b3a0d560ab3b6faf9a0d549 /src | |
| parent | daf456a7f3ccaf4e578a913540f0d66c4dc223af (diff) | |
| download | skyhanni-e8ce0e0664aa4449b2a934c4f2c89b3f2b43e1a1.tar.gz skyhanni-e8ce0e0664aa4449b2a934c4f2c89b3f2b43e1a1.tar.bz2 skyhanni-e8ce0e0664aa4449b2a934c4f2c89b3f2b43e1a1.zip | |
Small fixes (#189)
Diffstat (limited to 'src')
3 files changed, 5 insertions, 4 deletions
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 1448efc38..8d4355ed4 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -1040,7 +1040,7 @@ public class Garden { public boolean farmingFortuneDropMultiplier = true; @ConfigOption(name = "Farming Fortune Guide", desc = "Opens a guide that breaks down your farming fortune.\n§eCommand: /ff") - @ConfigEditorButton(buttonText = "§2Open") + @ConfigEditorButton(buttonText = "Open") public Runnable positions = Commands::openFortuneGuide; @Expose 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 f501dd910..555af2d4f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments +import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getFarmingForDummiesCount import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getHoeCounter import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import net.minecraft.item.ItemStack @@ -240,7 +241,7 @@ class FarmingFortuneDisplay { reforgeFortune = match[2]?.value?.toDouble() ?: 0.0 itemBaseFortune = if (tool.getInternalName().contains("LOTUS")) 5.0 - else displayedFortune - reforgeFortune - enchantmentFortune + else displayedFortune - reforgeFortune - enchantmentFortune - (tool.getFarmingForDummiesCount() ?: 0 ) * 1.0 greenThumbFortune = if (tool.getInternalName().contains("LOTUS")) { displayedFortune - reforgeFortune - itemBaseFortune } else 0.0 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 059c3fd6e..74793f803 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 @@ -120,8 +120,6 @@ object GardenVisitorDropStatistics { addAsSingletonList(format(copper, "Copper", "§c", "")) //7 addAsSingletonList(format(farmingExp, "Farming EXP", "§3", "§7")) - //16 - addAsSingletonList(format(gardenExp, "Garden EXP", "§2", "§7")) //8 addAsSingletonList(format(coinsSpent, "Coins Spent", "§6", "")) @@ -139,6 +137,8 @@ object GardenVisitorDropStatistics { } //15 addAsSingletonList("") + //16 + addAsSingletonList(format(gardenExp, "Garden EXP", "§2", "§7")) } fun format(amount: Number, name: String, color: String, amountColor: String = color) = |