summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/misc
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-01-07 02:32:01 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-01-07 02:32:01 +0100
commit614eb4d782c5940e13df0e50c00cdfeacd55bad0 (patch)
tree26dd5f8b646add4ba40af0816d4373229822e889 /src/main/java/at/hannibal2/skyhanni/features/misc
parent62f0750771748571d4f2f8f02f8b77a186c2d4c0 (diff)
downloadskyhanni-614eb4d782c5940e13df0e50c00cdfeacd55bad0.tar.gz
skyhanni-614eb4d782c5940e13df0e50c00cdfeacd55bad0.tar.bz2
skyhanni-614eb4d782c5940e13df0e50c00cdfeacd55bad0.zip
Renamed hypixel and skyblock.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt2
12 files changed, 18 insertions, 18 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
index b54cff9da..d54cd7225 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
@@ -14,7 +14,7 @@ class ButtonOnPause {
@SubscribeEvent
fun onGuiAction(event: GuiScreenEvent.ActionPerformedEvent.Post) {
- if (!LorenzUtils.isOnHypixel) return
+ if (!LorenzUtils.isHyPixel) return
if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu && event.button.id == buttonId) {
SkyHanniMod.screenToOpen = GuiScreenElementWrapper(
@@ -27,7 +27,7 @@ class ButtonOnPause {
@SubscribeEvent
fun onGuiInitPost(event: GuiScreenEvent.InitGuiEvent.Post) {
- if (!LorenzUtils.isOnHypixel) return
+ if (!LorenzUtils.isHyPixel) return
if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu) {
val x = event.gui.width - 105
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt
index 277ecafb6..90d5c39ef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt
@@ -187,7 +187,7 @@ class CollectionCounter {
@SubscribeEvent
fun onRenderOverlay(event: RenderGameOverlayEvent.Post) {
if (event.type != RenderGameOverlayEvent.ElementType.ALL) return
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
SkyHanniMod.feature.misc.collectionCounterPos.renderString(display)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt
index 2f7bc254c..4cf8c7816 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt
@@ -17,7 +17,7 @@ class CompactSplashPotionMessage {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.inSkyblock || !SkyHanniMod.feature.chat.compactPotionMessage) return
+ if (!LorenzUtils.inSkyBlock || !SkyHanniMod.feature.chat.compactPotionMessage) return
var matcher = POTION_EFFECT_PATTERN.matcher(event.message)
if (matcher.matches()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt
index b831bc927..d2ab1725a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt
@@ -18,7 +18,7 @@ class CorruptedMobHighlight {
@SubscribeEvent
fun onEntityHealthUpdate(event: EntityHealthUpdateEvent) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
val entity = event.entity
if (entity in corruptedMobs) return
@@ -55,7 +55,7 @@ class CorruptedMobHighlight {
}
private fun isEnabled(): Boolean {
- return LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.corruptedMobHighlight &&
+ return LorenzUtils.inSkyBlock && SkyHanniMod.feature.misc.corruptedMobHighlight &&
LorenzUtils.skyBlockIsland != "Private Island"
}
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
index 53f56c37c..835b3ec06 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
@@ -13,7 +13,7 @@ class CurrentPetDisplay {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
var blocked = false
@@ -39,7 +39,7 @@ class CurrentPetDisplay {
@SubscribeEvent
fun onRenderOverlay(event: RenderGameOverlayEvent.Post) {
if (event.type != RenderGameOverlayEvent.ElementType.ALL) return
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.misc.petDisplay) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt
index 99ccb4cea..b1f47f015 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt
@@ -10,7 +10,7 @@ class ExpBottleOnGroundHider {
@SubscribeEvent
fun onCheckRender(event: CheckRenderEntityEvent<*>) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.misc.hideExpBottles) return
if (event.entity is EntityXPOrb) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
index b6623331d..146a11e3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt
@@ -23,7 +23,7 @@ class HideArmor {
@SubscribeEvent
fun onGuiInventoryToggle(event: TickEvent.ClientTickEvent) {
- if (!LorenzUtils.inSkyblock) return // TODO test this
+ if (!LorenzUtils.inSkyBlock) return // TODO test this
fixOtherArmor()
@@ -182,7 +182,7 @@ class HideArmor {
}
private fun changeArmor(entity: EntityPlayer, new: Array<ItemStack?>?) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
val current = entity.inventory.armorInventory
if (new != null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt
index 8c4a0fcac..97448c316 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt
@@ -12,7 +12,7 @@ class HideDamageSplash {
@SubscribeEvent(priority = EventPriority.HIGH)
fun onRenderDamage(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.misc.hideDamageSplash) return
if (DamageIndicatorManager.isDamageSplash(event.entity)) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 38e3babbc..ec722eed4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -76,7 +76,7 @@ class MarkedPlayerManager {
@SubscribeEvent
fun onTick(event: TickEvent.ClientTickEvent) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (tick++ % 20 == 0) {
findPlayers()
@@ -85,7 +85,7 @@ class MarkedPlayerManager {
@SubscribeEvent
fun onRenderMobColored(event: RenderMobColoredEvent) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
val entity = event.entity
@@ -96,7 +96,7 @@ class MarkedPlayerManager {
@SubscribeEvent
fun onResetEntityHurtTime(event: ResetEntityHurtEvent) {
- if (!LorenzUtils.inSkyblock) return
+ if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
val entity = event.entity
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 9f91e1c82..d00d7a0df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -203,6 +203,6 @@ class NonGodPotEffectDisplay {
}
private fun isEnabled(): Boolean {
- return LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.nonGodPotEffectDisplay && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight
+ return LorenzUtils.inSkyBlock && SkyHanniMod.feature.misc.nonGodPotEffectDisplay && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight
}
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt
index 8d7fafb1f..c3a43853e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt
@@ -20,6 +20,6 @@ class RealTime {
}
private fun isEnabled(): Boolean {
- return LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.realTime
+ return LorenzUtils.inSkyBlock && SkyHanniMod.feature.misc.realTime
}
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
index c7432ffa9..28f77626f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt
@@ -62,6 +62,6 @@ class ThunderSparksHighlight {
}
private fun isEnabled(): Boolean {
- return LorenzUtils.inSkyblock && SkyHanniMod.feature.fishing.thunderSparkHighlight
+ return LorenzUtils.inSkyBlock && SkyHanniMod.feature.fishing.thunderSparkHighlight
}
} \ No newline at end of file