Update to Minecraft 1.21.3/2

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_21

gradle.properties

@@ -8,14 +8,14 @@ archives_base_name = xplus-autofish
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html or https://fabricmc.net/use
-minecraft_version=1.21
-yarn_mappings=1.21+build.1
-loader_version=0.15.11
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.7
 
 # Fabric API
-fabric_version=0.100.1+1.21
+fabric_version = 0.106.1+1.21.3
 
 #Cloth Config API
-cloth_config_version=15.0.127
+cloth_config_version = 16.0.141
 
-modmenu_version = 11.0.0-beta.1
+modmenu_version = 12.0.0-beta.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/troy/autofish/Autofish.java

@@ -48,12 +48,15 @@ public Autofish(FabricModAutofish modAutofish) {
         //Initiate the repeating action for persistent mode casting
         modAutofish.getScheduler().scheduleRepeatingAction(10000, () -> {
             if(!modAutofish.getConfig().isPersistentMode()) return;
+            if(modAutofish.getConfig().isNoBreak() && getHeldItem().getDamage() >= 63) return;
             if(!isHoldingFishingRod()) return;
             if(hookExists){
                 if(isBobberInWater()) return;
+
                 else useRod();
             }
             if(modAutofish.getScheduler().isRecastQueued()) return;
+
             useRod();
         });
     }
@@ -260,7 +263,7 @@ public void useRod() {
                 actionResult = client.interactionManager.interactItem(client.player, hand);
             }
             if (actionResult != null && actionResult.isAccepted()) {
-                if (actionResult.shouldSwingHand()) {
+                if (actionResult == ActionResult.SUCCESS) {
                     client.player.swingHand(hand);
                 }
                 client.gameRenderer.firstPersonRenderer.resetEquipProgress(hand);

src/main/java/troy/autofish/monitor/FishMonitorMPMotion.java

@@ -46,7 +46,7 @@ public void handleHookRemoved() {
     @Override
     public void handlePacket(Autofish autofish, Packet<?> packet, MinecraftClient minecraft) {
         if (packet instanceof EntityVelocityUpdateS2CPacket velocityPacket) {
-            if (minecraft.player != null && minecraft.player.fishHook != null && minecraft.player.fishHook.getId() == velocityPacket.getId()) {
+            if (minecraft.player != null && minecraft.player.fishHook != null && minecraft.player.fishHook.getId() == velocityPacket.getEntityId()) {
                 // Wait until the bobber has rose in the water.
                 // Prevent remarking the bobber rise timestamp until it is reset by catching.
                 if (hasHitWater && bobberRiseTimestamp == 0 && velocityPacket.getVelocityY() > 0) {

src/main/java/troy/autofish/monitor/FishMonitorMPSound.java

@@ -32,7 +32,7 @@ public void handlePacket(Autofish autofish, Packet<?> packet, MinecraftClient mi
             if (packet instanceof PlaySoundS2CPacket) {
                 PlaySoundS2CPacket soundPacket = (PlaySoundS2CPacket) packet;
                 SoundEvent soundEvent = soundPacket.getSound().value();
-                soundName = soundEvent.getId().toString();
+                soundName = soundEvent.id().toString();
                 x = soundPacket.getX();
                 y = soundPacket.getY();
                 z = soundPacket.getZ();