aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt3
3 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
index 29bcac5bf..18323637f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
@@ -78,9 +78,9 @@ public class GardenConfig {
public boolean sixthVisitorWarning = true;
@Expose
- @ConfigOption(name = "Ping when close to new visitor", desc = "Pings you when you are less than 10 seconds away from getting a new visitor.")
+ @ConfigOption(name = "New Visitor Ping", desc = "Pings you when you are less than 10 seconds away from getting a new visitor.")
@ConfigEditorBoolean
- public boolean pingForVisitorArrivals = false;
+ public boolean newVisitorPing = false;
@Expose
public Position pos = new Position(390, 65, false, true);
@@ -323,7 +323,7 @@ public class GardenConfig {
@Expose
@ConfigOption(
name = "Accept Hotkey",
- desc = "Accept a visitor when you press this keybind while in the visitor GUI"
+ desc = "Accept a visitor when you press this keybind while in the visitor GUI."
)
@ConfigEditorKeybind(
defaultKey = Keyboard.KEY_NONE
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
index 52dcd86b6..d397d6a86 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
@@ -135,7 +135,7 @@ class GardenVisitorTimer {
val factor = diff / 1000.0
"§7/§$formatColor" + TimeUtils.formatDuration((millis / factor).roundToLong())
} else ""
- if (config.pingForVisitorArrivals && millis < 10000){
+ if (config.newVisitorPing && millis < 10000){
SoundUtils.playBeepSound()
}
val formatDuration = TimeUtils.formatDuration(millis)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
index 96ec316a1..85aef6868 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt
@@ -1,6 +1,5 @@
package at.hannibal2.skyhanni.features.garden.visitor
-import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
import at.hannibal2.skyhanni.events.InventoryCloseEvent
import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -15,7 +14,6 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.VisitorStatus
import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.config
import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer
-import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
import at.hannibal2.skyhanni.utils.ItemUtils.name
import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld
@@ -154,7 +152,6 @@ class VisitorListener {
inventory.handleMouseClick_skyhanni(slot, slot.slotIndex, 0, 0)
}
-
@SubscribeEvent(priority = EventPriority.HIGH)
fun onStackClick(event: SlotClickEvent) {
if (!VisitorAPI.inInventory) return