Refactor BoatFlyClient logic and key bindings to adapt to Fabric1.21.9+

Update 1.21.10

Author: HSSkyBoy

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.17.2
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.3
+loader_version=0.18.1
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
-fabric_version=0.130.0+1.21.8
+fabric_version=0.138.0+1.21.10
 
 # Mod Properties
-mod_version=6.1.1
+mod_version=6.1.2
 maven_group=com.boatfly
 archives_base_name=boatfly

src/client/java/com/boatfly/BoatFlyClient.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.util.Identifier;
 import net.minecraft.entity.Entity;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.Vec3d;
@@ -37,34 +38,33 @@ public class BoatFlyClient implements ClientModInitializer {
     private static final double JUMP_VELOCITY = 0.3;
     private static final double MIN_SPEED = 0.0;
 
+    private static final KeyBinding.Category KEY_CATEGORY = new KeyBinding.Category(Identifier.of(MOD_ID, "main"));
+
     @Override
     public void onInitializeClient() {
         // 註冊按鍵綁定
         boatFlightKey = KeyBindingHelper.registerKeyBinding(new KeyBinding(
                 "key." + MOD_ID + ".toggle_fly",
                 InputUtil.Type.KEYSYM,
                 GLFW.GLFW_KEY_B,
-                "category." + MOD_ID + ".main"
+                KEY_CATEGORY
         ));
-
         increaseSpeedKey = KeyBindingHelper.registerKeyBinding(new KeyBinding(
                 "key." + MOD_ID + ".increase_speed",
                 InputUtil.Type.KEYSYM,
                 GLFW.GLFW_KEY_I,
-                "category." + MOD_ID + ".main"
+                KEY_CATEGORY
         ));
-
         decreaseSpeedKey = KeyBindingHelper.registerKeyBinding(new KeyBinding(
                 "key." + MOD_ID + ".decrease_speed",
                 InputUtil.Type.KEYSYM,
                 GLFW.GLFW_KEY_O,
-                "category." + MOD_ID + ".main"
+                KEY_CATEGORY
         ));
 
-        // 註冊客戶端 Tick 事件監聽器
+        // 註冊用戶端 Tick 事件監聽器
         ClientTickEvents.END_CLIENT_TICK.register(this::onClientTick);
-
-        // 註冊客戶端指令 (使用 Fabric API v2)
+        // 註冊用戶端指令 (使用 Fabric API v2)
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
             LiteralArgumentBuilder<FabricClientCommandSource> command = ClientCommandManager.literal("boatspeed")
                     .then(ClientCommandManager.argument("speed", FloatArgumentType.floatArg((float) MIN_SPEED))
@@ -79,10 +79,6 @@ public void onInitializeClient() {
         });
     }
 
-    /**
-     * 在每個客戶端 tick 結束時調用此方法，處理所有邏輯。
-     * @param client MinecraftClient 實例
-     */
     private void onClientTick(MinecraftClient client) {
         // 確保玩家實例存在，否則不執行
         if (client.player == null) return;
@@ -92,43 +88,32 @@ private void onClientTick(MinecraftClient client) {
             isBoatFlyEnabled = !isBoatFlyEnabled;
             if (isBoatFlyEnabled) {
                 changeSpeed(DEFAULT_SPEED);
-                if (client.player != null) {
-                    client.player.sendMessage(Text.translatable("message." + MOD_ID + ".fly_enabled", String.format("%.2f", currentBoatVelocity)), false);
-                }
+                client.player.sendMessage(Text.translatable("message." + MOD_ID + ".fly_enabled", String.format("%.2f", currentBoatVelocity)), false);
             } else {
-                if (client.player != null) {
-                    client.player.sendMessage(Text.translatable("message." + MOD_ID + ".fly_disabled"), false);
-                }
+                client.player.sendMessage(Text.translatable("message." + MOD_ID + ".fly_disabled"), false);
             }
         }
 
         // 若功能未啟用，直接返回
-        if (!isBoatFlyEnabled) {
-            return;
-        }
+        if (!isBoatFlyEnabled) return;
 
         // 處理增加速度按鍵
         if (increaseSpeedKey.wasPressed()) {
             changeSpeed(currentBoatVelocity + SPEED_INCREMENT);
-            if (client.player != null) {
-                client.player.sendMessage(Text.translatable("message." + MOD_ID + ".speed_changed", String.format("%.2f", currentBoatVelocity)), false);
-            }
+            client.player.sendMessage(Text.translatable("message." + MOD_ID + ".speed_changed", String.format("%.2f", currentBoatVelocity)), false);
         }
 
         // 處理降低速度按鍵
         if (decreaseSpeedKey.wasPressed()) {
             if (currentBoatVelocity > MIN_SPEED) {
                 changeSpeed(currentBoatVelocity + SPEED_DECREMENT);
-                if (client.player != null) {
-                    client.player.sendMessage(Text.translatable("message." + MOD_ID + ".speed_changed", String.format("%.2f", currentBoatVelocity)), false);
-                }
+                client.player.sendMessage(Text.translatable("message." + MOD_ID + ".speed_changed", String.format("%.2f", currentBoatVelocity)), false);
             }
         }
-        
-        if (client.player == null || !client.player.hasVehicle()) {
-            return;
-        }
+
+        if (!client.player.hasVehicle()) return;
         Entity vehicle = client.player.getVehicle();
+        if (vehicle == null) return;
 
         // 處理跳躍鍵 (控制垂直向上速度)
         if (client.options.jumpKey.isPressed()) {
@@ -144,22 +129,12 @@ private void onClientTick(MinecraftClient client) {
         }
     }
 
-    /**
-     * 改變船的速度設定值，並計算相應的速度乘數。
-     * @param newSpeed 新的目標速度（單位：blocks/s）
-     */
     private void changeSpeed(double newSpeed) {
         currentBoatVelocity = Math.max(MIN_SPEED, newSpeed);
         boatSpeedMultiplier = calculateMultiplier(currentBoatVelocity);
-
         LOGGER.info("Boat speed set to {} b/s, multiplier is {}.", String.format("%.2f", currentBoatVelocity), String.format("%.5f", boatSpeedMultiplier));
     }
 
-    /**
-     * 根據目標速度計算一個內部乘數。
-     * @param velocity 目標速度
-     * @return 計算出的速度乘數
-     */
     private double calculateMultiplier(double velocity) {
         // f(v) = (-5.33893 * (ln(v - 8 + 11.9072))^(-3.31832) + 1.26253)^(0.470998)
         if (velocity <= 0) return 0;
@@ -173,4 +148,4 @@ private double calculateMultiplier(double velocity) {
 
         return Math.pow(base, 0.470998);
     }
-}
+}

src/main/resources/assets/boatfly/lang/en_us.json

@@ -1,5 +1,5 @@
 {
-  "category.boatfly.main": "Boat Fly",
+  "key.category.boatfly.main": "Boat Fly",
   "key.boatfly.toggle_fly": "Toggle Boat Fly",
   "key.boatfly.increase_speed": "Increase Boat Speed",
   "key.boatfly.decrease_speed": "Decrease Boat Speed",

src/main/resources/assets/boatfly/lang/zh_cn.json

@@ -1,5 +1,5 @@
 {
-  "category.boatfly.main": "Boat Fly",
+  "key.category.boatfly.main": "Boat Fly",
   "key.boatfly.toggle_fly": "切换船只飞行",
   "key.boatfly.increase_speed": "增加船只速度",
   "key.boatfly.decrease_speed": "降低船只速度",

src/main/resources/assets/boatfly/lang/zh_tw.json

@@ -1,5 +1,5 @@
 {
-  "category.boatfly.main": "Boat Fly",
+  "key.category.boatfly.main": "Boat Fly",
   "key.boatfly.toggle_fly": "切換船隻飛行",
   "key.boatfly.increase_speed": "增加船隻速度",
   "key.boatfly.decrease_speed": "降低船隻速度",

src/main/resources/fabric.mod.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "id": "boatfly",
   "version": "${version}",
-  "name": "Boat Fly",
+  "name": "BoatFly",
   "description": "Allows you to Fly in a Boat and Change the speed of the boat",
   "authors": [
     "Eric Gilerson",
@@ -26,7 +26,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.17.0",
-    "minecraft": ">=1.21.8",
+    "minecraft": ">=1.21.9",
     "java": ">=21",
     "fabric-api": "*"
   },