diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-01-07 03:11:17 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-01-07 03:11:17 +0100 |
| commit | 0c711242c8d96517e49e0ecc7a081f8e15cdd7ed (patch) | |
| tree | b890f54d39478f0dab45e9fa986eae01d4de7ca3 /src/main/java/at/hannibal2/skyhanni/features/minion | |
| parent | ce0956ac232f444724f90f0633b4b35f3dd8cfdf (diff) | |
| download | skyhanni-0c711242c8d96517e49e0ecc7a081f8e15cdd7ed.tar.gz skyhanni-0c711242c8d96517e49e0ecc7a081f8e15cdd7ed.tar.bz2 skyhanni-0c711242c8d96517e49e0ecc7a081f8e15cdd7ed.zip | |
Introduced IslandType enum.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/minion')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt index 707c36405..ee72ff542 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.minion import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled @@ -48,7 +49,7 @@ class MinionFeatures { @SubscribeEvent fun onClick(event: InputEvent.MouseInputEvent) { if (!LorenzUtils.inSkyBlock) return - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return if (!Mouse.getEventButtonState()) return if (Mouse.getEventButton() != 1) return @@ -63,7 +64,7 @@ class MinionFeatures { @SubscribeEvent fun onRenderLastClickedMinion(event: RenderWorldLastEvent) { if (!LorenzUtils.inSkyBlock) return - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return if (!SkyHanniMod.feature.minions.lastClickedMinionDisplay) return val special = SkyHanniMod.feature.minions.lastOpenedMinionColor @@ -87,7 +88,7 @@ class MinionFeatures { @SubscribeEvent fun onTick(event: TickEvent.ClientTickEvent) { - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return if (InventoryUtils.currentlyOpenInventory().contains("Minion")) { if (lastClickedEntity != null) { @@ -175,7 +176,7 @@ class MinionFeatures { @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.inSkyBlock) return - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return if (event.message.matchRegex("§aYou received §r§6(.*) coins§r§a!")) { lastCoinsRecived = System.currentTimeMillis() @@ -189,7 +190,7 @@ class MinionFeatures { fun onRenderLastEmptied(event: RenderWorldLastEvent) { if (!LorenzUtils.inSkyBlock) return if (!SkyHanniMod.feature.minions.emptiedTimeDisplay) return - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return val playerLocation = LocationUtils.playerLocation() val playerEyeLocation = LocationUtils.playerEyeLocation() @@ -211,7 +212,7 @@ class MinionFeatures { @SubscribeEvent(priority = EventPriority.HIGH) fun onRenderLiving(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) { if (!LorenzUtils.inSkyBlock) return - if (LorenzUtils.skyBlockIsland != "Private Island") return + if (LorenzUtils.skyBlockIsland != IslandType.PRIVATE_ISLAND) return if (!SkyHanniMod.feature.minions.hideMobsNametagNearby) return val entity = event.entity |