fix(auto-fish): fixed "invalid rod" caused by durability changed

c0nstexpr · Jul 4, 2024 · cd5ccec · cd5ccec
1 parent 5ee6eba
commit cd5ccec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 45 deletions.
diff --git a/...ient/java/org/c0nstexpr/fishology/mixin/client/network/ClientPlayNetworkHandlerMixin.java b/...ient/java/org/c0nstexpr/fishology/mixin/client/network/ClientPlayNetworkHandlerMixin.java
@@ -44,9 +44,4 @@ private void onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, Callback
             packet.id(),
             packet.trackedValues()));
     }
-
-    @Inject(method = "onInventory", at = @At("TAIL"))
-    private void onInventory(InventoryS2CPacket packet, CallbackInfo ci) {
-        InventoryUpdateEvent.subject.onNext(Unit.INSTANCE);
-    }
 }
diff --git a/core/src/client/kotlin/org/c0nstexpr/fishology/events/InventoryUpdateEvent.kt b/core/src/client/kotlin/org/c0nstexpr/fishology/events/InventoryUpdateEvent.kt
diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,6 @@ org.gradle.warning.mode=all
 org.gradle.parallel=true
 # Mod Properties
 modGroup=org.c0nstexpr
-modVersion=2.1.0
+modVersion=2.2.0
 modId=fishology
 modName=Fishology
diff --git a/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/Rod.kt b/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/Rod.kt
@@ -1,15 +1,12 @@
 package org.c0nstexpr.fishology.interact
 
 import com.badoo.reaktive.disposable.Disposable
-import com.badoo.reaktive.disposable.scope.disposableScope
 import com.badoo.reaktive.observable.Observable
 import com.badoo.reaktive.observable.filter
-import com.badoo.reaktive.observable.firstOrComplete
 import com.badoo.reaktive.observable.notNull
-import com.badoo.reaktive.observable.switchMapMaybe
+import com.badoo.reaktive.observable.subscribe
 import com.badoo.reaktive.subject.behavior.BehaviorSubject
 import net.minecraft.client.MinecraftClient
-import org.c0nstexpr.fishology.events.InventoryUpdateEvent
 import org.c0nstexpr.fishology.events.UseRodEvent
 import org.c0nstexpr.fishology.log.d
 import org.c0nstexpr.fishology.logger
@@ -31,18 +28,9 @@ class Rod(val client: MinecraftClient) : SwitchDisposable() {
 
     override fun onEnable(): Disposable {
         logger.d<Rod> { "enable rod interaction" }
-        return disposableScope {
-            UseRodEvent.observable.subscribeScoped {
-                logger.d<Rod> { "save rod status after use rod" }
-                itemSubject.onNext(RodItem(it.player, it.isThrow, it.hand))
-            }
-
-            UseRodEvent.observable.filter { !it.isThrow }
-                .switchMapMaybe { InventoryUpdateEvent.observable.firstOrComplete() }
-                .subscribeScoped {
-                    logger.d<Rod> { "update rod item after inventory update" }
-                    rodItem?.updateStack()
-                }
+        return UseRodEvent.observable.subscribe {
+            logger.d<Rod> { "save rod status after use rod" }
+            itemSubject.onNext(RodItem(it.player, it.isThrow, it.hand))
         }
     }
 

diff --git a/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/RodItem.kt b/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/RodItem.kt
@@ -2,10 +2,9 @@ package org.c0nstexpr.fishology.interact
 
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.entity.player.PlayerInventory
-import net.minecraft.item.ItemStack
+import net.minecraft.item.Items
 import net.minecraft.util.Hand
 import org.c0nstexpr.fishology.utils.getSlotInHand
-import org.c0nstexpr.fishology.utils.isSame
 
 class RodItem(
     val player: ClientPlayerEntity,
@@ -14,16 +13,10 @@ class RodItem(
 ) {
     val slotIndex = player.inventory.getSlotInHand(hand)
 
-    var stack: ItemStack = player.getStackInHand(hand)
-        private set
-
     val hand
         get() = if (slotIndex == PlayerInventory.OFF_HAND_SLOT) Hand.OFF_HAND
         else Hand.MAIN_HAND
 
-    fun updateStack() {
-        stack = player.getStackInHand(hand)
-    }
-
-    fun isValid() = player.getStackInHand(hand).isSame(stack) && !stack.isEmpty
+    fun isValid() = player.getStackInHand(hand).isOf(Items.FISHING_ROD) &&
+        player.inventory.getSlotInHand(hand) == slotIndex
 }