diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-08-11 02:24:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 18:24:14 +0200 |
| commit | 7e3689e15121e6a64a5539d992ce623031f0c053 (patch) | |
| tree | e24b68142c151fd0f82cc0c48c73119398510fa8 /src/main/java/at | |
| parent | 1b34ba975c32c577dba6f8783aa19903ad8d4c3f (diff) | |
| download | skyhanni-7e3689e15121e6a64a5539d992ce623031f0c053.tar.gz skyhanni-7e3689e15121e6a64a5539d992ce623031f0c053.tar.bz2 skyhanni-7e3689e15121e6a64a5539d992ce623031f0c053.zip | |
Merge pull request #377
* message
* just for the people who cannot read
Diffstat (limited to 'src/main/java/at')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt index 8fb09f648..5f2b952d9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneStats.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.features.garden.fortuneguide enum class FortuneStats(val label: String, val tooltip: String) { - BASE("§2Universal Farming Fortune", "§7§2Farming fortune in that is\n§2applied to every crop\n§eNot the same as tab FF"), + BASE("§2Universal Farming Fortune", "§7§2Farming fortune in that is\n§2applied to every crop\n§eNot the same as tab FF\n" + + "§eSee on the grass block page"), CROP_TOTAL("§6Crop Farming Fortune", "§7§2Farming fortune for this crop"), ACCESSORY("§2Talisman Bonus", "§7§2Fortune from your talisman\n§2You get 10☘ per talisman tier"), CROP_UPGRADE("§2Crop Upgrade", "§7§2Fortune from Desk crop upgrades\n§2You get 5☘ per level"), diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt index 32578e647..4181c31ae 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt @@ -19,7 +19,7 @@ class OverviewPage: FFGuideGUI.FFGuidePage() { //todo change based on pet and based on setting GuiRenderUtils.drawFarmingBar("§6Universal Farming Fortune", "§7§2Farming fortune in that is\n" + - "§2applied to every crop\n§eNot the same as tab FF", FFStats.totalBaseFF[FFTypes.TOTAL] ?: 0, 1250, FFGuideGUI.guiLeft + 15, + "§2applied to every crop\n§eNot the same as tab FF\n§eSee on the grass block page", FFStats.totalBaseFF[FFTypes.TOTAL] ?: 0, 1250, FFGuideGUI.guiLeft + 15, FFGuideGUI.guiTop + 5, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay) var line = if (FFStats.baseFF[FFTypes.ANITA]!! < 0.0) "§cAnita buff not saved\n§eVisit Anita to set it!" diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index c8085efcc..dba424ec8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -42,6 +42,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.lwjgl.input.Keyboard import kotlin.math.round private val config get() = SkyHanniMod.feature.garden @@ -282,6 +283,9 @@ class GardenVisitorFeatures { } event.isCanceled = true LorenzUtils.chat("§e[SkyHanni] §cBlocked refusing visitor ${visitor.visitorName} §7(${it.displayName}§7)") + if (config.visitorRewardWarning.bypassKey == Keyboard.KEY_NONE) { + LorenzUtils.chat("§eIf you want to deny this visitor set a keybind in /sh bypass") + } Minecraft.getMinecraft().thePlayer.closeScreen() return } |