aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-09-14 12:19:56 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-09-14 12:19:56 +0200
commit6bf8f7b9e251b814bbb3cb8e0b786eabe4a7b358 (patch)
tree7a976fb506b61d929e601d265871285432cb120d
parent587279de1d320acb3c4093de9384ef07786be553 (diff)
downloadskyhanni-6bf8f7b9e251b814bbb3cb8e0b786eabe4a7b358.tar.gz
skyhanni-6bf8f7b9e251b814bbb3cb8e0b786eabe4a7b358.tar.bz2
skyhanni-6bf8f7b9e251b814bbb3cb8e0b786eabe4a7b358.zip
Fixed typos in the word SkyBlock
-rw-r--r--CHANGELOG.md14
-rw-r--r--FEATURES.md8
-rw-r--r--OPEN_SOURCE_SOFTWARE.md2
-rw-r--r--src/main/java/SkyHanniInstallerFrame.java8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt2
-rw-r--r--src/main/resources/mcmod.info2
17 files changed, 34 insertions, 34 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 907b60a71..5c017e189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -617,7 +617,7 @@
+ Shows the progress and ETA until the next crop milestone is reached and the current crops/minute value. (Requires
a tool with either a counter or cultivating enchantment)
+ Added **Best Crop Display**
- + Lists all crops and their ETA till next milestone. Sorts for best crop for getting garden level or skyblock level.
+ + Lists all crops and their ETA till next milestone. Sorts for best crop for getting garden level or SkyBlock level.
+ Added **Copper Price**
+ Show the price for copper inside the visitor gui.
+ Added **Amount and Time**
@@ -627,7 +627,7 @@
+ Added Desk shortcut in SkyBlock Menu.
+ Added **Garden Level Display**
+ Show the current garden level and progress to the next level.
-+ Added **Farming Weight and Leaderboard**, provided by the elite skyblock farmers.
++ Added **Farming Weight and Leaderboard**, provided by the Elite SkyBlock Farmers.
+ Added farming weight next leaderboard position eta.
+ Added **Dicer Counter**
+ Count RNG drops for Melon Dicer and Pumpkin Dicer.
@@ -736,7 +736,7 @@
## Features
-+ Added highlight for stuff that is missing in the skyblock level guide inventory.
++ Added highlight for stuff that is missing in the SkyBlock level guide inventory.
+ Added Bingo Card display.
+ **Minion Craft Helper** - Show how many more items you need to upgrade the minion in your inventory. Especially useful
for bingo.
@@ -826,7 +826,7 @@
### Removals
-- Removed additional settings for the chat design, like channel prefix and skyblock level
+- Removed additional settings for the chat design, like channel prefix and SkyBlock level
### Fixes
@@ -953,7 +953,7 @@
+ Added hide the name of the mobs you need to kill in order for the Slayer boss to spawn. Exclude mobs that are damaged,
corrupted, runic or semi rare.
-+ Added option to hide all damage splashes, from anywhere in Skyblock.
++ Added option to hide all damage splashes, from anywhere in SkyBlock.
+ Added highlight Thunder Sparks after killing a Thunder
+ Added Thunder to damage indicator
+ Mark the own player name (for Chat messages)
@@ -1003,8 +1003,8 @@
### Other Misc Features
-- Added option to hide the Skyblock Level from the chat messages (alpha only atm)
-- Added option to change the way the Skyblock Level gets displayed in the chat (only working when skyblock level and
+- Added option to hide the SkyBlock Level from the chat messages (alpha only atm)
+- Added option to change the way the SkyBlock Level gets displayed in the chat (only working when SkyBlock level and
fancy player message format are enabled)
- Added highlight the voidling extremist in pink color
- Added highlight corrupted mobs in purple color
diff --git a/FEATURES.md b/FEATURES.md
index 143adb4f3..ce1426d8e 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -86,7 +86,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Highlight the selected template in the stats tuning inventory.
+ Show the stats for the tuning point templates.
+ Highlight depleted Bonzo's Masks in your inventory.
-+ Highlight stuff that is missing in the skyblock level guide inventory.
++ Highlight stuff that is missing in the SkyBlock level guide inventory.
+ **Auction Highlighter** - Highlight own items that are sold in green and that are expired in red.
+ **Unclaimed Rewards** - Highlight contests with unclaimed rewards in the jacob inventory.
+ **Duplicate Hider** - Hides duplicate farming contests in the inventory.
@@ -309,7 +309,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ **Garden Crop Milestone Display** - Shows the progress and ETA until the next crop milestone is reached and the
current crops/minute value. (Requires a tool with either a counter or cultivating enchantment)
+ **Best Crop Display** - Lists all crops and their ETA till next milestone. Sorts for best crop for getting garden
- level or skyblock level.
+ level or SkyBlock level.
+ **Copper Price** - Show the price for copper inside the visitor gui.
+ **Amount and Time** - Show the exact item amount and the remaining time when farmed manually. Especially useful for
ironman.
@@ -319,7 +319,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Desk shortcut in SkyBlock Menu.
+ **Garden Level Display** - Show the current garden level and progress to the next level.
+ **Farming Weight and Leaderboard**
- + provided by the elite skyblock farmers.
+ + provided by the Elite SkyBlock Farmers.
+ next leaderboard position eta.
+ Instantly showing the next player in the lb when passing someone on the leaderboard. - Kaeso
+ Chat message how many places you dropped in the farming weight lb when joining garden.
@@ -519,7 +519,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Display the current computer time, a handy feature when playing in full-screen mode.
+ Highlight the voidling extremist in pink color.
+ Highlight millenia aged blaze color in red
-+ Option to hide all damage splashes, from anywhere in Skyblock.
++ Option to hide all damage splashes, from anywhere in SkyBlock.
+ Hide armor or just helmet of other player or yourself
+ Display the active non-god potion effects.
+ Wishing compass uses amount display.
diff --git a/OPEN_SOURCE_SOFTWARE.md b/OPEN_SOURCE_SOFTWARE.md
index bb7728159..dcd821ecd 100644
--- a/OPEN_SOURCE_SOFTWARE.md
+++ b/OPEN_SOURCE_SOFTWARE.md
@@ -13,4 +13,4 @@ SkyHanni would not be possible without the following open source software:
| [Forge1.8.9Template](https://github.com/romangraef/Forge1.8.9Template) | [Unlicensed](https://github.com/romangraef/Forge1.8.9Template/blob/master/LICENSE) |
| [SoopyV2](https://github.com/Soopyboo32/SoopyV2) | [GPL 3.0](https://github.com/Soopyboo32/SoopyV2/blob/master/LICENSE) |
| [DiscordIPC](https://github.com/jagrosh/DiscordIPC) | [Apache 2.0](https://github.com/jagrosh/DiscordIPC/blob/master/LICENSE) |
-| [SkyBlockAddons](https://github.com/BiscuitDevelopment/SkyblockAddons/) | [MIT](https://github.com/BiscuitDevelopment/SkyblockAddons/blob/e9fd003f359b357f52b7430c24e64a4c8192a868/LICENSE) |
+| [SkyblockAddons](https://github.com/BiscuitDevelopment/SkyblockAddons/) | [MIT](https://github.com/BiscuitDevelopment/SkyblockAddons/blob/e9fd003f359b357f52b7430c24e64a4c8192a868/LICENSE) |
diff --git a/src/main/java/SkyHanniInstallerFrame.java b/src/main/java/SkyHanniInstallerFrame.java
index 878d2a0d2..4863f8619 100644
--- a/src/main/java/SkyHanniInstallerFrame.java
+++ b/src/main/java/SkyHanniInstallerFrame.java
@@ -435,18 +435,18 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
boolean deletingFailure = false;
if (modsFolder.isDirectory()) { // Delete in this current folder.
- boolean failed = findSkyblockAddonsAndDelete(modsFolder.listFiles());
+ boolean failed = findSkyHanniAndDelete(modsFolder.listFiles());
if (failed) deletingFailure = true;
}
if (inSubFolder) { // We are in the 1.8.9 folder, delete in the parent folder as well.
if (modsFolder.getParentFile().isDirectory()) {
- boolean failed = findSkyblockAddonsAndDelete(modsFolder.getParentFile().listFiles());
+ boolean failed = findSkyHanniAndDelete(modsFolder.getParentFile().listFiles());
if (failed) deletingFailure = true;
}
} else { // We are in the main mods folder, but the 1.8.9 subfolder exists... delete in there too.
File subFolder = new File(modsFolder, "1.8.9");
if (subFolder.exists() && subFolder.isDirectory()) {
- boolean failed = findSkyblockAddonsAndDelete(subFolder.listFiles());
+ boolean failed = findSkyHanniAndDelete(subFolder.listFiles());
if (failed) deletingFailure = true;
}
}
@@ -471,7 +471,7 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
}
}
- private boolean findSkyblockAddonsAndDelete(File[] files) {
+ private boolean findSkyHanniAndDelete(File[] files) {
if (files == null) return false;
for (File file : files) {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index db3c23db6..4bb551f87 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -271,7 +271,7 @@ class SkyHanniMod {
loadModule(FishingTimer())
loadModule(CrimsonIsleReputationHelper(this))
loadModule(SharkFishCounter())
- loadModule(SkyblockLevelGuideHelper())
+ loadModule(SkyBlockLevelGuideHelper())
loadModule(OdgerWaypoint())
loadModule(TiaRelayHelper())
loadModule(TiaRelayWaypoints())
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 04eee744b..c82a7a46d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -300,7 +300,7 @@ object Commands {
@JvmStatic
fun openFortuneGuide() {
if (!LorenzUtils.inSkyBlock) {
- LorenzUtils.chat("§cJoin Skyblock to open the fortune guide!")
+ LorenzUtils.chat("§cJoin SkyBlock to open the fortune guide!")
} else {
CaptureFarmingGear.captureFarmingGear()
SkyHanniMod.screenToOpen = FFGuideGUI()
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
index 7548935ee..39c79b509 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
@@ -366,7 +366,7 @@ public class MiscConfig {
"Bits",
"Stats",
"Held Item",
- "Skyblock Date",
+ "SkyBlock Date",
"Profile",
"Slayer",
"Custom",
@@ -385,7 +385,7 @@ public class MiscConfig {
"Bits",
"Stats",
"Held Item",
- "Skyblock Date",
+ "SkyBlock Date",
"Profile",
"Slayer",
"Custom",
@@ -409,7 +409,7 @@ public class MiscConfig {
"Bits",
"Stats",
"Held Item",
- "Skyblock Date",
+ "SkyBlock Date",
"Profile",
"Slayer",
"Custom",
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
index 0681b8632..2508391d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
@@ -58,7 +58,7 @@ class MayorElection {
private fun checkCurrentMayor() {
var currentYear = SkyBlockTime.now().year
- // The time in the current skyblock year when the election circle will restart
+ // The time in the current SkyBlock year when the election circle will restart
val month = 3 // Late Spring
val nextMayorTime = SkyBlockTime(currentYear, month, day = 27).toMillis()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index 5ee7dfb1d..53a240128 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -322,7 +322,7 @@ class BingoNextStepHelper {
IslandType.CRYSTAL_HOLLOWS.getStep() requires IslandType.DWARVEN_MINES.getStep()
- // TODO add skyblock level requirement
+ // TODO add SkyBlock level requirement
// IslandType.GARDEN.getStep() requires SkyBlockLevelStep(6)
IslandType.GARDEN.getStep() requires IslandType.HUB.getStep()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
index c73806877..be4838ee9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
@@ -11,7 +11,7 @@ class CompactBingoChat {
private val config get() = SkyHanniMod.feature.bingo.compactChat
private var inSkillLevelUp = false
- private var inSkyblockLevelUp = false
+ private var inSkyBlockLevelUp = false
private var inCollectionLevelUp = false
private var collectionLevelUpLastLine: String? = null
private var newArea = 0//0 = nothing, 1 = after first message, 2 = after second message
@@ -28,7 +28,7 @@ class CompactBingoChat {
message == "§e§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬"
) {
inSkillLevelUp = false
- inSkyblockLevelUp = false
+ inSkyBlockLevelUp = false
inCollectionLevelUp = false
if (config.hideBorder) {
event.blockedReason = "compact_bingo_border"
@@ -59,11 +59,11 @@ class CompactBingoChat {
private fun onSkyBlockLevelUp(message: String): Boolean {
if (message.startsWith(" §r§3§lSKYBLOCK LEVEL UP §bLevel ")) {
- inSkyblockLevelUp = true
+ inSkyBlockLevelUp = true
return false
}
- if (inSkyblockLevelUp) {
+ if (inSkyBlockLevelUp) {
if (message == " §r§a§lREWARDS") return true
// We don't care about extra health & strength
healthPattern.matchMatcher(message) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
index 9dca6d59b..b98021f2f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -12,7 +12,7 @@ class DungeonChatFilter {
fun onChatMessage(event: LorenzChatEvent) {
if (!LorenzUtils.onHypixel) return
- // Workaround since the potion message gets always sent in that moment when skyblock is set as false
+ // Workaround since the potion message gets always sent in that moment when SkyBlock is set as false
if (!LorenzUtils.inSkyBlock && !event.message.startsWith("§aYour active Potion Effects")) return
if (!SkyHanniMod.feature.chat.dungeonMessages) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 0b7097091..31571b30b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -53,7 +53,7 @@ class GriffinBurrowParticleFinder {
//
// @SubscribeEvent
// fun onChatPacket(event: ReceiveParticleEvent) {
-// if (!LorenzUtils.inSkyblock) return
+// if (!LorenzUtils.inSkyBlock) return
// if (!SkyHanniMod.feature.dev.debugEnabled) return
//
// val particleType = getParticleType(event)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
index 16df062f8..60c1a28de 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyBlockLevelGuideHelper.kt
@@ -11,7 +11,7 @@ import net.minecraft.client.gui.inventory.GuiChest
import net.minecraft.inventory.ContainerChest
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-class SkyblockLevelGuideHelper {
+class SkyBlockLevelGuideHelper {
@SubscribeEvent
fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
index 615559360..866e14a6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt
@@ -152,7 +152,7 @@ object DiscordRPCManager : IPCListener {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
- if (startOnce || !isEnabled()) return // the mod has already started the connection process. this variable is my way of running a function when the player joins skyblock but only running it again once they join and leave.
+ if (startOnce || !isEnabled()) return // the mod has already started the connection process. this variable is my way of running a function when the player joins SkyBlock but only running it again once they join and leave.
if (LorenzUtils.inSkyBlock) {
start()
startOnce = true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
index 4e7afc376..ac83276a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/GlowingDroppedItems.kt
@@ -17,7 +17,7 @@ class GlowingDroppedItems {
private val config get() = SkyHanniMod.feature.misc.glowingDroppedItems
/**
- * List of skyblock locations where we might see items in showcases
+ * List of SkyBlock locations where we might see items in showcases
*/
private val showcaseItemLocations = setOf(
"The End",
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
index 6ce9e4b38..d290d540b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
@@ -220,7 +220,7 @@ object EntityOutlineRenderer {
*/
@JvmStatic
fun shouldRenderEntityOutlines(): Boolean {
- // Skyblock Conditions
+ // SkyBlock Conditions
if (!LorenzUtils.inSkyBlock) {
return false
}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 7f3776068..d920128ae 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
{
"modid": "skyhanni",
"name": "SkyHanni",
- "description": "Hypixel Skyblock Mod",
+ "description": "Hypixel SkyBlock Mod",
"version": "${version}",
"mcversion": "1.8.9",
"url": "",