feat: QuickMoveとAntiCheatのロジックを改善

The-Infinitys · The-Infinitys · commit ba4f8107abcb · 2025-11-26T23:18:17.000+09:00
QuickMoveとAntiCheat機能の内部ロジックを改善し、より堅牢で自然な挙動を実現しました。
- QuickMove:
    - Y軸の速度成分が保持されるよう修正し、不自然な速度リセットを防止。
    - AntiCheatとの連携設定を`isFeatureEnabled`から`isSettingEnabled`へ変更。
    - `MoveMode.None`時の早期リターンを追加。
- AntiCheat:
    - レイテンシに基づいて動的に許容値を調整するロジックを導入。
    - 不正な速度をより適切に制限するため、`vecMin`関数を用いた速度クランプ処理を追加。
    - `QuickMoveTolerance`と`QuickMoveLatencyMultiplier`設定を公開。
- InfiniteCommand:
    - `reset`コマンドのエラーハンドリングとフィードバックメッセージを改善。
- 言語ファイル:
    - `ja_jp.json`の末尾の余分なカンマを修正。
diff --git a/src/client/kotlin/org/infinite/features/movement/move/QuickMove.kt b/src/client/kotlin/org/infinite/features/movement/move/QuickMove.kt
@@ -235,7 +235,7 @@ class QuickMove : ConfigurableFeature() {
         val player = player ?: return Vec3d.ZERO
         val options = options
         val velocity = velocity ?: return Vec3d.ZERO // 現在のベロシティ
-
+        if (currentMode == MoveMode.None) return velocity
         var forwardInput = 0.0
         var strafeInput = 0.0
 
@@ -368,24 +368,17 @@ class QuickMove : ConfigurableFeature() {
         val newVelZ = cosYaw * localVelForward + sinYaw * localVelStrafe
 
         // X, Z成分のみを更新して返す
-        return Vec3d(newVelX, 0.0, newVelZ)
+        return Vec3d(newVelX, this.velocity?.y ?: player.velocity.y, newVelZ)
     }
 
     override fun onTick() {
         // 加速度更新をTickの最初に行う
-        if (InfiniteClient.isFeatureEnabled(AntiCheat::class.java)) return
         updatePlayerAccelerationSpeed()
-        if (currentMode == MoveMode.None) return
         val player = player ?: return
         val vehicle = player.vehicle
-
-        // 車両が有効な場合は、プレイヤーのYawを車両に適用
         vehicle?.yaw = player.yaw
-
-        // calculateVelocityを呼び出し、新しい水平ベロシティを取得
-        val newVelocityXZ = calculateVelocity()
-
-        // 既存のY成分を保持し、XとZ成分を更新
-        this.velocity = Vec3d(newVelocityXZ.x, this.velocity?.y ?: player.velocity.y, newVelocityXZ.z)
+        if (InfiniteClient.isSettingEnabled(AntiCheat::class.java, "EnableForQuickMove")) return
+        val newVelocity = calculateVelocity()
+        this.velocity = Vec3d(newVelocity.x, newVelocity.y, newVelocity.z)
     }
 }
diff --git a/src/client/kotlin/org/infinite/features/server/anti/AntiCheat.kt b/src/client/kotlin/org/infinite/features/server/anti/AntiCheat.kt
@@ -1,5 +1,6 @@
 package org.infinite.features.server.anti
 
+import net.minecraft.util.math.Vec3d
 import org.infinite.InfiniteClient
 import org.infinite.feature.ConfigurableFeature
 import org.infinite.features.movement.move.QuickMove
