aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-26 20:22:51 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-26 20:22:51 +0100
commitc1544a0166a13da57250eee2b60f063d461d10cd (patch)
tree51615a0a34f9fcf991d2de863fb6d2071c570608
parent6d77a7113265d5dbe4f2e708b928d27f6494192d (diff)
downloadskyhanni-c1544a0166a13da57250eee2b60f063d461d10cd.tar.gz
skyhanni-c1544a0166a13da57250eee2b60f063d461d10cd.tar.bz2
skyhanni-c1544a0166a13da57250eee2b60f063d461d10cd.zip
garden grammar fixes
-rw-r--r--CHANGELOG.md4
-rw-r--r--FEATURES.md2
-rw-r--r--README.md2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenCommandsConfig.java8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt6
11 files changed, 17 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0588faf11..0450027e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -973,7 +973,7 @@
### Fixes
+ Fixed Pocket Sack-In-A-Sack Replace in lore
-+ Fixed possible crash with broken neu repo when opening the desk inventory in garden (Contributed by CalMWolfs)
++ Fixed possible crash with broken neu repo when opening the desk inventory in the garden (Contributed by CalMWolfs)
+ Fixed frozen treasures per hour display being inaccurate (Contributed by CalMWolfs)
+ Fixed bug with ghost counter sometimes not detecting new kills (Contributed by CalMWolfs)
+ Fixed **Ghost Counter** - HiZe & ksipli
@@ -1286,7 +1286,7 @@
and show a preview how these stats change when hovering over an upgrade
+ Hide crop money display, crop milestone display and garden visitor list while inside anita show, SkyMart or the
composter inventory
-+ Hide chat messages from the visitors in garden. (Except Beth and Spaceman)
++ Hide chat messages from the visitors in the garden. (Except Beth and Spaceman)
+ Introduced a new command '/shcroptime <amount> <item>' that displays the estimated time it will take to gather the
requested quantity of a particular item based on the current crop speed.
+ Show the average crop milestone in the crop milestone inventory.
diff --git a/FEATURES.md b/FEATURES.md
index a0f560829..dfcfd6820 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -441,7 +441,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
is empty when fully filled and show a preview how these stats change when hovering over an upgrade
+ Hide crop money display, crop milestone display and garden visitor list while inside anita show, SkyMart or the
composter inventory
-+ Hide chat messages from the visitors in garden. (Except Beth, Jacob and Spaceman)
++ Hide chat messages from the visitors in the garden. (Except Beth, Jacob and Spaceman)
+ Show the average crop milestone in the crop milestone inventory.
+ **FF for Contest** - Show the minimum needed Farming Fortune for reaching a medal in the Jacob's Farming Contest
inventory.
diff --git a/README.md b/README.md
index ca6c1f486..6e1c95c8e 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
SkyHanni is a Forge mod for Minecraft 1.8.9. It adds many features to Hypixel SkyBlock.
The mod is filled with GUIs, extra chat messages, reminders, message hiders and entity highlighters.
-The majority of these features are centered on the Garden, Slayer, Bingo, Diana, and Rift.
+The majority of these features are centered in the Garden, Slayer, Bingo, Diana, and Rift.
We have a [tutorial](https://github.com/hannibal002/SkyHanni/blob/beta/INSTALLING.md)
for how to download and install the mod.
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenCommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenCommandsConfig.java
index 74d433a76..5f7d28b2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenCommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenCommandsConfig.java
@@ -9,23 +9,23 @@ import org.lwjgl.input.Keyboard;
public class GardenCommandsConfig {
@Expose
- @ConfigOption(name = "Warp Commands", desc = "Enable commands §e/home§7, §e/barn §7and §e/tp <plot>§7. §cOnly works while on the garden.")
+ @ConfigOption(name = "Warp Commands", desc = "Enable commands §e/home§7, §e/barn §7and §e/tp <plot>§7. §cOnly works while in the garden.")
@ConfigEditorBoolean
@FeatureToggle
public boolean warpCommands = true;
@Expose
- @ConfigOption(name = "Home Hotkey", desc = "Press this key to teleport you to your Garden home. §cOnly works while on the garden.")
+ @ConfigOption(name = "Home Hotkey", desc = "Press this key to teleport you to your Garden home. §cOnly works while in the garden.")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int homeHotkey = Keyboard.KEY_NONE;
@Expose
- @ConfigOption(name = "Sethome Hotkey", desc = "Press this key to set your Garden home. §cOnly works while on the garden.")
+ @ConfigOption(name = "Sethome Hotkey", desc = "Press this key to set your Garden home. §cOnly works while in the garden.")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int sethomeHotkey = Keyboard.KEY_NONE;
@Expose
- @ConfigOption(name = "Barn Hotkey", desc = "Press this key to teleport you to the Garden barn. §cOnly works while on the garden.")
+ @ConfigOption(name = "Barn Hotkey", desc = "Press this key to teleport you to the Garden barn. §cOnly works while in the garden.")
@ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
public int barnHotkey = Keyboard.KEY_NONE;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
index 5606e5e3d..a568ebf0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java
@@ -40,7 +40,7 @@ public class MoneyPerHourConfig {
@Expose
@ConfigOption(
name = "Always On",
- desc = "Always show the money/hour Display while on the garden.")
+ desc = "Always show the money/hour Display while in the garden.")
@ConfigEditorBoolean
public boolean alwaysOn = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
index f9b0f80e4..b17f31279 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java
@@ -16,7 +16,7 @@ public class NextJacobContestConfig {
public boolean display = true;
@Expose
- @ConfigOption(name = "Outside Garden", desc = "Show the timer not only in Garden but everywhere in SkyBlock.")
+ @ConfigOption(name = "Outside Garden", desc = "Show the timer not only in the Garden but everywhere in SkyBlock.")
@ConfigEditorBoolean
public boolean everywhere = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
index 6dcd047a9..188848e48 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java
@@ -43,7 +43,7 @@ public class NextConfig {
@Expose
@ConfigOption(
name = "Always On",
- desc = "Show the Best Display always while on the garden.")
+ desc = "Show the Best Display always while in the garden.")
@ConfigEditorBoolean
public boolean bestAlwaysOn = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
index 4c8e1883e..43b69b2ef 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/pests/PestTimerConfig.java
@@ -11,7 +11,7 @@ public class PestTimerConfig {
@Expose
@ConfigOption(
name = "Enabled",
- desc = "Show the time since the last pest spawned on your garden."
+ desc = "Show the time since the last pest spawned in your garden."
)
@ConfigEditorBoolean
@FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
index 7c93d7526..1a1883516 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
@@ -60,7 +60,7 @@ public class VisitorConfig {
public boolean hypixelArrivedMessage = true;
@Expose
- @ConfigOption(name = "Hide Chat", desc = "Hide chat messages from the visitors in garden. (Except Beth, Jacob and Spaceman)")
+ @ConfigOption(name = "Hide Chat", desc = "Hide chat messages from the visitors in the garden. (Except Beth, Jacob and Spaceman)")
@ConfigEditorBoolean
@FeatureToggle
public boolean hideChat = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt
index 0be3874b5..7c3fc26a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotBorders.kt
@@ -46,7 +46,7 @@ class GardenPlotBorders {
val entity = Minecraft.getMinecraft().renderViewEntity
- // Lowest point in garden
+ // Lowest point in the garden
val minHeight = 66
val maxHeight = 256
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
index df056bfc9..1e879f938 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestFinder.kt
@@ -73,7 +73,7 @@ class PestFinder {
return@buildList
}
- add(Renderable.string("§eTotal pests on garden: §c${totalAmount()}§7/§c8"))
+ add(Renderable.string("§eTotal pests in garden: §c${totalAmount()}§7/§c8"))
for (plot in GardenPlotAPI.plots) {
val pests = plot.pests
@@ -105,7 +105,7 @@ class PestFinder {
@SubscribeEvent
fun onChat(event: LorenzChatEvent) {
if (!isEnabled()) return
- if (event.message == "§cThere are not any Pests on your Garden right now! Keep farming!") {
+ if (event.message == "§cThere are no pests in your Garden right now! Keep farming!") {
GardenPlotAPI.plots.forEach {
it.pests = 0
}
@@ -117,7 +117,7 @@ class PestFinder {
fun onDamageIndicatorDeath(event: DamageIndicatorDeathEvent) {
if (!isEnabled()) return
- // Check if an unknown damage indiactor mob dies in garden
+ // Check if an unknown damage indiactor mob dies in the garden
val type = event.data.bossType
if (!PestType.entries.any { it.damageIndicatorBoss == type }) return