Skip to content

Commit

Permalink
garden grammar fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
hannibal002 committed Nov 26, 2023
1 parent 6d77a71 commit c1544a0
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@

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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand All @@ -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

Expand Down

0 comments on commit c1544a0

Please sign in to comment.