@@ -10,7 +11,8 @@ class AntiCheat : ConfigurableFeature(initialEnabled = true) {
     private val enableForQuickMove = FeatureSetting.BooleanSetting("EnableForQuickMove", false)
     private val quickMoveTolerance = FeatureSetting.DoubleSetting("QuickMoveTolerance", 0.05, 0.0, 0.3)
     private val quickMoveLatencyMultiplier = FeatureSetting.DoubleSetting("QuickMoveLatencyMultiplier", 0.5, 0.0, 1.0)
-    override val settings: List<FeatureSetting<*>> = listOf(enableForQuickMove)
+    override val settings: List<FeatureSetting<*>> =
+        listOf(enableForQuickMove, quickMoveTolerance, quickMoveLatencyMultiplier)
 
     override fun onTick() {
         if (enableForQuickMove.value) {
@@ -21,37 +23,41 @@ class AntiCheat : ConfigurableFeature(initialEnabled = true) {
     private fun handleQuickMove() {
         val quickMove = InfiniteClient.getFeature(QuickMove::class.java) ?: return
         val player = player ?: return
-        // スプリント中は判定を無効化するべき
         if (player.isSprinting && player.isOnGround) return
         val networkHandler = player.networkHandler ?: return
         val netWorkPlayer = networkHandler.getPlayerListEntry(player.uuid) ?: return
-        // 1. レイテンシ（Ping）を取得 (単位: ミリ秒)
         val latencyMS = netWorkPlayer.latency
-        // 2. 許容倍率の計算に必要なパラメータを取得
         val baseTolerance = quickMoveTolerance.value // 基本的な許容値 (例: 0.05)
         val latencyMultiplier = quickMoveLatencyMultiplier.value // レイテンシに適用する倍率 (例: 0.5)
-        // 3. 許容倍率 (Tolerance Multiplier) の計算
-        // レイテンシを加味した動的な許容量を算出します。
-        // レイテンシが大きいほど許容量も大きくなります。
-        // Pingが0msの場合、許容量はbaseToleranceのみ。
-        // Pingが200msの場合、baseTolerance + (200 * 0.001 * 0.5) となる。
         val dynamicToleranceMultiplier: Double =
             baseTolerance + (latencyMS.toDouble() * 0.001 * latencyMultiplier)
-        // ここから既存のロジック
-        quickMove.updatePlayerAccelerationSpeed()
         val modifiedVelocity = quickMove.calculateVelocity()
         val originalVelocity = player.velocity
         val diffVelocity = modifiedVelocity.subtract(originalVelocity) // チートによる理想値との差
         val originalSpeed = originalVelocity.horizontalLength()
         val diffSpeed = diffVelocity.horizontalLength()
-        val diffMultiplier = diffSpeed / originalSpeed
+        val diffProgress = diffSpeed / originalSpeed
         player.velocity =
-            if (diffMultiplier > dynamicToleranceMultiplier) {
+            if (diffProgress > dynamicToleranceMultiplier) {
+                val m = (diffProgress / dynamicToleranceMultiplier).coerceIn(0.0, 1.0)
                 val modifiedVelocity =
-                    originalVelocity.add(diffVelocity.multiply(diffMultiplier / dynamicToleranceMultiplier))
+                    vecMin(
+                        modifiedVelocity,
+                        originalVelocity.add(diffVelocity.multiply(m)),
+                    )
                 modifiedVelocity
             } else {
                 modifiedVelocity
             }
     }
+
+    private fun vecMin(
+        a: Vec3d,
+        b: Vec3d,
+    ): Vec3d =
+        if (a.lengthSquared() > b.lengthSquared()) {
+            b
+        } else {
+            a
+        }
 }
diff --git a/src/client/kotlin/org/infinite/libs/infinite/InfiniteCommand.kt b/src/client/kotlin/org/infinite/libs/infinite/InfiniteCommand.kt
@@ -410,40 +410,57 @@ object InfiniteCommand {
                 null
             }
 
-        when {
+        return when {
             cat == null -> {
                 InfiniteClient.featureCategories.forEach { c ->
                     c.features.forEach { f ->
                         f.instance.reset()
                         f.instance.settings.forEach { it.reset() }
                     }
                 }
+                InfiniteClient.info(Text.translatable("command.infinite.config.reset.all").string)
+                1
             }
 
             feat == null -> {
-                InfiniteClient.featureCategories.find { it.name == cat }?.features?.forEach { f ->
+                val category =
+                    InfiniteClient.featureCategories.find { it.name == cat }
+                        ?: return sendError("command.infinite.category.notfound", cat)
+
+                category.features.forEach { f ->
                     f.instance.reset()
                     f.instance.settings.forEach { it.reset() }
                 }
-                    ?: return 0
+                InfiniteClient.info(Text.translatable("command.infinite.config.reset.category", cat).string)
+                1
             }
 
             key == null -> {
-                InfiniteClient.searchFeature(cat, feat)?.let {
-                    it.reset()
-                    it.settings.forEach { setting ->
+                val feature =
+                    InfiniteClient.searchFeature(cat, feat)
+                        ?: return sendError("command.infinite.feature.notfound", cat, feat)
 
-                        setting.reset()
-                    }
-                } ?: return 0
+                feature.reset()
+                feature.settings.forEach { setting ->
+                    setting.reset()
+                }
+                InfiniteClient.info(Text.translatable("command.infinite.config.reset.feature", feat).string)
+                1
             }
 
             else -> {
-                InfiniteClient.searchFeature(cat, feat)?.getSetting(key)?.reset() ?: return 0
+                val feature =
+                    InfiniteClient.searchFeature(cat, feat)
+                        ?: return sendError("command.infinite.feature.notfound", cat, feat)
+                val setting =
+                    feature.getSetting(key)
+                        ?: return sendError("command.infinite.setting.notfound", key, feat)
+
+                setting.reset()
+                InfiniteClient.info(Text.translatable("command.infinite.config.reset.setting", key, feat).string)
+                1
             }
         }
-        InfiniteClient.info(Text.translatable("command.infinite.config.reset.all").string)
-        return 1
     }
 
     private fun getVersion(): Int =
diff --git a/src/main/resources/assets/infinite/lang/en_us.json b/src/main/resources/assets/infinite/lang/en_us.json
@@ -363,8 +363,7 @@
   "infinite.feature.server.anti_cheat.debug_hud.description": "Displays debug information for Anti-cheat.",
   "infinite.feature.server.anti_cheat.enable_for_quick_move.description": "Enables anti-cheat for quick movement.",
   "infinite.feature.server.anti_cheat.quick_move_tolerance.description": "Sets the tolerance for quick movement anti-cheat.",
-  "infinite.feature.server.anti_cheat.quick_move_latency_multiplier.description": "Sets the latency multiplier for quick movement anti-cheat."
-},
+  "infinite.feature.server.anti_cheat.quick_move_latency_multiplier.description": "Sets the latency multiplier for quick movement anti-cheat.",
   "key.infinite-client.toggle.server.anti_cheat": "Toggle Anti cheat",
   "infinite.feature.utils.hyper_map.description": "Displays a mini-map on the screen.",
   "infinite.feature.utils.hyper_map.radius.description": "Sets the radius of the mini-map display.",
diff --git a/src/main/resources/assets/infinite/lang/ja_jp.json b/src/main/resources/assets/infinite/lang/ja_jp.json
@@ -364,7 +364,7 @@
   "infinite.feature.server.anti_cheat.enable_for_quick_move.description": "クイックムーブメントのアンチチートを有効にします。",
   "infinite.feature.server.anti_cheat.quick_move_tolerance.description": "クイックムーブメントのアンチチートの許容範囲を設定します。",
   "infinite.feature.server.anti_cheat.quick_move_latency_multiplier.description": "クイックムーブメントのアンチチートの遅延乗数を設定します。",
-  "key.infinite-client.toggle.server.anti_cheat": "Anti cheatを切り替える",,
+  "key.infinite-client.toggle.server.anti_cheat": "Anti cheatを切り替える",
   "infinite.feature.utils.hyper_map.description": "画面にミニマップを表示します。",
   "infinite.feature.utils.hyper_map.radius.description": "ミニマップ表示の半径を設定します。",
   "infinite.feature.utils.hyper_map.height.description": "ミニマップに表示する垂直高さ範囲を設定します。",
