feat: removeFrogLongJump

Author: OptiJava

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: validate gradle wrapper
         uses: gradle/actions/wrapper-validation@v6
       - name: setup jdk ${{ matrix.java }}

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
       contents: write
     steps:
       - name: checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: download build artifacts
         uses: actions/download-artifact@v8
         with:

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

@@ -206,4 +206,11 @@ public class OptCarpetSettings {
             categories = {RuleCategory.BUGFIX, OCA}
     )
     public static boolean fixPlayerPositionNaN = false;
+
+    //? if >= 26.1 {
+    @Rule(
+        categories = {RuleCategory.OPTIMIZATION, OCA}
+    )
+    public static boolean removeFrogLongJump = false;
+    //? }
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/rule/removeFrogLongJump/FrogAi_Mixin.java

@@ -0,0 +1,44 @@
+package io.github.optijava.opt_carpet_addition.mixins.rule.removeFrogLongJump;
+
+//?if >= 26.1 {
+
+import com.google.common.collect.ImmutableList;
+import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
+import net.minecraft.world.entity.ai.ActivityData;
+import net.minecraft.world.entity.animal.frog.Frog;
+import net.minecraft.world.entity.animal.frog.FrogAi;
+import net.minecraft.world.entity.schedule.Activity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(FrogAi.class)
+public class FrogAi_Mixin {
+    @Inject(
+            method = "updateActivity",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private static void injectUpdateActivity(Frog body, CallbackInfo ci) {
+        if (OptCarpetSettings.removeFrogLongJump) {
+            body.getBrain().setActiveActivityToFirstValid(ImmutableList.of(Activity.TONGUE, Activity.LAY_SPAWN, Activity.SWIM, Activity.IDLE));
+            ci.cancel();
+        }
+    }
+
+    @Inject(
+            method = "getActivities",
+            at = @At("RETURN"),
+            cancellable = true
+    )
+    private static void injectGetActivities(CallbackInfoReturnable<List<ActivityData<Frog>>> cir) {
+        if (OptCarpetSettings.removeFrogLongJump) {
+            cir.setReturnValue(List.copyOf(cir.getReturnValue().subList(0, cir.getReturnValue().size() - 1)));
+        }
+    }
+}
+//? }

src/main/resources/assets/opt-carpet-addition/lang/en_us.json

@@ -68,5 +68,7 @@
   "carpet.rule.removeDataModifyRestriction.name": "Remove Data Modify Restriction",
   "carpet.rule.removeDataModifyRestriction.desc": "Allow modifying data for players",
   "carpet.rule.fixPlayerPositionNaN.name": "Fix NaN in the pos of players",
-  "carpet.rule.fixPlayerPositionNaN.desc": "Prevent when writing NaN into pos"
+  "carpet.rule.fixPlayerPositionNaN.desc": "Prevent when writing NaN into pos",
+  "carpet.rule.removeFrogLongJump.name": "Remove the behavior of long jump in frogs",
+  "carpet.rule.removeFrogLongJump.desc": "Remove the behavior of long jump in frogs"
 }

src/main/resources/assets/opt-carpet-addition/lang/zh_cn.json

@@ -68,6 +68,8 @@
   "carpet.rule.removeDataModifyRestriction.name": "移除Data指令修改限制",
   "carpet.rule.removeDataModifyRestriction.desc": "允许用/data modify entity修改玩家数据",
   "carpet.rule.fixPlayerPositionNaN.name": "修复玩家位置NaN",
-  "carpet.rule.fixPlayerPositionNaN.desc": "当玩家位置被写入NaN时，阻止写入"
+  "carpet.rule.fixPlayerPositionNaN.desc": "当玩家位置被写入NaN时，阻止写入",
+  "carpet.rule.removeFrogLongJump.name": "禁用青蛙大跳行为",
+  "carpet.rule.removeFrogLongJump.desc": "禁用青蛙大跳行为"
 }
 

src/main/resources/opt-carpet-addition.mixins.json

@@ -25,7 +25,10 @@
     "logger.blockUpdate.LogCommand_Mixin",
     "rule.allowSpectatorToModifyContainer.ServerGamePacketListenerImpl_Mixin",
     "rule.removeDataModifyRestriction.EntityDataAccessor_Mixin",
-    "rule.fixPlayerPositionNaN.Entity_Mixin"
+    "rule.fixPlayerPositionNaN.Entity_Mixin",
+    //? if >= 26.1 {
+    "rule.removeFrogLongJump.FrogAi_Mixin"
+    //? }
   ],
   "client": [
     "rule.unescapeChatMessage.ChatMessageC2SPacket_Mixin"