aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-08 11:25:04 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-08 11:25:04 +0200
commit93daeb6ad7d018ce0527aa54198d69ee1ed13f65 (patch)
tree155e193633130c890deed90e3226d22959c63c63
parentf9cafb766115d5342f7d7e1f8b9e3a56504f0273 (diff)
downloadskyhanni-93daeb6ad7d018ce0527aa54198d69ee1ed13f65.tar.gz
skyhanni-93daeb6ad7d018ce0527aa54198d69ee1ed13f65.tar.bz2
skyhanni-93daeb6ad7d018ce0527aa54198d69ee1ed13f65.zip
fixed english spelling
-rw-r--r--docs/CHANGELOG.md4
-rw-r--r--docs/FEATURES.md2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GuiData.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt3
5 files changed, 15 insertions, 16 deletions
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f8cb902e8..5e5054ed2 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1872,7 +1872,7 @@
+ For better maintainability and automatic beta changelog creation.
+ Use less forge events throughout the mod to reduce possible crashes. -
CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1085)
-+ Fix entity click not being canceled - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1072)
++ Fix entity click not being cancelled - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1072)
+ Cleanup ItemClickData. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1072)
+ Fixes minecraft bug where text that is bold can render weirdly. -
CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1126)
@@ -4263,7 +4263,7 @@
+ Add two more chat filter categories: Powder Mining and Winter Gifts.
+ Add catacombs class level color to party finder.
+ Add wishing compass uses amount display.
-+ Saves missing items from canceled buy orders to clipboard for faster re-entry.
++ Saves missing items from cancelled buy orders to clipboard for faster re-entry.
+ Adds a visual highlight to the Croesus inventory that show what chests have not yet been opened.
### Removals
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
index bf1ab853f..364ad2a0f 100644
--- a/docs/FEATURES.md
+++ b/docs/FEATURES.md
@@ -277,7 +277,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Showing colors in the order inventory for outbid or fully bought/sold items.
+ Best Sell Method (Calculating the difference between instant-selling or using sell order for a selected bazaar item)
-+ Saves missing items from canceled buy orders to clipboard for faster re-entry.
++ Saves missing items from cancelled buy orders to clipboard for faster re-entry.
+ Update Timer showing when the next api data update happens.
+ Price Website button. - hannibal2
+ Adds a button to the bazaar product inventory that will open the item page in skyblock.bz.
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
index c51e4cccc..782f3224a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
@@ -21,21 +21,21 @@ import org.lwjgl.input.Keyboard
@SkyHanniModule
object GuiData {
- var preDrawEventCanceled = false
+ var preDrawEventCancelled = false
@SubscribeEvent(priority = EventPriority.HIGH)
fun onNeuRenderEvent(event: NEURenderEvent) {
- if (preDrawEventCanceled) event.cancel()
+ if (preDrawEventCancelled) event.cancel()
}
@SubscribeEvent(priority = EventPriority.HIGH)
fun onClick(event: GuiContainerEvent.SlotClickEvent) {
- if (preDrawEventCanceled) event.cancel()
+ if (preDrawEventCancelled) event.cancel()
}
@SubscribeEvent(priority = EventPriority.HIGH)
fun onGuiClick(event: GuiScreenEvent.MouseInputEvent.Pre) {
- if (preDrawEventCanceled) event.isCanceled = true
+ if (preDrawEventCancelled) event.isCanceled = true
}
@SubscribeEvent(priority = EventPriority.HIGH)
@@ -44,31 +44,31 @@ object GuiData {
Keyboard.KEY_ESCAPE to it.keyBindInventory.keyCode
}
if (escKey.isKeyHeld() || invKey.isKeyHeld()) return
- if (preDrawEventCanceled) event.isCanceled = true
+ if (preDrawEventCancelled) event.isCanceled = true
}
@SubscribeEvent
fun onInventoryClose(event: InventoryCloseEvent) {
DelayedRun.runNextTick {
if (Minecraft.getMinecraft().currentScreen !is GuiChest) {
- preDrawEventCanceled = false
+ preDrawEventCancelled = false
}
}
}
@SubscribeEvent
fun onWorldChange(event: LorenzWorldChangeEvent) {
- preDrawEventCanceled = false
+ preDrawEventCancelled = false
}
@HandleEvent
fun onDisconnect(event: ClientDisconnectEvent) {
- preDrawEventCanceled = false
+ preDrawEventCancelled = false
}
@SubscribeEvent(priority = EventPriority.LOW)
fun onGuiOpen(event: GuiOpenEvent) {
- if (preDrawEventCanceled) {
+ if (preDrawEventCancelled) {
NEUApi.setInventoryButtonsToDisabled()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
index 72f4a2e90..2572b969f 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
@@ -37,10 +37,10 @@ class GuiContainerHook(guiAny: Any) {
if (!SkyHanniDebugsAndTests.globalRender) return
if (GuiContainerEvent.BeforeDraw(gui, gui.inventorySlots, mouseX, mouseY, partialTicks).postAndCatch()) {
NEUApi.setInventoryButtonsToDisabled()
- GuiData.preDrawEventCanceled = true
+ GuiData.preDrawEventCancelled = true
ci.cancel()
} else {
- GuiData.preDrawEventCanceled = false
+ GuiData.preDrawEventCancelled = false
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 070d7db10..0d830e5c1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -27,7 +27,6 @@ import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderXYAligned
import at.hannibal2.skyhanni.utils.renderables.RenderableUtils.renderYAligned
import at.hannibal2.skyhanni.utils.shader.ShaderManager
import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper
-import io.github.moulberry.notenoughupdates.util.Utils
import net.minecraft.client.Minecraft
import net.minecraft.client.gui.Gui
import net.minecraft.client.gui.GuiIngameMenu
@@ -240,7 +239,7 @@ interface Renderable {
val inMenu = Minecraft.getMinecraft().currentScreen !is GuiIngameMenu
val isGuiPositionEditor = guiScreen !is GuiPositionEditor
val isNotInSignAndOnSlot = if (guiScreen !is GuiEditSign && guiScreen !is GuideGUI<*>) {
- ToolTipData.lastSlot == null || GuiData.preDrawEventCanceled
+ ToolTipData.lastSlot == null || GuiData.preDrawEventCancelled
} else true
val isConfigScreen = guiScreen !is GuiScreenElementWrapper