diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-05-22 20:06:36 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-05-22 20:06:36 +0200 |
| commit | eb68a59b4670d548fa4c0a493ad1d19029faeb5b (patch) | |
| tree | 392483a857b584efbd8ea50fbfef9cb387e5e805 /src/main/java/at/hannibal2/skyhanni/features/fishing | |
| parent | 2e819d59253f91a5453d50cfaca7f998198a338b (diff) | |
| download | skyhanni-eb68a59b4670d548fa4c0a493ad1d19029faeb5b.tar.gz skyhanni-eb68a59b4670d548fa4c0a493ad1d19029faeb5b.tar.bz2 skyhanni-eb68a59b4670d548fa4c0a493ad1d19029faeb5b.zip | |
Use getItemInHand()
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/fishing')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/OdgerWaypoint.kt | 3 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/OdgerWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/OdgerWaypoint.kt index 139b131e4..a41a174a0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/OdgerWaypoint.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/OdgerWaypoint.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.fishing import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled +import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzColor @@ -41,7 +42,7 @@ class OdgerWaypoint { } private fun isLavaFishingRod(): Boolean { - val heldItem = Minecraft.getMinecraft().thePlayer.heldItem ?: return false + val heldItem = InventoryUtils.getItemInHand() ?: return false val isRod = heldItem.name?.contains("Rod") ?: return false if (!isRod) return false diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt index 914774af9..30f95f3e3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt @@ -3,11 +3,11 @@ package at.hannibal2.skyhanni.features.fishing import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.SeaCreatureFishEvent +import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString -import net.minecraft.client.Minecraft import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent @@ -43,7 +43,7 @@ class SharkFishCounter { } private fun isWaterFishingRod(): Boolean { - val heldItem = Minecraft.getMinecraft().thePlayer.heldItem ?: return false + val heldItem = InventoryUtils.getItemInHand() ?: return false val isRod = heldItem.name?.contains("Rod") ?: return false if (!isRod) return false |