diff --git a/.github/workflows/gradlew.yaml b/.github/workflows/gradlew.yaml
index db5f2439..628be3a8 100644
--- a/.github/workflows/gradlew.yaml
+++ b/.github/workflows/gradlew.yaml
@@ -2,17 +2,17 @@ name: Gradle Build and Release (Cross-platform)
 
 on:
   push:
-    branches: [ main, 'dev/*' ]
-    tags: [ 'v*' ]
+    branches: [main, "dev/*"]
+    tags: ["v*"]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -25,11 +25,11 @@ jobs:
         shell: bash
 
       - name: Setup JDK 25
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: '25'
-          distribution: 'microsoft'
-          cache: 'gradle'
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "gradle"
 
       - name: Install Zig
         uses: goto-bus-stop/setup-zig@v2
@@ -37,13 +37,13 @@ jobs:
           version: 0.13.0
 
       - name: Setup Rust (Nightly)
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: nightly
           components: rust-src, rustfmt, clippy
 
       - name: Cache Cargo and Rust targets
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.cargo/bin/
@@ -58,12 +58,17 @@ jobs:
         run: bash ./scripts/action_prepare.sh
       - name: Install Build Tools (Cached)
         run: |
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          export PATH="$HOME/.cargo/bin:$PATH"
           if ! command -v cargo-zigbuild &> /dev/null; then
-            curl -L https://github.com/rust-cross/cargo-zigbuild/releases/latest/download/cargo-zigbuild-x86_64-unknown-linux-musl.tar.gz | tar xz -C ~/.cargo/bin
+            echo "cargo-zigbuild not found, installing..."
+            cargo install cargo-zigbuild
+          else
+            echo "cargo-zigbuild is already installed."
           fi
           # Create enhanced wrappers for Zig to fix target triple issues
           mkdir -p ~/.cargo/bin/wrappers
-          
+
           cat <<'EOF' > ~/.cargo/bin/wrappers/zig-cc
           #!/bin/bash
           args=()
@@ -82,7 +87,7 @@ jobs:
           done
           exec zig cc "${args[@]}"
           EOF
-          
+
           cat <<'EOF' > ~/.cargo/bin/wrappers/zig-cpp
           #!/bin/bash
           args=()
@@ -112,11 +117,11 @@ jobs:
           AR_aarch64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-ar
           CC_aarch64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-cc
           CXX_aarch64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-cpp
-          
+
           AR_x86_64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-ar
           CC_x86_64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-cc
           CXX_x86_64_apple_darwin: /home/runner/.cargo/bin/wrappers/zig-cpp
-          
+
           # jemalloc 等の configure 時に SDK チェックでコケるのを防ぐ
           SDKROOT: ""
         run: |
@@ -140,7 +145,7 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: all-in-one-jar
           path: dist/
@@ -153,7 +158,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: all-in-one-jar
           path: dist
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
index df5be5f0..4955088e 100644
--- a/.github/workflows/qodana_code_quality.yml
+++ b/.github/workflows/qodana_code_quality.yml
@@ -25,7 +25,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           submodules: recursive
-      - name: 'Qodana Scan'
+      - name: "Qodana Scan"
         uses: JetBrains/qodana-action@v2025.3
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
@@ -38,4 +38,4 @@ jobs:
           # Upload Qodana results (SARIF, other artifacts, logs) as an artifact to the job
           upload-result: false
           # quick-fixes available in Ultimate and Ultimate Plus plans
-          push-fixes: 'none'
\ No newline at end of file
+          push-fixes: "none"
diff --git a/Cargo.lock b/Cargo.lock
deleted file mode 100644
index b7e21263..00000000
--- a/Cargo.lock
+++ /dev/null
@@ -1,2016 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "ash"
-version = "0.38.0+1.3.281"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "atomic_enum"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
-[[package]]
-name = "bitflags"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "bumpalo"
-version = "3.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
-
-[[package]]
-name = "bytemuck"
-version = "1.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "bytes"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
-
-[[package]]
-name = "cc"
-version = "1.2.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
-dependencies = [
- "find-msvc-tools",
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "chacha20"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "rand_core",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width 0.2.2",
-]
-
-[[package]]
-name = "const-default"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
-
-[[package]]
-name = "core-foundation"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags",
- "core-foundation",
- "libc",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "crunchy"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
-
-[[package]]
-name = "document-features"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
-dependencies = [
- "litrs",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "euclid"
-version = "0.22.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
-
-[[package]]
-name = "float_next_after"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
-
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
-[[package]]
-name = "foldhash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
-[[package]]
-name = "futures"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
-
-[[package]]
-name = "futures-task"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
-
-[[package]]
-name = "futures-util"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
- "rand_core",
- "wasip2",
- "wasip3",
-]
-
-[[package]]
-name = "gl_generator"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
-[[package]]
-name = "glam"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34627c5158214743a374170fed714833fdf4e4b0cbcc1ea98417866a4c5d4441"
-
-[[package]]
-name = "glow"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e"
-dependencies = [
- "gl_generator",
-]
-
-[[package]]
-name = "gpu-allocator"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
-dependencies = [
- "ash",
- "hashbrown 0.16.1",
- "log",
- "presser",
- "thiserror",
- "windows",
-]
-
-[[package]]
-name = "gpu-descriptor"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
-dependencies = [
- "bitflags",
- "gpu-descriptor-types",
- "hashbrown 0.15.5",
-]
-
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "half"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "num-traits",
- "zerocopy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash 0.1.5",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash 0.2.0",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hexf-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
-[[package]]
-name = "indexmap"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
-dependencies = [
- "equivalent",
- "hashbrown 0.16.1",
- "serde",
- "serde_core",
-]
-
-[[package]]
-name = "infinite-client"
-version = "2.3.0"
-dependencies = [
- "atomic_enum",
- "glam",
- "lyon",
- "minecraft-rs",
- "parking_lot",
- "rayon",
- "rustc-hash 2.1.1",
- "xross-core",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
-
-[[package]]
-name = "jemalloc-sys"
-version = "0.5.4+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "jemallocator"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4eacb0641a310445a4c513f2a5e23e19952e269c6a38887254d5f837a305506"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
- "libloading",
- "pkg-config",
-]
-
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
-[[package]]
-name = "libc"
-version = "0.2.182"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
-
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
-
-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "litrs"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
-
-[[package]]
-name = "lock_api"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-
-[[package]]
-name = "lyon"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbcb7d54d54c8937364c9d41902d066656817dce1e03a44e5533afebd1ef4352"
-dependencies = [
- "lyon_algorithms",
- "lyon_tessellation",
-]
-
-[[package]]
-name = "lyon_algorithms"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c0829e28c4f336396f250d850c3987e16ce6db057ffe047ce0dd54aab6b647"
-dependencies = [
- "lyon_path",
- "num-traits",
-]
-
-[[package]]
-name = "lyon_geom"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e260b6de923e6e47adfedf6243013a7a874684165a6a277594ee3906021b2343"
-dependencies = [
- "arrayvec",
- "euclid",
- "num-traits",
-]
-
-[[package]]
-name = "lyon_path"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aeca86bcfd632a15984ba029b539ffb811e0a70bf55e814ef8b0f54f506fdeb"
-dependencies = [
- "lyon_geom",
- "num-traits",
-]
-
-[[package]]
-name = "lyon_tessellation"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f586142e1280335b1bc89539f7c97dd80f08fc43e9ab1b74ef0a42b04aa353"
-dependencies = [
- "float_next_after",
- "lyon_path",
- "num-traits",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
-
-[[package]]
-name = "metal"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
-dependencies = [
- "bitflags",
- "block",
- "core-graphics-types",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8"
-dependencies = [
- "libmimalloc-sys",
-]
-
-[[package]]
-name = "minecraft-rs"
-version = "2.3.0"
-dependencies = [
- "parking_lot",
- "pollster",
- "rayon",
- "wgpu",
- "xross-core",
-]
-
-[[package]]
-name = "mio"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "naga"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
-dependencies = [
- "arrayvec",
- "bit-set",
- "bitflags",
- "cfg-if",
- "cfg_aliases",
- "codespan-reporting",
- "half",
- "hashbrown 0.16.1",
- "hexf-parse",
- "indexmap",
- "libm",
- "log",
- "num-traits",
- "once_cell",
- "rustc-hash 1.1.0",
- "spirv",
- "thiserror",
- "unicode-ident",
-]
-
-[[package]]
-name = "ndk-sys"
-version = "0.6.0+11769913"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "ordered-float"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-link",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
-[[package]]
-name = "pollster"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
-
-[[package]]
-name = "portable-atomic"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "presser"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
-
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.106"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
-
-[[package]]
-name = "quote"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "rand"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
-dependencies = [
- "chacha20",
- "getrandom",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
-
-[[package]]
-name = "range-alloc"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
-
-[[package]]
-name = "raw-window-handle"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
-
-[[package]]
-name = "rayon"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "renderdoc-sys"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
-
-[[package]]
-name = "rlsf"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1646a59a9734b8b7a0ac51689388a60fe1625d4b956348e9de07591a1478457a"
-dependencies = [
- "cfg-if",
- "const-default",
- "libc",
- "rustversion",
- "svgbobdoc",
-]
-
-[[package]]
-name = "rpmalloc"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86179c13cdc0bcedbb60e63c1aebe3bac82162ddfa746320de6dcea31ebe2b06"
-dependencies = [
- "rpmalloc-sys",
-]
-
-[[package]]
-name = "rpmalloc-sys"
-version = "0.2.3+b097fd0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d4b7d5e225a53887ee57fcec492eaf114b8e290f7072d035adc6ddd6810b67b"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-
-[[package]]
-name = "rustversion"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "semver"
-version = "1.0.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
-
-[[package]]
-name = "serde"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.149"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
-dependencies = [
- "itoa",
- "memchr",
- "serde",
- "serde_core",
- "zmij",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
-dependencies = [
- "errno",
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
-
-[[package]]
-name = "slotmap"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "snmalloc-rs"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb317153089fdfa4d8a2eec059d40a5a23c3bde43995ea23b19121c3f621e74a"
-dependencies = [
- "snmalloc-sys",
-]
-
-[[package]]
-name = "snmalloc-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065fea53d32bb77bc36cca466cb191f2e5216ebfd0ed360b1d64889ee6e559ea"
-dependencies = [
- "cmake",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "svgbobdoc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
-dependencies = [
- "base64",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tcmalloc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375205113d84a1c5eeed67beaa0ce08e41be1a9d5acc3425ad2381fddd9d819b"
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "tokio"
-version = "1.49.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
-dependencies = [
- "bytes",
- "libc",
- "mio",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode-width"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
-dependencies = [
- "wit-bindgen",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d7d0fce354c88b7982aec4400b3e7fcf723c32737cef571bd165f7613557ee"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee85afca410ac4abba5b584b12e77ea225db6ee5471d0aebaae0861166f9378a"
-dependencies = [
- "cfg-if",
- "futures-util",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55839b71ba921e4f75b674cb16f843f4b1f3b26ddfcb3454de1cf65cc021ec0f"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf2e969c2d60ff52e7e98b7392ff1588bffdd1ccd4769eba27222fd3d621571"
-dependencies = [
- "bumpalo",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0861f0dcdf46ea819407495634953cdcc8a8c7215ab799a7a7ce366be71c7b30"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10053fbf9a374174094915bbce141e87a6bf32ecd9a002980db4b638405e8962"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wgpu"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
-dependencies = [
- "arrayvec",
- "bitflags",
- "bytemuck",
- "cfg-if",
- "cfg_aliases",
- "document-features",
- "hashbrown 0.16.1",
- "js-sys",
- "log",
- "naga",
- "parking_lot",
- "portable-atomic",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb4c8b5db5f00e56f1f08869d870a0dff7c8bc7ebc01091fec140b0cf0211a9"
-dependencies = [
- "arrayvec",
- "bit-set",
- "bit-vec",
- "bitflags",
- "bytemuck",
- "cfg_aliases",
- "document-features",
- "hashbrown 0.16.1",
- "indexmap",
- "log",
- "naga",
- "once_cell",
- "parking_lot",
- "portable-atomic",
- "profiling",
- "raw-window-handle",
- "rustc-hash 1.1.0",
- "smallvec",
- "thiserror",
- "wgpu-core-deps-apple",
- "wgpu-core-deps-emscripten",
- "wgpu-core-deps-windows-linux-android",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-core-deps-apple"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
-dependencies = [
- "wgpu-hal",
-]
-
-[[package]]
-name = "wgpu-core-deps-emscripten"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
-dependencies = [
- "wgpu-hal",
-]
-
-[[package]]
-name = "wgpu-core-deps-windows-linux-android"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
-dependencies = [
- "wgpu-hal",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "293080d77fdd14d6b08a67c5487dfddbf874534bb7921526db56a7b75d7e3bef"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags",
- "block",
- "bytemuck",
- "cfg-if",
- "cfg_aliases",
- "core-graphics-types",
- "glow",
- "glutin_wgl_sys",
- "gpu-allocator",
- "gpu-descriptor",
- "hashbrown 0.16.1",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading",
- "log",
- "metal",
- "naga",
- "ndk-sys",
- "objc",
- "once_cell",
- "ordered-float",
- "parking_lot",
- "portable-atomic",
- "portable-atomic-util",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "renderdoc-sys",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types",
- "windows",
- "windows-core",
-]
-
-[[package]]
-name = "wgpu-types"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
-dependencies = [
- "bitflags",
- "bytemuck",
- "js-sys",
- "log",
- "web-sys",
-]
-
-[[package]]
-name = "winapi-util"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "windows"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
-dependencies = [
- "windows-collections",
- "windows-core",
- "windows-future",
- "windows-numerics",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
-dependencies = [
- "windows-core",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
-dependencies = [
- "windows-core",
- "windows-link",
- "windows-threading",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
-[[package]]
-name = "windows-numerics"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
-dependencies = [
- "windows-core",
- "windows-link",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows-threading"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap",
- "prettyplease",
- "syn 2.0.117",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
-
-[[package]]
-name = "xross-alloc"
-version = "2.3.0"
-dependencies = [
- "jemallocator",
- "mimalloc",
- "rand",
- "rlsf",
- "rpmalloc",
- "snmalloc-rs",
- "tcmalloc",
-]
-
-[[package]]
-name = "xross-core"
-version = "2.3.0"
-dependencies = [
- "futures",
- "tokio",
- "xross-alloc",
- "xross-macros",
-]
-
-[[package]]
-name = "xross-macros"
-version = "2.3.0"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "serde_json",
- "syn 2.0.117",
- "xross-core",
- "xross-metadata",
-]
-
-[[package]]
-name = "xross-metadata"
-version = "2.3.0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "zmij"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 71cbc2a3..00000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[workspace]
-resolver = "3"
-
-members = [
-    "rust/infinite-client", "rust/minecraft-rs",
-]
-
-[workspace.package]
-version = "2.3.0"
-edition = "2024"
-authors = ["The Infinity's"]
-license = "MIT"
-
-[workspace.dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-xross-core.path = "project-xross/xross-core"
-xross-alloc.path = "project-xross/xross-alloc"
-xross-metadata.path = "project-xross/xross-metadata"
-xross-macros.path = "project-xross/xross-macros"
-parking_lot = "0.12.5"
-minecraft-rs.path = "rust/minecraft-rs"
-[profile.release]
-opt-level = 3          # 最大限の最適化
-lto = "fat"            # Link Time Optimization (リンク時最適化)
-codegen-units = 1      # コンパイル単位を1に制限して最適化を強化
-panic = "abort"        # パニック時のスタックトレースを省きサイズと速度を優先
-strip = true           # デバッグシンボルの削除
diff --git a/INSTALLATION.md b/INSTALLATION.md
index 3df53f95..770590f8 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -43,6 +43,7 @@ brew install --cask openjdk@25
 ```
 
 After installation via Homebrew, create a symlink:
+
 ```bash
 sudo ln -sfn /opt/homebrew/opt/openjdk@25/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-25.jdk
 ```
@@ -54,6 +55,7 @@ sudo ln -sfn /opt/homebrew/opt/openjdk@25/libexec/openjdk.jdk /Library/Java/Java
 ```
 
 You should see output like:
+
 ```
 openjdk 25-ea ...
 ```
@@ -101,20 +103,23 @@ Infinite Client requires **Fabric API** and **Fabric Language Kotlin**:
 3. Find the **fabric-loader-1.21.11** installation and click the **⋯** (three dots) → **Edit**
 4. Click **More Options** to expand advanced settings
 5. In the **Java Executable** field, enter the path to JDK 25:
+
    ```
    /Library/Java/JavaVirtualMachines/jdk-25.jdk/Contents/Home/bin/java
    ```
-   
+
    > **Note**: If you installed via Homebrew, use:
+   >
    > ```
    > /Library/Java/JavaVirtualMachines/openjdk-25.jdk/Contents/Home/bin/java
    > ```
 
 6. In the **JVM Arguments** field, add these flags (required for native access):
+
    ```
    -Xmx4G --enable-native-access=ALL-UNNAMED -Dforeign.restricted=permit
    ```
-   
+
    > Adjust `-Xmx4G` based on your available RAM (4GB minimum recommended)
 
 7. Click **Save**
@@ -132,14 +137,17 @@ Infinite Client requires **Fabric API** and **Fabric Language Kotlin**:
 ## Troubleshooting
 
 ### "Wrong Java Version" Error
+
 - Ensure you've set the correct Java Executable path in the launcher
 - Verify JDK 25 is installed: run `/Library/Java/JavaVirtualMachines/jdk-25.jdk/Contents/Home/bin/java --version`
 
 ### "Access Denied" or Native Library Errors
+
 - Make sure `--enable-native-access=ALL-UNNAMED` is in your JVM arguments
 - Add `-Dforeign.restricted=permit` if not already present
 
 ### Mod Not Loading
+
 - Ensure all dependencies (Fabric API, Fabric Language Kotlin) are in the `mods` folder
 - Check the Minecraft version matches (1.21.11)
 - Check Fabric Loader version is 0.18.2 or later
@@ -147,11 +155,13 @@ Infinite Client requires **Fabric API** and **Fabric Language Kotlin**:
 ### Finding Your Java Path
 
 To list all installed Java versions:
+
 ```bash
 /usr/libexec/java_home -V
 ```
 
 To get the path to a specific version:
+
 ```bash
 /usr/libexec/java_home -v 25
 ```
@@ -160,12 +170,12 @@ To get the path to a specific version:
 
 ## File Locations Reference
 
-| Item | Location |
-|------|----------|
-| Minecraft Folder | `~/Library/Application Support/minecraft` |
-| Mods Folder | `~/Library/Application Support/minecraft/mods` |
-| JDK 25 (Manual Install) | `/Library/Java/JavaVirtualMachines/jdk-25.jdk` |
-| JDK 25 (Homebrew) | `/Library/Java/JavaVirtualMachines/openjdk-25.jdk` |
+| Item                    | Location                                           |
+| ----------------------- | -------------------------------------------------- |
+| Minecraft Folder        | `~/Library/Application Support/minecraft`          |
+| Mods Folder             | `~/Library/Application Support/minecraft/mods`     |
+| JDK 25 (Manual Install) | `/Library/Java/JavaVirtualMachines/jdk-25.jdk`     |
+| JDK 25 (Homebrew)       | `/Library/Java/JavaVirtualMachines/openjdk-25.jdk` |
 
 ---
 
diff --git a/NativeMeshEngine.md b/NativeMeshEngine.md
index b0f44990..51d1ee31 100644
--- a/NativeMeshEngine.md
+++ b/NativeMeshEngine.md
@@ -26,19 +26,20 @@ pub color:Color,
 
 Colorは、#aarrggbbのintに変換を行えるcriticalかつno_heap_accessな関数を保有すること。強制変換で問題ない。
 また、2つの色を混合したりなどのメソッドも必要に応じて作ること。
- - 現在の中心チャンクをChunkPosで
- - 現在の最低の高さをi32で
- - 現在のワールドの高さをi32で
- - 色(Color)の配列を一次元で大量に。
 
- NativeMeshEngineは
+- 現在の中心チャンクをChunkPosで
+- 現在の最低の高さをi32で
+- 現在のワールドの高さをi32で
+- 色(Color)の配列を一次元で大量に。
 
-  - チャンク座標をアップデートする関数(x,z)
-  - 座標と高さを初期化する関数(x_chunk,height,z_chunk)
-  - 範囲を更新する関数(チャンク数) // 例えば3x3にするなら3
-  - 色を設定する関数(x,y,z,color)すべてi32
-  - 線のメッシュを作成する関数(開始座標、終了座標、色)の配列
-  - 面のメッシュを作成する関数(pos0,pos1,pos2,pos3,色)の配列
+NativeMeshEngineは
+
+- チャンク座標をアップデートする関数(x,z)
+- 座標と高さを初期化する関数(x_chunk,height,z_chunk)
+- 範囲を更新する関数(チャンク数) // 例えば3x3にするなら3
+- 色を設定する関数(x,y,z,color)すべてi32
+- 線のメッシュを作成する関数(開始座標、終了座標、色)の配列
+- 面のメッシュを作成する関数(pos0,pos1,pos2,pos3,色)の配列
 
 まず、範囲を初期化する関数で、高さと範囲分のColorの配列を一気に取得します。
 色を設定する際は、現在のチャンク座標を駆使して、VecDequeと同じ原理を使用して代入を行いましょう。
@@ -49,4 +50,3 @@ Colorは、#aarrggbbのintに変換を行えるcriticalかつno_heap_accessな
 線について、ブロックが隣り合って、線が重なる場合は、線を結合し、それぞれのブロックに設定された色の平均値を出力してください。接続できる線はすべて接続してください。
 
 面についても同様にお願いします。
-
diff --git a/README.ja.md b/README.ja.md
index 8b91dc05..6158dbf1 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -26,6 +26,7 @@ Minecraft Anarchy サーバー向けの次世代ユーティリティ mod。
 JDK 25 のセットアップやランチャーの設定（特に macOS ユーザー向け）に関する詳細な手順は、[INSTALLATION.md](./INSTALLATION.md) を参照してください。
 
 ### クイックスタート
+
 1. **JDK 25** (Early Access) をインストール。
 2. **Fabric Loader 1.21.11** をインストール。
 3. `infinite-client.jar`, `fabric-api.jar`, `fabric-language-kotlin.jar` を `mods` フォルダに配置。
diff --git a/README.md b/README.md
index 93dacac5..82414f57 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Next-generation utility mod for Minecraft Anarchy Servers.
 For detailed instructions on setting up JDK 25 and configuring your launcher (especially for macOS users), please refer to the [INSTALLATION.md](./INSTALLATION.md).
 
 ### Quick Start
+
 1. Install **JDK 25** (Early Access).
 2. Download and install **Fabric Loader 1.21.11**.
 3. Place `infinite-client.jar`, `fabric-api.jar`, and `fabric-language-kotlin.jar` in your `mods` folder.
diff --git a/README/en/ADDON.md b/README/en/ADDON.md
index 086eacf2..7a842ee9 100644
--- a/README/en/ADDON.md
+++ b/README/en/ADDON.md
@@ -41,12 +41,9 @@ Register your entrypoint in `fabric.mod.json`:
 ```json
 {
   "entrypoints": {
-    "infinite_addon": [
-      "com.example.addon.MyAwesomeAddon"
-    ]
+    "infinite_addon": ["com.example.addon.MyAwesomeAddon"]
   }
 }
-
 ```
 
 ## 3. Core Extension Methods
@@ -113,16 +110,16 @@ client.themeManager.register(NeonTheme())
 
 ## 5. API Reference (Core Classes)
 
-| Class Name | Description |
-| --- | --- |
-| `InfiniteClient` | The core of the MOD. Provides access to all managers. |
-| `LocalFeature` | Base class for features with per-server/world settings. |
-| `GlobalFeature` | Base class for features with global client settings. |
-| `ThemeManager` | Manages UI themes. Use `register()` to add new themes. |
+| Class Name       | Description                                             |
+| ---------------- | ------------------------------------------------------- |
+| `InfiniteClient` | The core of the MOD. Provides access to all managers.   |
+| `LocalFeature`   | Base class for features with per-server/world settings. |
+| `GlobalFeature`  | Base class for features with global client settings.    |
+| `ThemeManager`   | Manages UI themes. Use `register()` to add new themes.  |
 
 ---
 
 **Tips for Addon Developers:**
 
-* By defining a `Property` (e.g., `BooleanProperty`) within a `Feature` class, a corresponding setting item will be **automatically generated in the GUI**.
-* Don't forget to add translation keys to your `en_us.json` using the format: `infinite.features.<scope>.<category>.<feature>`.
+- By defining a `Property` (e.g., `BooleanProperty`) within a `Feature` class, a corresponding setting item will be **automatically generated in the GUI**.
+- Don't forget to add translation keys to your `en_us.json` using the format: `infinite.features.<scope>.<category>.<feature>`.
diff --git a/README/en/README.md b/README/en/README.md
index 93dacac5..82414f57 100644
--- a/README/en/README.md
+++ b/README/en/README.md
@@ -26,6 +26,7 @@ Next-generation utility mod for Minecraft Anarchy Servers.
 For detailed instructions on setting up JDK 25 and configuring your launcher (especially for macOS users), please refer to the [INSTALLATION.md](./INSTALLATION.md).
 
 ### Quick Start
+
 1. Install **JDK 25** (Early Access).
 2. Download and install **Fabric Loader 1.21.11**.
 3. Place `infinite-client.jar`, `fabric-api.jar`, and `fabric-language-kotlin.jar` in your `mods` folder.
diff --git a/README/ja/ADDON.md b/README/ja/ADDON.md
index 98606743..8af96508 100644
--- a/README/ja/ADDON.md
+++ b/README/ja/ADDON.md
@@ -41,12 +41,9 @@ class MyAwesomeAddon : InfiniteAddon {
 ```json
 {
   "entrypoints": {
-    "infinite_addon": [
-      "com.example.addon.MyAwesomeAddon"
-    ]
+    "infinite_addon": ["com.example.addon.MyAwesomeAddon"]
   }
 }
-
 ```
 
 ## 3. 主要な拡張方法
@@ -113,17 +110,16 @@ InfiniteClientは以下の順序で初期化されます：
 
 ## 5. APIリファレンス (主要クラス)
 
-| クラス名 | 説明 |
-| --- | --- |
-| `InfiniteClient` | MODの心臓部。各マネージャーへのアクセスを提供します。 |
-| `LocalFeature` | サーバー/ワールドごとに設定を保持する機能の基底クラス。 |
-| `GlobalFeature` | クライアント全体で共通の設定を保持する機能の基底クラス。 |
-| `ThemeManager` | UIのテーマを管理。`register()` で新テーマを追加可能。 |
+| クラス名         | 説明                                                     |
+| ---------------- | -------------------------------------------------------- |
+| `InfiniteClient` | MODの心臓部。各マネージャーへのアクセスを提供します。    |
+| `LocalFeature`   | サーバー/ワールドごとに設定を保持する機能の基底クラス。  |
+| `GlobalFeature`  | クライアント全体で共通の設定を保持する機能の基底クラス。 |
+| `ThemeManager`   | UIのテーマを管理。`register()` で新テーマを追加可能。    |
 
 ---
 
 **アドオン開発者へのヒント:**
 
-* `Feature` クラス内で `Property`（BooleanPropertyなど）を定義すると、自動的にGUIに設定項目が表示されます。
-* 翻訳ファイル（`en_us.json`など）に `infinite.features.<scope>.<category>.<feature>` の形式でキーを追加することを忘れないでください。
-
+- `Feature` クラス内で `Property`（BooleanPropertyなど）を定義すると、自動的にGUIに設定項目が表示されます。
+- 翻訳ファイル（`en_us.json`など）に `infinite.features.<scope>.<category>.<feature>` の形式でキーを追加することを忘れないでください。
diff --git a/build.gradle.kts b/build.gradle.kts
index 2a0770f8..9a1bafa3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("jvm")
-    id("fabric-loom")
+    id("net.fabricmc.fabric-loom")
     id("maven-publish")
     id("eclipse")
     id("org.jetbrains.kotlin.plugin.serialization")
@@ -48,18 +48,12 @@ tasks.named<JavaCompile>("compileJava") {
 
 dependencies {
     minecraft("com.mojang:minecraft:${property("minecraft_version")}")
-    @Suppress("UnstableApiUsage")
-    mappings(
-        loom.layered {
-            officialMojangMappings()
-        },
-    )
-    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
-    modImplementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
-    modImplementation("maven.modrinth:modmenu:${property("mod_menu_version")}")
+    implementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    implementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")
+    implementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}")
+    compileOnly("maven.modrinth:modmenu:${property("mod_menu_version")}")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${property("kotlinx_serialization_json_version")}")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:${property("kotlin_version")}")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:${property("kotlinVersion")}")
     implementation("dev.babbaj:nether-pathfinder:${property("nether_pathfinder_version")}")
     implementation("com.squareup.okhttp3:okhttp:${property("ok_http_version")}")
     implementation("org.apache.maven:maven-artifact:${property("maven_artifact_version")}")
@@ -70,11 +64,9 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
     errorprone("com.google.errorprone:error_prone_core:2.45.0")
 }
-
 xross {
-    rustProjectDir = project.file("rust/infinite-client").absolutePath
-    metadataDir = "target/xross"
-    packageName = "org.infinite.nativebind"
+    rustProjectDir = project.file("infinite-client").absolutePath
+    packageName = "org.infinite.native"
     useUnsignedTypes = true
 }
 
@@ -84,10 +76,8 @@ val cleanNative = tasks.register("cleanNative") {
     group = "native"
     description = "Cleans Rust target directory and generated Xross bindings."
     doLast {
-        delete(project.file("rust/infinite-client/target"))
+        delete(project.file("infinite-client/target"))
         delete(layout.buildDirectory.dir("generated/xross/kotlin"))
-        // 検証エラーを避けるためにディレクトリだけ再作成しておく
-        project.file("rust/infinite-client/target/xross").mkdirs()
         println("Native build artifacts and generated code cleaned.")
     }
 }
@@ -118,23 +108,19 @@ rustTargets.forEach { (id, targetTriple) ->
     tasks.register<Exec>("rustBuild_$id") {
         group = "build"
         description = "Build Rust library for $id ($targetTriple) using zigbuild"
-        workingDir = project.file("rust/infinite-client")
+        workingDir = project.file("infinite-client")
         val useZigbuild =
             buildAllRustTargets || id != hostRustTargetId || providers.gradleProperty("useZigbuild").orNull == "true"
 
-        // メタデータの競合を避けるため、buildディレクトリ内にターゲットごとのディレクトリを作成
-        val targetMetadataDir = project.layout.buildDirectory.dir("xross-metadata/$id").get().asFile
-        environment("XROSS_METADATA_DIR", targetMetadataDir.absolutePath)
-
         if (useZigbuild) {
             commandLine("cargo", "zigbuild", "--release", "--target", targetTriple)
         } else {
             commandLine("cargo", "build", "--release")
         }
         val outputDir = if (useZigbuild) {
-            project.file("rust/infinite-client/target/$targetTriple/release")
+            project.file("infinite-client/target/$targetTriple/release")
         } else {
-            project.file("rust/infinite-client/target/release")
+            project.file("infinite-client/target/release")
         }
         outputs.dir(outputDir)
     }
@@ -143,7 +129,7 @@ rustTargets.forEach { (id, targetTriple) ->
 val buildRustAll = tasks.register("buildRustAll") {
     group = "build"
     description = "Triggers Rust builds for all supported platforms"
-    inputs.dir(project.file("rust/infinite-client"))
+    inputs.dir(project.file("infinite-client"))
     val rustBuildTasks = if (buildAllRustTargets) {
         rustTargets.keys.map { "rustBuild_$it" }
     } else {
@@ -152,31 +138,9 @@ val buildRustAll = tasks.register("buildRustAll") {
     dependsOn(rustBuildTasks)
 }
 
-val mergeXrossMetadata = tasks.register("mergeXrossMetadata") {
-    group = "native"
-    description = "Merges Xross metadata from all build targets."
-    dependsOn(buildRustAll)
-    doLast {
-        val mergedDir = project.file("rust/infinite-client/target/xross")
-        if (!mergedDir.exists()) mergedDir.mkdirs()
-
-        val targetIds = if (buildAllRustTargets) rustTargets.keys else listOf(hostRustTargetId)
-        targetIds.forEach { id ->
-            val targetMetadataDir = project.layout.buildDirectory.dir("xross-metadata/$id").get().asFile
-            if (targetMetadataDir.exists()) {
-                targetMetadataDir.listFiles()?.forEach { file ->
-                    if (file.extension == "json") {
-                        file.copyTo(File(mergedDir, file.name), overwrite = true)
-                    }
-                }
-            }
-        }
-    }
-}
-
 // Xrossのバインディング生成はRustのビルド（メタデータ生成）に依存する
 tasks.named("generateXrossBindings") {
-    dependsOn(mergeXrossMetadata)
+    dependsOn(buildRustAll)
 }
 
 // --- Rust Formatting ---
@@ -184,13 +148,13 @@ tasks.named("generateXrossBindings") {
 val rustFmt = tasks.register<Exec>("rustFmt") {
     group = "formatting"
     description = "Formats Rust code using cargo fmt"
-    commandLine("cargo", "fmt", "--all")
+    commandLine("cargo", "fmt", "--all", "--manifest-path", "infinite-client/Cargo.toml")
 }
 
 val rustFmtCheck = tasks.register<Exec>("rustFmtCheck") {
     group = "verification"
     description = "Checks Rust code formatting using cargo fmt --check"
-    commandLine("cargo", "fmt", "--all", "--", "--check")
+    commandLine("cargo", "fmt", "--manifest-path", "infinite-client/Cargo.toml", "--all", "--", "--check")
 }
 
 tasks.named("spotlessApply") {
@@ -205,10 +169,16 @@ val refreshNative = tasks.register("refreshNative") {
     group = "native"
     description = "Performs a clean rebuild of Rust binaries and regenerates Xross bindings."
     dependsOn(cleanNative)
-    // 依存関係の連鎖により、generateXrossBindings を呼べば自動的に buildRustAll も走る
+    // buildRustAll を実行し、その後に generateXrossBindings を実行するように設定
+    dependsOn(buildRustAll)
     finalizedBy("generateXrossBindings")
 }
 
+// クリーンアップ後にビルドが走るように順序を制御
+buildRustAll.configure {
+    mustRunAfter(cleanNative)
+}
+
 sourceSets {
     main {
         kotlin.srcDir(layout.buildDirectory.dir("generated/xross/kotlin"))
@@ -229,9 +199,9 @@ tasks {
         rustTargets.forEach { (id, target) ->
             val hostUsesZigbuild = buildAllRustTargets || providers.gradleProperty("useZigbuild").orNull == "true"
             val sourceDir = if (id == hostRustTargetId && !hostUsesZigbuild) {
-                "${project.rootDir}/target/release"
+                project.file("infinite-client/target/release")
             } else {
-                "${project.rootDir}/target/$target/release"
+                project.file("infinite-client/target/$target/release")
             }
             from(sourceDir) {
                 include("*.so", "*.dll", "*.dylib")
@@ -252,6 +222,9 @@ tasks {
                 vmArg("-Dforeign.restricted=permit")
                 vmArg("-XX:+UnlockDiagnosticVMOptions")
                 vmArg("-XX:+AlwaysCompileLoopMethods")
+                vmArg("-Dmixin.debug.strict=true")
+                vmArg("-Dmixin.debug.verbose=true")
+                vmArg("-Dmixin.debug.countInjections=true")
             }
         }
         splitEnvironmentSourceSets()
@@ -381,3 +354,11 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
         )
     }
 }
+
+tasks.register<JavaExec>("genDocs") {
+    description = "Generate Document templates"
+    group = "application"
+    classpath = sourceSets["client"].runtimeClasspath
+    mainClass.set("org.infinite.utils.Document")
+    args(project.rootDir.absolutePath)
+}
diff --git a/gradle.properties b/gradle.properties
index ef876429..79ea9ee1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,16 +6,16 @@ org.gradle.daemon=true
 org.gradle.configuration-cache=false
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-loader_version=0.18.4
-loomVersion=1.15-SNAPSHOT
-fabric_kotlin_version=1.13.7+kotlin.2.2.21
+minecraft_version=26.1.2
+loader_version=0.19.2
+loomVersion=1.16-SNAPSHOT
+fabric_kotlin_version=1.13.10+kotlin.2.3.20
 # Mod Properties
-mod_version=2.1.0+1.21.11
+mod_version=2.3.0+26.1.2
 maven_group=org.infinite
 archives_base_name=infinite-client
 # Dependencies
-fabric_version=0.139.5+1.21.11
+fabric_api_version=0.146.0+26.1.2
 mod_menu_version=17.0.0-alpha.1
 nether_pathfinder_version=1.4.1
 baritone_version=1.21.11-SNAPSHOT
@@ -23,7 +23,7 @@ lwjgl_version=3.3.6
 ok_http_version=5.3.2
 snake_yaml_version=2.5
 maven_artifact_version=4.0.0-rc-5
-kotlin_version=2.3.10
-kotlinx_serialization_json_version=1.8.0
+kotlinVersion=2.3.20
+kotlinx_serialization_json_version=1.10.0
 # Build Dependencies
-proguard_version=7.8.2
\ No newline at end of file
+proguard_version=7.8.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f8e1ee31..d997cfc6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 23449a2b..dbc3ce4a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index adff685a..0262dcbd 100755
--- a/gradlew
+++ b/gradlew
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/rust/infinite-client/.gitignore b/infinite-client/.gitignore
similarity index 100%
rename from rust/infinite-client/.gitignore
rename to infinite-client/.gitignore
diff --git a/infinite-client/Cargo.lock b/infinite-client/Cargo.lock
new file mode 100644
index 00000000..b116ab3f
--- /dev/null
+++ b/infinite-client/Cargo.lock
@@ -0,0 +1,459 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "atomic_enum"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bitflags"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "const-default"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "euclid"
+version = "0.22.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "float_next_after"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
+
+[[package]]
+name = "glam"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34627c5158214743a374170fed714833fdf4e4b0cbcc1ea98417866a4c5d4441"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "infinite-client"
+version = "2.3.0"
+dependencies = [
+ "atomic_enum",
+ "glam",
+ "lyon",
+ "parking_lot",
+ "rayon",
+ "rustc-hash",
+ "xross-core",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+
+[[package]]
+name = "libc"
+version = "0.2.182"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "lyon"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbcb7d54d54c8937364c9d41902d066656817dce1e03a44e5533afebd1ef4352"
+dependencies = [
+ "lyon_algorithms",
+ "lyon_tessellation",
+]
+
+[[package]]
+name = "lyon_algorithms"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c0829e28c4f336396f250d850c3987e16ce6db057ffe047ce0dd54aab6b647"
+dependencies = [
+ "lyon_path",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_geom"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e260b6de923e6e47adfedf6243013a7a874684165a6a277594ee3906021b2343"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_path"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aeca86bcfd632a15984ba029b539ffb811e0a70bf55e814ef8b0f54f506fdeb"
+dependencies = [
+ "lyon_geom",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_tessellation"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3f586142e1280335b1bc89539f7c97dd80f08fc43e9ab1b74ef0a42b04aa353"
+dependencies = [
+ "float_next_after",
+ "lyon_path",
+ "num-traits",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "rlsf"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1646a59a9734b8b7a0ac51689388a60fe1625d4b956348e9de07591a1478457a"
+dependencies = [
+ "cfg-if",
+ "const-default",
+ "libc",
+ "rustversion",
+ "svgbobdoc",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "svgbobdoc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
+dependencies = [
+ "base64",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-width",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "xross-alloc"
+version = "3.2.0"
+dependencies = [
+ "rlsf",
+]
+
+[[package]]
+name = "xross-core"
+version = "3.2.0"
+dependencies = [
+ "xross-alloc",
+ "xross-macros",
+]
+
+[[package]]
+name = "xross-macros"
+version = "3.2.0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 2.0.117",
+ "xross-metadata",
+]
+
+[[package]]
+name = "xross-metadata"
+version = "3.2.0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/infinite-client/Cargo.toml b/infinite-client/Cargo.toml
new file mode 100644
index 00000000..af67d5f5
--- /dev/null
+++ b/infinite-client/Cargo.toml
@@ -0,0 +1,25 @@
+[workspace]
+resolver = "3"
+
+members = ["crates/infinite-client"]
+
+[workspace.package]
+version = "2.3.0"
+edition = "2024"
+authors = ["The Infinity's"]
+license = "MIT"
+
+[workspace.dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+xross-core.path = "../project-xross/xross-core"
+xross-alloc.path = "../project-xross/xross-alloc"
+xross-metadata.path = "../project-xross/xross-metadata"
+xross-macros.path = "../project-xross/xross-macros"
+parking_lot = "0.12.5"
+[profile.release]
+opt-level = 3 # 最大限の最適化
+lto = "fat" # Link Time Optimization (リンク時最適化)
+codegen-units = 1 # コンパイル単位を1に制限して最適化を強化
+panic = "abort" # パニック時のスタックトレースを省きサイズと速度を優先
+strip = true # デバッグシンボルの削除
diff --git a/rust/minecraft-rs/.gitignore b/infinite-client/crates/infinite-client/.gitignore
similarity index 100%
rename from rust/minecraft-rs/.gitignore
rename to infinite-client/crates/infinite-client/.gitignore
diff --git a/rust/infinite-client/Cargo.toml b/infinite-client/crates/infinite-client/Cargo.toml
similarity index 92%
rename from rust/infinite-client/Cargo.toml
rename to infinite-client/crates/infinite-client/Cargo.toml
index 9c0c7111..93ef67b3 100644
--- a/rust/infinite-client/Cargo.toml
+++ b/infinite-client/crates/infinite-client/Cargo.toml
@@ -12,7 +12,6 @@ lyon = "1.0.16"
 rustc-hash = "2.1.0"
 rayon = "1.10.0"
 xross-core = { workspace = true, features = ["xross-alloc"] }
-minecraft-rs.workspace = true
 atomic_enum = "0.3.0"
 parking_lot.workspace = true
 glam = "0.32.0"
diff --git a/infinite-client/crates/infinite-client/rust-toolchain.toml b/infinite-client/crates/infinite-client/rust-toolchain.toml
new file mode 100644
index 00000000..45f1a47f
--- /dev/null
+++ b/infinite-client/crates/infinite-client/rust-toolchain.toml
@@ -0,0 +1,11 @@
+[toolchain]
+channel = "nightly"
+components = ["rust-src", "rust-analyzer", "rustfmt"]
+targets = [
+  "x86_64-unknown-linux-gnu",
+  "aarch64-unknown-linux-gnu",
+  "x86_64-pc-windows-gnu",
+  "aarch64-pc-windows-gnullvm",
+  "x86_64-apple-darwin",
+  "aarch64-apple-darwin",
+]
diff --git a/rust/infinite-client/src/graphics2d.rs b/infinite-client/crates/infinite-client/src/graphics2d.rs
similarity index 100%
rename from rust/infinite-client/src/graphics2d.rs
rename to infinite-client/crates/infinite-client/src/graphics2d.rs
diff --git a/rust/infinite-client/src/graphics2d/path2d.rs b/infinite-client/crates/infinite-client/src/graphics2d/path2d.rs
similarity index 99%
rename from rust/infinite-client/src/graphics2d/path2d.rs
rename to infinite-client/crates/infinite-client/src/graphics2d/path2d.rs
index e82b3bfd..944e27c1 100644
--- a/rust/infinite-client/src/graphics2d/path2d.rs
+++ b/infinite-client/crates/infinite-client/src/graphics2d/path2d.rs
@@ -1,8 +1,8 @@
+use crate::utils::color::Color;
 use lyon::lyon_tessellation::{FillVertex, GeometryBuilderError, VertexId};
 use lyon::math::point;
 use lyon::path::{FillRule, LineCap, LineJoin, Path};
 use lyon::tessellation::{FillGeometryBuilder, FillOptions, FillTessellator, GeometryBuilder};
-use minecraft_rs::color::Color;
 use std::f64::consts::PI;
 use xross_core::{XrossClass, xross_methods};
 
diff --git a/rust/infinite-client/src/graphics3d.rs b/infinite-client/crates/infinite-client/src/graphics3d.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d.rs
rename to infinite-client/crates/infinite-client/src/graphics3d.rs
diff --git a/rust/infinite-client/src/graphics3d/mesh.rs b/infinite-client/crates/infinite-client/src/graphics3d/mesh.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d/mesh.rs
rename to infinite-client/crates/infinite-client/src/graphics3d/mesh.rs
diff --git a/rust/infinite-client/src/graphics3d/mesh/block_mesh.rs b/infinite-client/crates/infinite-client/src/graphics3d/mesh/block_mesh.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d/mesh/block_mesh.rs
rename to infinite-client/crates/infinite-client/src/graphics3d/mesh/block_mesh.rs
diff --git a/rust/infinite-client/src/graphics3d/mesh/generator.rs b/infinite-client/crates/infinite-client/src/graphics3d/mesh/generator.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d/mesh/generator.rs
rename to infinite-client/crates/infinite-client/src/graphics3d/mesh/generator.rs
diff --git a/rust/infinite-client/src/graphics3d/mesh/infinite_mesh.rs b/infinite-client/crates/infinite-client/src/graphics3d/mesh/infinite_mesh.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d/mesh/infinite_mesh.rs
rename to infinite-client/crates/infinite-client/src/graphics3d/mesh/infinite_mesh.rs
diff --git a/rust/infinite-client/src/graphics3d/mesh/types.rs b/infinite-client/crates/infinite-client/src/graphics3d/mesh/types.rs
similarity index 100%
rename from rust/infinite-client/src/graphics3d/mesh/types.rs
rename to infinite-client/crates/infinite-client/src/graphics3d/mesh/types.rs
diff --git a/rust/infinite-client/src/infinite.rs b/infinite-client/crates/infinite-client/src/infinite.rs
similarity index 100%
rename from rust/infinite-client/src/infinite.rs
rename to infinite-client/crates/infinite-client/src/infinite.rs
diff --git a/rust/infinite-client/src/infinite/feature.rs b/infinite-client/crates/infinite-client/src/infinite/feature.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature.rs
diff --git a/rust/infinite-client/src/infinite/feature/global.rs b/infinite-client/crates/infinite-client/src/infinite/feature/global.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature/global.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/global.rs
diff --git a/rust/infinite-client/src/infinite/feature/local.rs b/infinite-client/crates/infinite-client/src/infinite/feature/local.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature/local.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/local.rs
diff --git a/rust/infinite-client/src/infinite/feature/local/level.rs b/infinite-client/crates/infinite-client/src/infinite/feature/local/level.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature/local/level.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/local/level.rs
diff --git a/rust/infinite-client/src/infinite/feature/local/level/block_highlight.rs b/infinite-client/crates/infinite-client/src/infinite/feature/local/level/block_highlight.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature/local/level/block_highlight.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/local/level/block_highlight.rs
diff --git a/rust/infinite-client/src/infinite/feature/local/level/block_highlight/settings.rs b/infinite-client/crates/infinite-client/src/infinite/feature/local/level/block_highlight/settings.rs
similarity index 100%
rename from rust/infinite-client/src/infinite/feature/local/level/block_highlight/settings.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/local/level/block_highlight/settings.rs
diff --git a/rust/infinite-client/src/infinite/feature/local/level/cave_highlight.rs b/infinite-client/crates/infinite-client/src/infinite/feature/local/level/cave_highlight.rs
similarity index 91%
rename from rust/infinite-client/src/infinite/feature/local/level/cave_highlight.rs
rename to infinite-client/crates/infinite-client/src/infinite/feature/local/level/cave_highlight.rs
index 2590acd3..af0d8aed 100644
--- a/rust/infinite-client/src/infinite/feature/local/level/cave_highlight.rs
+++ b/infinite-client/crates/infinite-client/src/infinite/feature/local/level/cave_highlight.rs
@@ -13,7 +13,7 @@ impl CaveHighlightFeature {
     pub fn new() -> Self {
         Self {}
     }
-    fn instance() -> &'static Self {
+    pub fn instance() -> &'static Self {
         &INFINITE_CLIENT.features.local.level_features.cave_highlight
     }
 }
diff --git a/rust/infinite-client/src/infinite/property.rs b/infinite-client/crates/infinite-client/src/infinite/property.rs
similarity index 94%
rename from rust/infinite-client/src/infinite/property.rs
rename to infinite-client/crates/infinite-client/src/infinite/property.rs
index 06ddce68..63f31539 100644
--- a/rust/infinite-client/src/infinite/property.rs
+++ b/infinite-client/crates/infinite-client/src/infinite/property.rs
@@ -1,4 +1,4 @@
-use minecraft_rs::color::Color;
+use crate::utils::color::Color;
 
 #[derive(Debug, Clone)]
 pub struct BlockAndColor {
diff --git a/rust/infinite-client/src/lib.rs b/infinite-client/crates/infinite-client/src/lib.rs
similarity index 64%
rename from rust/infinite-client/src/lib.rs
rename to infinite-client/crates/infinite-client/src/lib.rs
index ba121457..52bb88a8 100644
--- a/rust/infinite-client/src/lib.rs
+++ b/infinite-client/crates/infinite-client/src/lib.rs
@@ -1,8 +1,5 @@
-#![feature(offset_of_enum)]
-
 pub mod graphics2d;
 pub mod graphics3d;
 pub mod infinite;
 pub mod projectile;
 pub mod utils;
-pub use minecraft_rs;
diff --git a/rust/infinite-client/src/projectile.rs b/infinite-client/crates/infinite-client/src/projectile.rs
similarity index 100%
rename from rust/infinite-client/src/projectile.rs
rename to infinite-client/crates/infinite-client/src/projectile.rs
diff --git a/rust/infinite-client/src/utils.rs b/infinite-client/crates/infinite-client/src/utils.rs
similarity index 51%
rename from rust/infinite-client/src/utils.rs
rename to infinite-client/crates/infinite-client/src/utils.rs
index 652223fd..e7f1c412 100644
--- a/rust/infinite-client/src/utils.rs
+++ b/infinite-client/crates/infinite-client/src/utils.rs
@@ -1 +1,2 @@
 pub mod atomic;
+pub mod color;
diff --git a/rust/infinite-client/src/utils/atomic.rs b/infinite-client/crates/infinite-client/src/utils/atomic.rs
similarity index 100%
rename from rust/infinite-client/src/utils/atomic.rs
rename to infinite-client/crates/infinite-client/src/utils/atomic.rs
diff --git a/rust/minecraft-rs/src/color.rs b/infinite-client/crates/infinite-client/src/utils/color.rs
similarity index 100%
rename from rust/minecraft-rs/src/color.rs
rename to infinite-client/crates/infinite-client/src/utils/color.rs
diff --git a/project-xross b/project-xross
index b1ca829e..bc8845dc 160000
--- a/project-xross
+++ b/project-xross
@@ -1 +1 @@
-Subproject commit b1ca829e0bb46a958327152270ca02d1f553364e
+Subproject commit bc8845dca6c834748b5d1c0036f947f96f899429
diff --git a/qodana.yaml b/qodana.yaml
index 5e7b3298..b76724e2 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -43,12 +43,11 @@ projectJDK: "25" #(Applied in CI/CD pipeline)
 #  testCoverageThresholds:
 #    fresh: 70
 #    total: 50
-  
+
 #Qodana supports other languages, for example, Python, JavaScript, TypeScript, Go, C#, PHP
 #For all supported languages see https://www.jetbrains.com/help/qodana/linters.html
 linter: jetbrains/qodana-jvm-community:2025.3
 
-
 exclude:
   # "Condition is always false" (LocalPlayerへのinstanceof等) を抑制
   - name: ConstantValue
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e4a99db4..45f1a47f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,10 +2,10 @@
 channel = "nightly"
 components = ["rust-src", "rust-analyzer", "rustfmt"]
 targets = [
-    "x86_64-unknown-linux-gnu",
-    "aarch64-unknown-linux-gnu",
-    "x86_64-pc-windows-gnu",
-    "aarch64-pc-windows-gnullvm",
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin"
+  "x86_64-unknown-linux-gnu",
+  "aarch64-unknown-linux-gnu",
+  "x86_64-pc-windows-gnu",
+  "aarch64-pc-windows-gnullvm",
+  "x86_64-apple-darwin",
+  "aarch64-apple-darwin",
 ]
diff --git a/rust/infinite-client/rust-toolchain.toml b/rust/infinite-client/rust-toolchain.toml
deleted file mode 100644
index e4a99db4..00000000
--- a/rust/infinite-client/rust-toolchain.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[toolchain]
-channel = "nightly"
-components = ["rust-src", "rust-analyzer", "rustfmt"]
-targets = [
-    "x86_64-unknown-linux-gnu",
-    "aarch64-unknown-linux-gnu",
-    "x86_64-pc-windows-gnu",
-    "aarch64-pc-windows-gnullvm",
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin"
-]
diff --git a/rust/minecraft-rs/Cargo.toml b/rust/minecraft-rs/Cargo.toml
deleted file mode 100644
index d7e4b1b0..00000000
--- a/rust/minecraft-rs/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "minecraft-rs"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-
-[dependencies]
-xross-core.workspace = true
-rayon = "1.11.0"
-parking_lot.workspace = true
-wgpu = "28.0.0"
-pollster = "0.4.0"
diff --git a/rust/minecraft-rs/src/lib.rs b/rust/minecraft-rs/src/lib.rs
deleted file mode 100644
index 81164f8b..00000000
--- a/rust/minecraft-rs/src/lib.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod color;
-pub mod mgpu3d;
diff --git a/rust/minecraft-rs/src/mgpu3d.rs b/rust/minecraft-rs/src/mgpu3d.rs
deleted file mode 100644
index 98f05ecf..00000000
--- a/rust/minecraft-rs/src/mgpu3d.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod child;
-mod parent;
diff --git a/rust/minecraft-rs/src/mgpu3d/child.rs b/rust/minecraft-rs/src/mgpu3d/child.rs
deleted file mode 100644
index a2d5fb0d..00000000
--- a/rust/minecraft-rs/src/mgpu3d/child.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub struct MinecraftGpu3dChild {
-    width: u32,
-    height: u32,
-}
-
-impl MinecraftGpu3dChild {
-    pub fn new(width: u32, height: u32) -> Self {
-        Self { width, height }
-    }
-}
diff --git a/rust/minecraft-rs/src/mgpu3d/parent.rs b/rust/minecraft-rs/src/mgpu3d/parent.rs
deleted file mode 100644
index d46d881e..00000000
--- a/rust/minecraft-rs/src/mgpu3d/parent.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-mod handle_manager;
-use handle_manager::MGpu3dHandleManager;
-pub use handle_manager::MinecraftGpu3dHandle;
-use std::{
-    ffi::c_void,
-    ptr::null_mut,
-    sync::{
-        LazyLock,
-        atomic::{self, AtomicPtr, AtomicU32},
-    },
-};
-use xross_core::{XrossClass, xross_methods};
-
-use super::child::MinecraftGpu3dChild;
-#[derive(XrossClass)]
-pub struct MGpu3dSystem {
-    buffer_address: AtomicPtr<std::ffi::c_void>,
-    width: AtomicU32,
-    height: AtomicU32,
-    device: wgpu::Device,
-    queue: wgpu::Queue,
-    handle_manager: MGpu3dHandleManager,
-}
-impl Default for MGpu3dSystem {
-    fn default() -> Self {
-        // wgpuの初期化フローを同期的に実行
-        let (device, queue) = pollster::block_on(async {
-            let instance = wgpu::Instance::default();
-
-            let adapter = instance
-                .request_adapter(&wgpu::RequestAdapterOptions {
-                    power_preference: wgpu::PowerPreference::HighPerformance,
-                    force_fallback_adapter: false,
-                    compatible_surface: None, // 外部バッファ書き込みならNoneでOK
-                })
-                .await
-                .expect("Failed to find an appropriate wgpu adapter");
-
-            adapter
-                .request_device(&wgpu::DeviceDescriptor {
-                    label: Some("MinecraftGpu3d Device"),
-                    required_features: wgpu::Features::empty(),
-                    experimental_features: wgpu::ExperimentalFeatures::disabled(),
-                    trace: wgpu::Trace::default(),
-                    required_limits: wgpu::Limits::default(),
-                    memory_hints: wgpu::MemoryHints::default(),
-                })
-                .await
-                .expect("Failed to create wgpu device")
-        });
-
-        Self {
-            buffer_address: AtomicPtr::new(null_mut::<c_void>()),
-            width: AtomicU32::new(0),
-            height: AtomicU32::new(0),
-            device,
-            queue,
-            handle_manager: MGpu3dHandleManager::new(),
-        }
-    }
-}
-
-static M_GPU_3D_SYSTEM: LazyLock<MGpu3dSystem> = LazyLock::new(MGpu3dSystem::default);
-
-#[xross_methods]
-impl MGpu3dSystem {
-    fn this() -> &'static Self {
-        &M_GPU_3D_SYSTEM
-    }
-    #[xross_raw_method{
-        args = (buf: *mut std::ffi::c_void,width:u32,height:u32);
-        import = |buf,width,height|{(buf,width,height)};
-        export = ||{};
-    }]
-    pub fn init(buf: *mut c_void, width: u32, height: u32) {
-        let buf = buf as usize;
-        let _ = std::thread::spawn(move || {
-            let buf = buf as *mut c_void;
-            Self::this().on_init(buf, width, height);
-        });
-    }
-    fn on_init(&self, buf: *mut c_void, width: u32, height: u32) {
-        self.buffer_address.store(buf, atomic::Ordering::Relaxed);
-        self.width.store(width, atomic::Ordering::Relaxed);
-        self.height.store(height, atomic::Ordering::Relaxed);
-    }
-    #[xross_method(critical)]
-    pub fn resize_window(width: u32, height: u32) {
-        Self::this().on_resize_window(width, height);
-    }
-    fn on_resize_window(&self, width: u32, height: u32) {
-        self.width.store(width, atomic::Ordering::Relaxed);
-        self.height.store(height, atomic::Ordering::Relaxed);
-    }
-    #[xross_method(critical)]
-    pub fn start() {
-        Self::this().on_start();
-    }
-    fn on_start(&self) {}
-    #[xross_method(critical)]
-    pub fn stop() {
-        Self::this().on_stop();
-    }
-    fn on_stop(&self) {}
-    pub fn add_handle(handle: Box<dyn MinecraftGpu3dHandle>) -> usize {
-        Self::this().on_add_handle(handle)
-    }
-    fn on_add_handle(&self, handle: Box<dyn MinecraftGpu3dHandle>) -> usize {
-        self.handle_manager.add_handle(handle)
-    }
-    pub(crate) fn child(&self) -> MinecraftGpu3dChild {
-        MinecraftGpu3dChild::new(
-            self.width.load(atomic::Ordering::Relaxed),
-            self.height.load(atomic::Ordering::Relaxed),
-        )
-    }
-}
diff --git a/rust/minecraft-rs/src/mgpu3d/parent/handle_manager.rs b/rust/minecraft-rs/src/mgpu3d/parent/handle_manager.rs
deleted file mode 100644
index 1884bfe2..00000000
--- a/rust/minecraft-rs/src/mgpu3d/parent/handle_manager.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use parking_lot::RwLock;
-use std::collections::VecDeque;
-
-type OptionalHandle = Option<Box<dyn MinecraftGpu3dHandle>>;
-
-pub trait MinecraftGpu3dHandle: Send + Sync {
-    // マルチスレッドで扱うならSend+Syncが必要
-    fn render(&self);
-}
-
-pub struct MGpu3dHandleManager {
-    handles: RwLock<Vec<OptionalHandle>>,
-    free_ids: RwLock<VecDeque<usize>>,
-}
-impl Default for MGpu3dHandleManager {
-    fn default() -> Self {
-        Self {
-            handles: RwLock::new(Vec::new()),
-            free_ids: RwLock::new(VecDeque::new()),
-        }
-    }
-}
-
-impl MGpu3dHandleManager {
-    pub const INVALID_ID: usize = usize::MAX;
-
-    pub fn new() -> Self {
-        Self {
-            handles: RwLock::new(Vec::new()),
-            free_ids: RwLock::new(VecDeque::new()),
-        }
-    }
-
-    pub fn add_handle(&self, handle: Box<dyn MinecraftGpu3dHandle>) -> usize {
-        // 空きスロットがあるか確認
-        if let Some(id) = self.free_ids.write().pop_front() {
-            self.handles.write()[id] = Some(handle);
-            id
-        } else {
-            let mut handles = self.handles.write();
-            let id = handles.len();
-            handles.push(Some(handle));
-            id
-        }
-    }
-
-    pub fn remove_handle(&self, id: usize) -> Option<Box<dyn MinecraftGpu3dHandle>> {
-        let mut handles = self.handles.write();
-        if id >= handles.len() {
-            return None;
-        }
-
-        let handle = handles[id].take();
-        if handle.is_some() {
-            // 削除に成功したら空きIDリストに追加
-            self.free_ids.write().push_back(id);
-        }
-        handle
-    }
-
-    pub fn render_all(&self) {
-        let handles = self.handles.read();
-        for handle in handles.iter().flatten() {
-            handle.render();
-        }
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d89f3a47..12c52364 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,10 +19,11 @@ pluginManagement {
     }
 
     val loomVersion: String by settings
+    val kotlinVersion: String by settings
     plugins {
-        id("fabric-loom") version loomVersion
-        id("org.jetbrains.kotlin.jvm") version "2.3.10"
-        id("org.jetbrains.kotlin.plugin.serialization") version "2.3.10"
+        id("net.fabricmc.fabric-loom") version loomVersion
+        id("org.jetbrains.kotlin.jvm") version kotlinVersion
+        id("org.jetbrains.kotlin.plugin.serialization") version kotlinVersion
     }
 }
 
diff --git a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredQuadRenderState.java b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredQuadRenderState.java
index 4b01f1cf..c45ca827 100644
--- a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredQuadRenderState.java
+++ b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredQuadRenderState.java
@@ -6,7 +6,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import org.joml.Matrix3x2fc;
 import org.jspecify.annotations.Nullable;
 
diff --git a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredRectangleRenderState.java b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredRectangleRenderState.java
index 8c7517fe..dfa7496a 100644
--- a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredRectangleRenderState.java
+++ b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredRectangleRenderState.java
@@ -6,7 +6,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import org.joml.Matrix3x2fc;
 import org.jspecify.annotations.Nullable;
 
diff --git a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredTriangleRenderState.java b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredTriangleRenderState.java
index ce3e74c7..a6a5f2e0 100644
--- a/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredTriangleRenderState.java
+++ b/src/client/java/org/infinite/libs/graphics/graphics2d/elements/ColoredTriangleRenderState.java
@@ -6,7 +6,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import org.joml.Matrix3x2fc;
 import org.jspecify.annotations.Nullable;
 
diff --git a/src/client/java/org/infinite/mixin/graphics/GuiGraphicsAccessor.java b/src/client/java/org/infinite/mixin/graphics/GuiGraphicsAccessor.java
index a5e2e5ec..2a7edfac 100644
--- a/src/client/java/org/infinite/mixin/graphics/GuiGraphicsAccessor.java
+++ b/src/client/java/org/infinite/mixin/graphics/GuiGraphicsAccessor.java
@@ -1,12 +1,12 @@
 package org.infinite.mixin.graphics;
 
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.render.state.GuiRenderState;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.network.chat.Style;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(GuiGraphics.class)
+@Mixin(GuiGraphicsExtractor.class)
 public interface GuiGraphicsAccessor {
 
   @Accessor("hoveredTextStyle")
diff --git a/src/client/java/org/infinite/mixin/graphics/GuiGraphicsMixin.java b/src/client/java/org/infinite/mixin/graphics/GuiGraphicsExtractorMixin.java
similarity index 66%
rename from src/client/java/org/infinite/mixin/graphics/GuiGraphicsMixin.java
rename to src/client/java/org/infinite/mixin/graphics/GuiGraphicsExtractorMixin.java
index 27d86198..e33c70bf 100644
--- a/src/client/java/org/infinite/mixin/graphics/GuiGraphicsMixin.java
+++ b/src/client/java/org/infinite/mixin/graphics/GuiGraphicsExtractorMixin.java
@@ -4,11 +4,11 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ActiveTextCollector;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.font.FontSet;
-import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.render.state.GuiTextRenderState;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState;
 import net.minecraft.network.chat.Style;
 import net.minecraft.util.ARGB;
 import net.minecraft.util.FormattedCharSequence;
@@ -29,46 +29,44 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(GuiGraphics.class)
-public class GuiGraphicsMixin {
-  @Shadow @Final Minecraft minecraft;
+@Mixin(GuiGraphicsExtractor.class)
+public class GuiGraphicsExtractorMixin {
+  @Shadow @Final private Minecraft minecraft;
   @Shadow @Final public GuiRenderState guiRenderState;
-  @Shadow @Final public GuiGraphics.ScissorStack scissorStack;
   @Shadow @Final private Matrix3x2fStack pose;
 
+  @Shadow @Final public GuiGraphicsExtractor.ScissorStack scissorStack;
+
   @Unique
   @SuppressWarnings("DataFlowIssue")
-  private GuiGraphics self() {
-    return (GuiGraphics) (Object) this;
+  private GuiGraphicsExtractor self() {
+    return (GuiGraphicsExtractor) (Object) this;
   }
 
   // 1. 標準の textRenderer: 常に不透明 (1.0F)
   @Inject(
       method =
-          "textRenderer(Lnet/minecraft/client/gui/GuiGraphics$HoveredTextEffects;Ljava/util/function/Consumer;)Lnet/minecraft/client/gui/ActiveTextCollector;",
+          "textRenderer(Lnet/minecraft/client/gui/GuiGraphicsExtractor$HoveredTextEffects;Ljava/util/function/Consumer;)Lnet/minecraft/client/gui/ActiveTextCollector;",
       at = @At("HEAD"),
       cancellable = true)
   public void onTextRenderer(
-      GuiGraphics.HoveredTextEffects hoveredTextEffects,
-      @Nullable Consumer<Style> consumer,
+      GuiGraphicsExtractor.HoveredTextEffects hoveredTextEffects,
+      @Nullable Consumer<Style> additionalHoverStyleConsumer,
       CallbackInfoReturnable<ActiveTextCollector> cir) {
 
-    cir.setReturnValue(new ModernTextRenderer(self(), hoveredTextEffects, 1.0F, consumer));
+    cir.setReturnValue(
+        new ModernTextRenderer(self(), hoveredTextEffects, 1.0F, additionalHoverStyleConsumer));
   }
 
   // 2. ウィジェット用: ウィジェットの透過度を取得して渡す
-  @Inject(
-      method =
-          "textRendererForWidget(Lnet/minecraft/client/gui/components/AbstractWidget;Lnet/minecraft/client/gui/GuiGraphics$HoveredTextEffects;)Lnet/minecraft/client/gui/ActiveTextCollector;",
-      at = @At("HEAD"),
-      cancellable = true)
+  @Inject(method = "textRendererForWidget", at = @At("HEAD"), cancellable = true)
   public void onTextRendererForWidget(
-      AbstractWidget abstractWidget,
-      GuiGraphics.HoveredTextEffects hoveredTextEffects,
+      AbstractWidget owner,
+      GuiGraphicsExtractor.HoveredTextEffects hoveredTextEffects,
       CallbackInfoReturnable<ActiveTextCollector> cir) {
 
     // ここでウィジェットの alpha を抽出
-    float alpha = abstractWidget.getAlpha();
+    float alpha = owner.getAlpha();
 
     cir.setReturnValue(new ModernTextRenderer(self(), hoveredTextEffects, alpha, null));
   }
@@ -76,18 +74,18 @@ public void onTextRendererForWidget(
   // 3. 直接描画用 (以前のロジックを維持)
   @Inject(
       method =
-          "drawString(Lnet/minecraft/client/gui/Font;Lnet/minecraft/util/FormattedCharSequence;IIIZ)V",
+          "text(Lnet/minecraft/client/gui/Font;Lnet/minecraft/util/FormattedCharSequence;IIIZ)V",
       at = @At("HEAD"),
       cancellable = true)
   public void onDrawString(
       Font font,
-      FormattedCharSequence formattedCharSequence,
-      int i,
-      int j,
-      int k,
-      boolean bl,
+      FormattedCharSequence str,
+      int x,
+      int y,
+      int color,
+      boolean dropShadow,
       CallbackInfo ci) {
-    if (ARGB.alpha(k) == 0) return;
+    if (ARGB.alpha(color) == 0) return;
 
     if (InfiniteClient.INSTANCE
         .getGlobalFeatures()
@@ -96,22 +94,22 @@ public void onDrawString(
         .isEnabled()) {
       IModernFontManager fontManager =
           (IModernFontManager) ((MinecraftAccessor) this.minecraft).getFontManager();
-      Style originalStyle = extractStyle(formattedCharSequence);
+      Style originalStyle = extractStyle(str);
       FontSet fontSet = fontManager.infinite$fontSetFromStyle(originalStyle);
       Font modernFont = FontFromFontSetKt.fromFontSet(fontSet);
 
-      FormattedCharSequence noBoldSequence = stripBold(formattedCharSequence);
+      FormattedCharSequence noBoldSequence = stripBold(str);
 
-      this.guiRenderState.submitText(
+      this.guiRenderState.addText(
           new GuiTextRenderState(
               modernFont,
               noBoldSequence,
               new Matrix3x2f(this.pose),
-              i,
-              j,
-              k,
+              x,
+              y,
+              color,
               0,
-              bl,
+              dropShadow,
               false,
               this.scissorStack.peek()));
       ci.cancel();
diff --git a/src/client/java/org/infinite/mixin/graphics/LevelRendererMixin.java b/src/client/java/org/infinite/mixin/graphics/LevelRendererMixin.java
index e2bdf960..a795c478 100644
--- a/src/client/java/org/infinite/mixin/graphics/LevelRendererMixin.java
+++ b/src/client/java/org/infinite/mixin/graphics/LevelRendererMixin.java
@@ -2,11 +2,12 @@
 
 import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
-import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import net.minecraft.client.renderer.state.level.CameraRenderState;
 import org.infinite.libs.core.tick.RenderTicks;
-import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
 import org.joml.Vector4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -15,37 +16,27 @@
 
 @Mixin(LevelRenderer.class)
 public abstract class LevelRendererMixin {
-  @Inject(
-      at =
-          @At(
-              value = "INVOKE",
-              target =
-                  "Lnet/minecraft/client/renderer/debug/GameTestBlockHighlightRenderer;emitGizmos()V",
-              shift = At.Shift.AFTER),
-      method =
-          "renderLevel(Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V")
+  @Inject(at = @At("TAIL"), method = "renderLevel")
   private void onRender(
-      GraphicsResourceAllocator graphicsResourceAllocator,
+      GraphicsResourceAllocator resourceAllocator,
       DeltaTracker deltaTracker,
-      boolean renderBlockOutline,
-      Camera camera,
-      Matrix4f positionMatrix,
-      Matrix4f projectionMatrix,
-      Matrix4f frustumMatrix,
-      GpuBufferSlice gpuBufferSlice,
-      Vector4f vector4f,
-      boolean bl2,
+      boolean renderOutline,
+      CameraRenderState cameraState,
+      Matrix4fc modelViewMatrix,
+      GpuBufferSlice terrainFog,
+      Vector4f fogColor,
+      boolean shouldRenderSky,
+      ChunkSectionsToRender chunkSectionsToRender,
       CallbackInfo ci) {
     RenderTicks.INSTANCE.onLevelRendering(
-        graphicsResourceAllocator,
+        resourceAllocator,
         deltaTracker,
-        renderBlockOutline,
-        camera,
-        positionMatrix,
-        projectionMatrix,
-        frustumMatrix,
-        gpuBufferSlice,
-        vector4f,
-        bl2);
+        renderOutline,
+        cameraState,
+        modelViewMatrix,
+        terrainFog,
+        fogColor,
+        shouldRenderSky,
+        chunkSectionsToRender);
   }
 }
diff --git a/src/client/java/org/infinite/mixin/graphics/MinecraftMixin.java b/src/client/java/org/infinite/mixin/graphics/MinecraftMixin.java
index 16915aa2..636c8c03 100644
--- a/src/client/java/org/infinite/mixin/graphics/MinecraftMixin.java
+++ b/src/client/java/org/infinite/mixin/graphics/MinecraftMixin.java
@@ -4,7 +4,7 @@
 import net.minecraft.client.gui.font.FontManager;
 import net.minecraft.client.renderer.PlayerSkinRenderCache;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.resources.model.AtlasManager;
+import net.minecraft.client.resources.model.sprite.AtlasManager;
 import org.infinite.libs.graphics.text.ModernFontManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/client/java/org/infinite/mixin/graphics/UiMixin.java b/src/client/java/org/infinite/mixin/graphics/UiMixin.java
index b04bfc62..f49f00be 100644
--- a/src/client/java/org/infinite/mixin/graphics/UiMixin.java
+++ b/src/client/java/org/infinite/mixin/graphics/UiMixin.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import org.infinite.libs.core.tick.RenderTicks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -12,13 +12,15 @@
 @Mixin(Gui.class)
 public class UiMixin {
 
-  @Inject(method = "render", at = @At("HEAD"))
-  public void onRenderHead(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
+  @Inject(method = "extractRenderState", at = @At("HEAD"))
+  public void onExtractHead(
+      GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
     RenderTicks.INSTANCE.onStartUiRendering(guiGraphics, deltaTracker);
   }
 
-  @Inject(method = "render", at = @At("TAIL"))
-  public void onRenderTail(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
+  @Inject(method = "extractRenderState", at = @At("TAIL"))
+  public void onExtractTail(
+      GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
     RenderTicks.INSTANCE.onEndUiRendering(guiGraphics, deltaTracker);
   }
 }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/loading/LoadingOverlayMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/loading/LoadingOverlayMixin.java
index 4619f2a3..226da352 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/loading/LoadingOverlayMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/loading/LoadingOverlayMixin.java
@@ -1,7 +1,6 @@
 package org.infinite.mixin.infinite.features.global.rendering.loading;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.LoadingOverlay;
 import net.minecraft.util.Mth;
 import net.minecraft.util.Util;
@@ -23,13 +22,9 @@ public abstract class LoadingOverlayMixin {
   @Shadow private long fadeInStart;
   @Shadow private long fadeOutStart;
 
-  @Shadow @Final private Minecraft minecraft;
-
-  @Inject(
-      method = "render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V",
-      at = @At("TAIL"),
-      cancellable = true)
-  private void onRender(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) {
+  @Inject(method = "extractRenderState", at = @At("TAIL"), cancellable = true)
+  private void onRender(
+      GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a, CallbackInfo ci) {
     InfiniteLoadingFeature feature =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getInfiniteLoadingFeature();
 
@@ -38,19 +33,19 @@ private void onRender(GuiGraphics guiGraphics, int i, int j, float f, CallbackIn
       float opacity = getOpacity();
 
       // 座標計算 (ソースコードの n, p, q, r を再現)
-      int centerX = (int) ((double) guiGraphics.guiWidth() * 0.5D);
-      int centerY = (int) ((double) guiGraphics.guiHeight() * 0.5D);
-      double d = Math.min((double) guiGraphics.guiWidth() * 0.75D, guiGraphics.guiHeight()) * 0.25D;
+      int centerX = (int) ((double) graphics.guiWidth() * 0.5D);
+      int centerY = (int) ((double) graphics.guiHeight() * 0.5D);
+      double d = Math.min((double) graphics.guiWidth() * 0.75D, graphics.guiHeight()) * 0.25D;
       int logoHeightHalf = (int) (d * 0.5D);
       double e = d * 4.0D;
       int logoWidthHalf = (int) (e * 0.5D);
       // コンテキストの作成
       InfiniteLoadingFeature.LoadingRenderContext context =
           new InfiniteLoadingFeature.LoadingRenderContext(
-              guiGraphics,
-              i,
-              j,
-              f,
+              graphics,
+              mouseX,
+              mouseY,
+              a,
               opacity,
               this.currentProgress,
               centerX,
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ButtonBackgroundMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ButtonBackgroundMixin.java
index 0101cef0..1c874669 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ButtonBackgroundMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ButtonBackgroundMixin.java
@@ -1,6 +1,6 @@
 package org.infinite.mixin.infinite.features.global.rendering.theme;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.components.AbstractWidget;
 import org.infinite.InfiniteClient;
@@ -20,13 +20,13 @@ public ButtonBackgroundMixin(
     super(i, j, k, l, component);
   }
 
-  @Inject(method = "renderDefaultSprite", at = @At("HEAD"), cancellable = true)
-  private void onRenderDefaultSprite(GuiGraphics guiGraphics, CallbackInfo ci) {
+  @Inject(method = "extractDefaultSprite", at = @At("HEAD"), cancellable = true)
+  private void onExtractDefaultSprite(GuiGraphicsExtractor graphics, CallbackInfo ci) {
     ThemeFeature themeFeature =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getThemeFeature();
     if (!themeFeature.isEnabled()) return;
 
-    Graphics2DRenderer renderer = new Graphics2DRenderer(guiGraphics);
+    Graphics2DRenderer renderer = new Graphics2DRenderer(graphics);
 
     WidgetRenderUtils.INSTANCE.renderCustomBackground(this, renderer);
 
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/EditBoxMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/EditBoxMixin.java
index dca7ad4a..d0a71846 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/EditBoxMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/EditBoxMixin.java
@@ -1,6 +1,6 @@
 package org.infinite.mixin.infinite.features.global.rendering.theme;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.network.chat.Component;
@@ -17,9 +17,9 @@ public EditBoxMixin(int i, int j, int k, int l, Component component) {
     super(i, j, k, l, component);
   }
 
-  @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
-  protected void onRenderWidget(
-      GuiGraphics guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+  @Inject(method = "extractWidgetRenderState", at = @At("HEAD"), cancellable = true)
+  protected void onExtractWidgetRenderState(
+      GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
     ThemeFeature theme =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getThemeFeature();
 
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ScrollWidgetMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ScrollWidgetMixin.java
index f60b2552..38e02e7d 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ScrollWidgetMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/ScrollWidgetMixin.java
@@ -1,7 +1,7 @@
 // ScrollWidgetMixin.java
 package org.infinite.mixin.infinite.features.global.rendering.theme;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractScrollArea;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
@@ -19,8 +19,9 @@ public ScrollWidgetMixin(int i, int j, int k, int l, Component component) {
     super(i, j, k, l, component);
   }
 
-  @Inject(method = "renderScrollbar", at = @At("HEAD"), cancellable = true)
-  private void onRenderScrollBar(GuiGraphics guiGraphics, int mouseX, int mouseY, CallbackInfo ci) {
+  @Inject(method = "extractScrollbar", at = @At("HEAD"), cancellable = true)
+  private void onRenderScrollBar(
+      GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, CallbackInfo ci) {
     ThemeFeature theme =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getThemeFeature();
 
@@ -28,7 +29,7 @@ private void onRenderScrollBar(GuiGraphics guiGraphics, int mouseX, int mouseY,
       // AbstractScrollArea 用の専用メソッドを呼び出す
       theme
           .getScrollWidgetRenderer()
-          .renderScrollbar((AbstractScrollArea) (Object) this, guiGraphics, mouseX, mouseY);
+          .extractScrollbar((AbstractScrollArea) (Object) this, guiGraphics, mouseX, mouseY);
       ci.cancel();
     }
   }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/SliderButtonMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/SliderButtonMixin.java
index 87ddfb11..074329da 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/SliderButtonMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/SliderButtonMixin.java
@@ -1,7 +1,7 @@
 // SliderButtonMixin.java
 package org.infinite.mixin.infinite.features.global.rendering.theme;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
@@ -19,9 +19,9 @@ public SliderButtonMixin(int i, int j, int k, int l, Component component) {
     super(i, j, k, l, component);
   }
 
-  @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
-  protected void onRenderWidget(
-      GuiGraphics guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+  @Inject(method = "extractWidgetRenderState", at = @At("HEAD"), cancellable = true)
+  protected void onExtractWidgetRenderState(
+      GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
     ThemeFeature theme =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getThemeFeature();
 
diff --git a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/button/PlainButtonMixin.java b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/button/PlainButtonMixin.java
index 6e040ac1..1db51138 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/button/PlainButtonMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/global/rendering/theme/button/PlainButtonMixin.java
@@ -1,7 +1,7 @@
 // PlainButtonMixin.java
 package org.infinite.mixin.infinite.features.global.rendering.theme.button;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.PlainTextButton;
 import net.minecraft.network.chat.Component;
@@ -26,9 +26,9 @@ protected PlainButtonMixin(
     super(i, j, k, l, component, onPress, createNarration);
   }
 
-  @Inject(method = "renderContents", at = @At("HEAD"), cancellable = true)
+  @Inject(method = "extractContents", at = @At("HEAD"), cancellable = true)
   public void onRenderWidget(
-      GuiGraphics guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+      GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
     ThemeFeature theme =
         InfiniteClient.INSTANCE.getGlobalFeatures().getRendering().getThemeFeature();
 
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockModelLighterMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockModelLighterMixin.java
new file mode 100644
index 00000000..a910ad85
--- /dev/null
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockModelLighterMixin.java
@@ -0,0 +1,47 @@
+package org.infinite.mixin.infinite.features.local.level.xray;
+
+import com.mojang.blaze3d.vertex.QuadInstance;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.BlockModelLighter;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+import org.infinite.InfiniteClient;
+import org.infinite.infinite.features.local.level.xray.XRayFeature;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+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;
+
+@Mixin(BlockModelLighter.class)
+public class BlockModelLighterMixin {
+  @Unique
+  private XRayFeature feature() {
+    return InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature();
+  }
+
+  @Inject(method = "getLightCoords", at = @At("HEAD"), cancellable = true)
+  private void onGetLightCoords(
+      BlockState state,
+      BlockAndTintGetter level,
+      BlockPos relativePos,
+      CallbackInfoReturnable<Integer> cir) {
+    if (feature().shouldApply(state)) {
+      cir.setReturnValue(15728880);
+    }
+  }
+
+  @Inject(method = "prepareQuadAmbientOcclusion", at = @At("TAIL"))
+  private void onPrepareQuadAmbientOcclusion(
+      BlockAndTintGetter level,
+      BlockState state,
+      BlockPos centerPosition,
+      BakedQuad quad,
+      QuadInstance outputInstance,
+      CallbackInfo ci) {
+    if (feature().shouldApply(state)) outputInstance.scaleColor(1.0f);
+    outputInstance.setLightCoords(15728880);
+  }
+}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockStateBaseMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockStateBaseMixin.java
new file mode 100644
index 00000000..589a4be7
--- /dev/null
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/BlockStateBaseMixin.java
@@ -0,0 +1,26 @@
+package org.infinite.mixin.infinite.features.local.level.xray;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase;
+import org.infinite.InfiniteClient;
+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.CallbackInfoReturnable;
+
+@Mixin(BlockStateBase.class)
+public abstract class BlockStateBaseMixin {
+
+  /**
+   * ブロック自体の影（Shade）の計算を上書きします。 これにより、X-Ray有効時に地中の鉱石などが暗く沈むのを防ぎます。 1.0Fを返すことで、常に最大輝度のシェーディングになります。
+   */
+  @Inject(method = "getShadeBrightness", at = @At("RETURN"), cancellable = true)
+  private void onGetShadeBrightness(
+      BlockGetter level, BlockPos pos, CallbackInfoReturnable<Float> cir) {
+    if (InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature().isEnabled()) {
+      // 影をなくし、フラットな明るさにする
+      cir.setReturnValue(1.0F);
+    }
+  }
+}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ItemBlockRenderTypesMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ItemBlockRenderTypesMixin.java
index 89383563..e4fe8676 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ItemBlockRenderTypesMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ItemBlockRenderTypesMixin.java
@@ -1,26 +1,23 @@
 package org.infinite.mixin.infinite.features.local.level.xray;
 
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
+import com.mojang.blaze3d.platform.Transparency;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.client.renderer.chunk.SectionCompiler;
 import org.infinite.InfiniteClient;
 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.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-@Mixin(ItemBlockRenderTypes.class)
+@Mixin(SectionCompiler.class)
 public class ItemBlockRenderTypesMixin {
 
-  @Inject(method = "getChunkRenderType", at = @At("HEAD"), cancellable = true)
-  private static void onGetChunkRenderType(
-      BlockState blockState, CallbackInfoReturnable<ChunkSectionLayer> cir) {
+  @ModifyVariable(method = "getOrBeginLayer", at = @At("HEAD"), argsOnly = true, name = "layer")
+  private static ChunkSectionLayer onGetChunkRenderType(ChunkSectionLayer layer) {
     var xRay = InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature();
 
     if (xRay.isEnabled()) {
-      if (xRay.shouldIsolate(blockState)) {
-        cir.setReturnValue(ChunkSectionLayer.TRANSLUCENT);
-      }
+      return ChunkSectionLayer.byTransparency(Transparency.TRANSPARENT_AND_TRANSLUCENT);
     }
+    return layer;
   }
 }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightTextureMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightTextureMixin.java
deleted file mode 100644
index 5547be59..00000000
--- a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightTextureMixin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.infinite.mixin.infinite.features.local.level.xray;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import net.minecraft.client.renderer.LightTexture;
-import org.infinite.InfiniteClient;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(LightTexture.class)
-public class LightTextureMixin {
-
-  /**
-   * updateLightTexture (method_3313) 内の putFloat をラップします。 remap = true (デフォルト)
-   * にすることで本番環境の難読化に対応させます。
-   */
-  @WrapOperation(
-      method = "updateLightTexture",
-      at =
-          @At(
-              value = "INVOKE",
-              // targetはマッピングされるため、remap = falseを外す
-              target =
-                  "Lcom/mojang/blaze3d/buffers/Std140Builder;putFloat(F)Lcom/mojang/blaze3d/buffers/Std140Builder;"))
-  private Std140Builder onPutFloat(
-      Std140Builder instance, float value, Operation<Std140Builder> original) {
-    // XRayが無効なら何もしない
-    if (!InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature().isEnabled()) {
-      return original.call(instance, value);
-    }
-
-    // XRay有効時は、明るさの値を最大（15.0F相当の処理）にブースト
-    // ※値は環境により調整が必要ですが、基本は元の値を無視して高い値を渡します
-    float boostedValue = 15.0F;
-    return original.call(instance, boostedValue);
-  }
-}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightmapMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightmapMixin.java
new file mode 100644
index 00000000..8c2e8ab3
--- /dev/null
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LightmapMixin.java
@@ -0,0 +1,22 @@
+package org.infinite.mixin.infinite.features.local.level.xray;
+
+import net.minecraft.client.renderer.Lightmap;
+import net.minecraft.world.level.dimension.DimensionType;
+import org.infinite.InfiniteClient;
+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.CallbackInfoReturnable;
+
+@Mixin(Lightmap.class)
+public class LightmapMixin {
+
+  @Inject(method = "getBrightness", at = @At("RETURN"), cancellable = true)
+  private static void onGetBrightness(
+      DimensionType dimensionType, int level, CallbackInfoReturnable<Float> cir) {
+    if (InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature().isEnabled()) {
+      float boostedValue = 15.0F;
+      cir.setReturnValue(boostedValue);
+    }
+  }
+}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LiquidBlockRendererMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LiquidBlockRendererMixin.java
deleted file mode 100644
index 6c69efdd..00000000
--- a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/LiquidBlockRendererMixin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.infinite.mixin.infinite.features.local.level.xray;
-
-import net.minecraft.client.renderer.block.LiquidBlockRenderer;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.FluidState;
-import org.infinite.InfiniteClient;
-import org.infinite.infinite.features.local.level.xray.XRayFeature;
-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.CallbackInfoReturnable;
-
-@Mixin(LiquidBlockRenderer.class)
-public class LiquidBlockRendererMixin {
-  /**
-   * 流体の面を描画するかどうかの判定をフックします。
-   *
-   * @param blockState 現在の流体ブロックの状態
-   * @param direction チェックしている面
-   * @param neighborFluid 隣接するブロックの流体状態
-   */
-  @Inject(method = "shouldRenderFace", at = @At("RETURN"), cancellable = true)
-  private static void onShouldRenderFace(
-      FluidState fluidState,
-      BlockState blockState,
-      Direction direction,
-      FluidState neighborFluid,
-      CallbackInfoReturnable<Boolean> cir) {
-    XRayFeature xRayFeature =
-        InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature();
-
-    if (xRayFeature.isEnabled()) {
-      cir.setReturnValue(
-          xRayFeature.atLiquid(
-              fluidState, blockState, direction, neighborFluid, cir.getReturnValue()));
-    }
-  }
-}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ModelBlockRendererMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ModelBlockRendererMixin.java
index f1dd833e..63397a5f 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ModelBlockRendererMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/ModelBlockRendererMixin.java
@@ -2,15 +2,13 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local; // 重要: Localを使用
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import java.util.Arrays;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.blaze3d.vertex.QuadInstance;
+import net.minecraft.client.renderer.block.BlockQuadOutput;
 import net.minecraft.client.renderer.block.ModelBlockRenderer;
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.level.xray.XRayFeature;
@@ -26,52 +24,56 @@ private static XRayFeature xRayFeature() {
     return InfiniteClient.INSTANCE.getLocalFeatures().getLevel().getXRayFeature();
   }
 
-  /** putQuadData へのフック 名前によるキャプチャを廃止し、@Local を使用して型で安全に取得します。 */
   @WrapOperation(
-      method = "putQuadData",
+      method = "putQuadWithTint",
       at =
           @At(
               value = "INVOKE",
               target =
-                  "Lcom/mojang/blaze3d/vertex/VertexConsumer;putBulkData(Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lnet/minecraft/client/renderer/block/model/BakedQuad;[FFFFF[II)V"))
-  private static void onPutQuadData(
-      VertexConsumer instance,
-      PoseStack.Pose pose,
+                  "Lnet/minecraft/client/renderer/block/BlockQuadOutput;put(FFFLnet/minecraft/client/resources/model/geometry/BakedQuad;Lcom/mojang/blaze3d/vertex/QuadInstance;)V"))
+  private void onPutQuadWithTint(
+      BlockQuadOutput instance,
+      float x,
+      float y,
+      float z,
       BakedQuad bakedQuad,
-      float[] fs,
-      float r,
-      float g,
-      float b,
-      float alpha,
-      int[] is,
-      int lightmap,
+      QuadInstance quadInstance,
       Operation<Void> original,
-      // 引数から型で取得
-      @Local(argsOnly = true) BlockState state // 引数から型で取得
-      // 引数から型で取得
-      ) {
+      @Local(argsOnly = true, name = "state") BlockState state) {
+
     XRayFeature xRay = xRayFeature();
 
     if (xRay.isEnabled()) {
       boolean isOre = xRay.getTargetBlocks().getValue().contains(xRay.getBlockId(state));
 
-      float finalAlpha = isOre ? 1.0f : xRay.getTransparency().getValue();
-      float brightR = isOre ? 1.0f : r;
-      float brightG = isOre ? 1.0f : g;
-      float brightB = isOre ? 1.0f : b;
-
       if (isOre) {
-        Arrays.fill(fs, 1.0f);
-      }
+        // --- original.call の「前」に設定する ---
+        // ライトマップを最大に固定（暗い場所でも光る）
+        quadInstance.setLightCoords(15728880);
 
-      original.call(
-          instance, pose, bakedQuad, fs, brightR, brightG, brightB, finalAlpha, is, lightmap);
-    } else {
-      original.call(instance, pose, bakedQuad, fs, r, g, b, alpha, is, lightmap);
+        // シェーディング（影）を無効化したい場合は白に設定
+        // ただし quadInstance.setColor(i, color) をループで回す方が確実な場合がある
+        for (int i = 0; i < 4; i++) {
+          quadInstance.setColor(i, -1);
+        }
+      } else {
+        // 透過設定（石など）
+        float alpha = xRay.getTransparency().getValue();
+        int a = (int) (alpha * 255.0F);
+
+        for (int i = 0; i < 4; i++) {
+          int oldColor = quadInstance.getColor(i);
+          // 元のRGBを維持しつつ、A（アルファ）だけを書き換える
+          int newColor = (a << 24) | (oldColor & 0x00FFFFFF);
+          quadInstance.setColor(i, newColor);
+        }
+      }
     }
+
+    // 最後に一回だけ呼び出す
+    original.call(instance, x, y, z, bakedQuad, quadInstance);
   }
 
-  /** shouldRenderFace へのフック */
   @WrapOperation(
       method = "shouldRenderFace",
       at =
@@ -79,21 +81,18 @@ private static void onPutQuadData(
               value = "INVOKE",
               target =
                   "Lnet/minecraft/world/level/block/Block;shouldRenderFace(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"))
-  private static boolean onShouldRenderFace(
+  private boolean onShouldRenderFace(
       BlockState state,
       BlockState neighborState,
-      Direction side,
+      Direction direction,
       Operation<Boolean> original,
-      @Local(argsOnly = true) BlockAndTintGetter world,
-      @Local(argsOnly = true) BlockPos pos,
-      @Local(ordinal = 0, argsOnly = true) boolean cull // ローカル変数のboolean(cull)を型と順序で取得
+      @Local(argsOnly = true, name = "neighborPos") BlockPos neighborPos // 引数名は neighborPos
       ) {
     XRayFeature xRay = xRayFeature();
     if (!xRay.isEnabled()) {
-      return original.call(state, neighborState, side);
+      return original.call(state, neighborState, direction);
     }
-
     return xRay.atModelBlockRenderer(
-        world, state, cull, side, pos, original.call(state, neighborState, side));
+        state, direction, neighborPos, original.call(state, neighborState, direction));
   }
 }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/OptionsMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/OptionsMixin.java
index 563eb03e..ae708641 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/OptionsMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/level/xray/OptionsMixin.java
@@ -3,9 +3,7 @@
 import net.minecraft.client.OptionInstance;
 import net.minecraft.client.Options;
 import org.infinite.InfiniteClient;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,7 +12,6 @@
 
 @Mixin(Options.class)
 public abstract class OptionsMixin {
-  @Shadow @Final private OptionInstance<Double> gamma;
 
   @Unique private OptionInstance<Double> infinite$maxGamma;
 
@@ -25,10 +22,10 @@ private void initMaxGamma(CallbackInfo ci) {
         new OptionInstance<>(
             "options.gamma",
             OptionInstance.noTooltip(),
-            (caption, value) -> caption, // 表示名の整形（不要ならデフォルト）
+            (caption, _) -> caption, // 表示名の整形（不要ならデフォルト）
             OptionInstance.UnitDouble.INSTANCE, // 0.0-1.0の範囲を扱う定義
             1.0, // デフォルト値
-            (v) -> {} // 値がセットされた時のコールバックを空にする（変更不可にする）
+            (_) -> {} // 値がセットされた時のコールバックを空にする（変更不可にする）
             );
   }
 
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightTextureMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightTextureMixin.java
deleted file mode 100644
index eec96429..00000000
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightTextureMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.infinite.mixin.infinite.features.local.rendering.brightsight;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import net.minecraft.client.renderer.LightTexture;
-import org.infinite.InfiniteClient;
-import org.infinite.infinite.features.local.rendering.brightsight.BrightSightFeature;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(LightTexture.class)
-public class LightTextureMixin {
-
-  @WrapOperation(
-      method = "updateLightTexture",
-      at =
-          @At(
-              value = "INVOKE",
-              target =
-                  "Lcom/mojang/blaze3d/buffers/Std140Builder;putFloat(F)Lcom/mojang/blaze3d/buffers/Std140Builder;",
-              remap = false // ライブラリ側のメソッドなので remap は false
-              ))
-  private Std140Builder onPutFloat(
-      Std140Builder instance, float value, Operation<Std140Builder> original) {
-    BrightSightFeature feature =
-        InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getBrightSightFeature();
-
-    // 1. Featureが有効か確認
-    if (feature.isEnabled()) {
-      BrightSightFeature.Method method = feature.getMethod().getValue();
-
-      // 2. GamMax または UltraBright の場合、輝度を最大 (15.0F) に固定
-      // これにより、ブロックの明るさ(Block Light)と空の明るさ(Sky Light)の両方が無視され、全画面が明るくなります
-      if (method == BrightSightFeature.Method.GamMax
-          || method == BrightSightFeature.Method.UltraBright) {
-        return original.call(instance, 15.0F);
-      }
-    }
-
-    return original.call(instance, value);
-  }
-}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightmapMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightmapMixin.java
new file mode 100644
index 00000000..5d89e14f
--- /dev/null
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/LightmapMixin.java
@@ -0,0 +1,28 @@
+package org.infinite.mixin.infinite.features.local.rendering.brightsight;
+
+import net.minecraft.client.renderer.Lightmap;
+import net.minecraft.world.level.dimension.DimensionType;
+import org.infinite.InfiniteClient;
+import org.infinite.infinite.features.local.rendering.brightsight.BrightSightFeature;
+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.CallbackInfoReturnable;
+
+@Mixin(Lightmap.class)
+public class LightmapMixin {
+
+  @Inject(method = "getBrightness", at = @At("RETURN"), cancellable = true)
+  private static void onPutFloat(
+      DimensionType dimensionType, int level, CallbackInfoReturnable<Float> cir) {
+    BrightSightFeature feature =
+        InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getBrightSightFeature();
+    if (feature.isEnabled()) {
+      BrightSightFeature.Method method = feature.getMethod().getValue();
+      if (method == BrightSightFeature.Method.GamMax
+          || method == BrightSightFeature.Method.UltraBright) {
+        cir.setReturnValue(1f);
+      }
+    }
+  }
+}
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/ModelBlockRendererMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/ModelBlockRendererMixin.java
index a0fd6068..6e4030e4 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/ModelBlockRendererMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/brightsight/ModelBlockRendererMixin.java
@@ -2,15 +2,10 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import java.util.Arrays;
+import com.mojang.blaze3d.vertex.QuadInstance;
+import net.minecraft.client.renderer.block.BlockQuadOutput;
 import net.minecraft.client.renderer.block.ModelBlockRenderer;
-import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.block.state.BlockState;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.rendering.brightsight.BrightSightFeature;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,28 +21,20 @@ private static BrightSightFeature brightSight() {
   }
 
   @WrapOperation(
-      method = "putQuadData",
+      method = "putQuadWithTint",
       at =
           @At(
               value = "INVOKE",
               target =
-                  "Lcom/mojang/blaze3d/vertex/VertexConsumer;putBulkData(Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lnet/minecraft/client/renderer/block/model/BakedQuad;[FFFFF[II)V"))
-  private static void onPutQuadData(
-      VertexConsumer instance,
-      PoseStack.Pose pose,
-      BakedQuad bakedQuad,
-      float[] fs, // 各頂点の輝度（影）係数
-      float r, // 元々の赤成分（バイオームの色を含む）
-      float g, // 元々の緑成分
-      float b, // 元々の青成分
-      float alpha,
-      int[] is,
-      int lightmap,
-      Operation<Void> original,
-      BlockAndTintGetter world,
-      BlockState state,
-      BlockPos pos) {
-
+                  "Lnet/minecraft/client/renderer/block/BlockQuadOutput;put(FFFLnet/minecraft/client/resources/model/geometry/BakedQuad;Lcom/mojang/blaze3d/vertex/QuadInstance;)V"))
+  private void onPutQuadData(
+      BlockQuadOutput instance,
+      float x,
+      float y,
+      float z,
+      net.minecraft.client.resources.model.geometry.BakedQuad bakedQuad,
+      QuadInstance quadInstance,
+      Operation<Void> original) {
     BrightSightFeature feature = brightSight();
 
     if (feature.isEnabled()
@@ -55,18 +42,22 @@ private static void onPutQuadData(
             || feature.getMethod().getValue() == BrightSightFeature.Method.UltraBright)) {
 
       // 1. 各頂点の明るさ係数(AO)を最大にする。
-      // これにより、ブロックの凹凸による影が消えます。
-      Arrays.fill(fs, 1.0f);
+      // scaleColor(1.0f) は色を維持しつつ、影（Ambient Occlusion）による減衰をリセットします。
+      quadInstance.scaleColor(1.0f);
+
+      // 2. ライトマップを最大輝度にする。
+      // バニラのフルブライト定数値。15728880 は 0x00F000F0 と同等です。
+      int fullLight = 0x00F000F0;
+      quadInstance.setLightCoords(fullLight);
+
+      // 3. オーバーレイ（ダメージ時の赤みなど）を無効化（必要に応じて）
+      quadInstance.setOverlayCoords(OverlayTexture.NO_OVERLAY);
 
-      // 2. ライトマップを最大輝度にする
-      int fullLight = 0x00EE00EE;
-      int noOverlay = OverlayTexture.NO_OVERLAY;
-      Arrays.fill(is, noOverlay);
-      // 3. 元の r, g, b をそのまま渡す
-      // これにより、葉っぱや草の色相が維持されます。
-      original.call(instance, pose, bakedQuad, fs, r, g, b, alpha, is, fullLight);
+      // 修正した quadInstance を使って元の処理を呼び出す
+      original.call(instance, x, y, z, bakedQuad, quadInstance);
     } else {
-      original.call(instance, pose, bakedQuad, fs, r, g, b, alpha, is, lightmap);
+      // 通常時
+      original.call(instance, x, y, z, bakedQuad, quadInstance);
     }
   }
 }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/FogRendererMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/FogRendererMixin.java
index cdae86ee..75cb9eab 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/FogRendererMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/FogRendererMixin.java
@@ -15,8 +15,7 @@ public class FogRendererMixin {
 
   /** FogRenderer 内で霧のデータバッファを更新する直前に介入します。 start と end の距離を極端に大きくすることで、実質的に霧を無効化します。 */
   @WrapOperation(
-      method =
-          "setupFog(Lnet/minecraft/client/Camera;ILnet/minecraft/client/DeltaTracker;FLnet/minecraft/client/multiplayer/ClientLevel;)Lorg/joml/Vector4f;",
+      method = "updateBuffer(Lnet/minecraft/client/renderer/fog/FogData;)V",
       at =
           @At(
               value = "INVOKE",
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/GuiMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/GuiMixin.java
index d8a91793..e3e035af 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/GuiMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/clearsight/GuiMixin.java
@@ -1,7 +1,7 @@
 package org.infinite.mixin.infinite.features.local.rendering.clearsight;
 
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import org.infinite.InfiniteClient;
@@ -14,9 +14,9 @@
 @Mixin(Gui.class)
 public class GuiMixin {
 
-  @Inject(method = "renderTextureOverlay", at = @At("HEAD"), cancellable = true)
-  private void onRenderTextureOverlay(
-      GuiGraphics guiGraphics, Identifier identifier, float f, CallbackInfo ci) {
+  @Inject(method = "extractTextureOverlay", at = @At("HEAD"), cancellable = true)
+  private void onExtractTextureOverlay(
+      GuiGraphicsExtractor guiGraphics, Identifier identifier, float f, CallbackInfo ci) {
     ClearSightFeature feature =
         InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getClearSightFeature();
     if (!feature.isEnabled() || !feature.getAntiOverlay().getValue()) return;
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/stablesight/CameraMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/stablesight/CameraMixin.java
index c378a6af..11793631 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/stablesight/CameraMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/stablesight/CameraMixin.java
@@ -1,8 +1,6 @@
 package org.infinite.mixin.infinite.features.local.rendering.stablesight;
 
 import net.minecraft.client.Camera;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.rendering.stablesight.StableSightFeature;
 import org.spongepowered.asm.mixin.Mixin;
@@ -19,8 +17,6 @@ public abstract class CameraMixin {
   @Shadow
   protected abstract void move(float f, float g, float h);
 
-  @Shadow private float xRot;
-  @Shadow private float yRot;
   @Shadow private boolean detached;
 
   @Unique
@@ -29,9 +25,8 @@ private StableSightFeature stableSightFeature() {
   }
 
   /** setupの最後で実行されるmove(カメラの後退処理)を上書き、 またはgetMaxZoomの挙動を書き換えます。 */
-  @Inject(method = "setup", at = @At("RETURN"))
-  public void onSetupReturn(
-      Level level, Entity entity, boolean bl, boolean bl2, float f, CallbackInfo ci) {
+  @Inject(method = "reset", at = @At("RETURN"))
+  public void onSetupReturn(CallbackInfo ci) {
     if (stableSightFeature().isEnabled() && this.detached) {
       // 1. 標準の挙動で移動してしまった分を一旦リセット（moveは相対移動のため）
       // 既存のsetup内で getMaxZoom に基づいて move(-dist, 0, 0) が呼ばれている。
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/toughsight/GuiMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/toughsight/GuiMixin.java
index 0ab05397..3934764f 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/toughsight/GuiMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/toughsight/GuiMixin.java
@@ -1,7 +1,7 @@
 package org.infinite.mixin.infinite.features.local.rendering.toughsight;
 
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.rendering.toughsight.ToughSightFeature;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,8 +13,8 @@
 public class GuiMixin {
 
   /** 画面上の様々なエフェクト（ポータル、吐き気など）を描画するメソッドに介入します。 */
-  @Inject(method = "renderConfusionOverlay", at = @At("HEAD"), cancellable = true)
-  private void onRenderEffects(GuiGraphics guiGraphics, float f, CallbackInfo ci) {
+  @Inject(method = "extractConfusionOverlay", at = @At("HEAD"), cancellable = true)
+  private void onRenderEffects(GuiGraphicsExtractor guiGraphics, float f, CallbackInfo ci) {
     ToughSightFeature toughSight =
         InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getToughSightFeature();
     if (toughSight.isEnabled() && toughSight.getAntiNausea().getValue()) {
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/ui/GuiMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/ui/GuiMixin.java
index b036f762..ced39ab5 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/ui/GuiMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/ui/GuiMixin.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.world.entity.player.Player;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.rendering.ui.UltraUiFeature;
@@ -20,17 +20,18 @@ private static UltraUiFeature ultraUiFeature() {
   }
 
   // クロスヘア
-  @Inject(method = "renderCrosshair", at = @At("HEAD"), cancellable = true)
+  @Inject(method = "extractCrosshair", at = @At("HEAD"), cancellable = true)
   private void onRenderCrosshair(
-      GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
+      GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getCrosshairUi().getValue()) {
       ci.cancel();
     }
   }
 
   // ホットバー (アイテムスロットの並び)
-  @Inject(method = "renderItemHotbar", at = @At("HEAD"), cancellable = true)
-  private void onRenderHotbar(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
+  @Inject(method = "extractItemHotbar", at = @At("HEAD"), cancellable = true)
+  private void onRenderHotbar(
+      GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getHotbarUi().getValue()) {
       ci.cancel();
     }
@@ -38,43 +39,40 @@ private void onRenderHotbar(GuiGraphics guiGraphics, DeltaTracker deltaTracker,
 
   // 経験値レベルの数字描画をキャンセル
   @Inject(
-      method =
-          "renderHotbarAndDecorations(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V",
+      method = "extractHotbarAndDecorations",
       at =
           @At(
               value = "INVOKE",
               target =
-                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;renderExperienceLevel(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;I)V"),
+                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractExperienceLevel(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/gui/Font;I)V"),
       cancellable = true)
-  private void onRenderExperienceLevel(CallbackInfo ci) {
+  private void onExtractExperienceLevel(CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getTopBoxUi().getValue()) {
       ci.cancel();
     }
   }
 
   @Inject(
-      method =
-          "renderHotbarAndDecorations(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V",
+      method = "extractHotbarAndDecorations",
       at =
           @At(
               value = "INVOKE",
               target =
-                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;renderBackground(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V"),
+                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"),
       cancellable = true)
-  private void onRenderExperienceBarBackgroudn(CallbackInfo ci) {
+  private void onRenderExperienceBarBackground(CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getTopBoxUi().getValue()) {
       ci.cancel(); // 厳密にはInvokeのキャンセルは複雑なため、HEADで判定するか下記の方法をとります
     }
   }
 
   @Inject(
-      method =
-          "renderHotbarAndDecorations(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V",
+      method = "extractHotbarAndDecorations",
       at =
           @At(
               value = "INVOKE",
               target =
-                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V"),
+                  "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractRenderState(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"),
       cancellable = true)
   private void onRenderExperienceBar(CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getTopBoxUi().getValue()) {
@@ -83,40 +81,52 @@ private void onRenderExperienceBar(CallbackInfo ci) {
   }
 
   /** 左側要素（体力・防御力）の描画を制御 */
-  @Inject(method = "renderPlayerHealth", at = @At("HEAD"), cancellable = true)
-  private void onRenderHealthBar(GuiGraphics guiGraphics, CallbackInfo ci) {
+  @Inject(method = "extractPlayerHealth", at = @At("HEAD"), cancellable = true)
+  private void onRenderHealthBar(GuiGraphicsExtractor guiGraphics, CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getLeftBoxUi().getValue()) {
       ci.cancel();
     }
   }
 
-  @Inject(method = "renderArmor", at = @At("HEAD"), cancellable = true)
+  @Inject(method = "extractArmor", at = @At("HEAD"), cancellable = true)
   private static void onRenderArmor(
-      GuiGraphics guiGraphics, Player player, int i, int j, int k, int l, CallbackInfo ci) {
+      GuiGraphicsExtractor graphics,
+      Player player,
+      int i,
+      int numHealthRows,
+      int healthRowHeight,
+      int xLeft,
+      CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getLeftBoxUi().getValue()) {
       ci.cancel();
     }
   }
 
   /** 右側要素（満腹度）の描画を制御 */
-  @Inject(method = "renderFood", at = @At("HEAD"), cancellable = true)
-  private void onRenderFood(GuiGraphics guiGraphics, Player player, int i, int j, CallbackInfo ci) {
+  @Inject(method = "extractFood", at = @At("HEAD"), cancellable = true)
+  private void onRenderFood(
+      GuiGraphicsExtractor graphics, Player player, int yLineBase, int xRight, CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getRightBoxUi().getValue()) {
       ci.cancel();
     }
   }
 
   /** 右側要素（空気量/水中呼吸）の描画を制御 */
-  @Inject(method = "renderAirBubbles", at = @At("HEAD"), cancellable = true)
+  @Inject(method = "extractAirBubbles", at = @At("HEAD"), cancellable = true)
   private void onRenderAir(
-      GuiGraphics guiGraphics, Player player, int i, int j, int k, CallbackInfo ci) {
+      GuiGraphicsExtractor graphics,
+      Player player,
+      int vehicleHearts,
+      int yLineAir,
+      int xRight,
+      CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getRightBoxUi().getValue()) {
       ci.cancel();
     }
   }
 
-  @Inject(method = "renderVehicleHealth", at = @At("HEAD"), cancellable = true)
-  private void onRenderVehicleHealth(GuiGraphics guiGraphics, CallbackInfo ci) {
+  @Inject(method = "extractVehicleHealth", at = @At("HEAD"), cancellable = true)
+  private void onRenderVehicleHealth(GuiGraphicsExtractor graphics, CallbackInfo ci) {
     if (ultraUiFeature().isEnabled() && ultraUiFeature().getRightBoxUi().getValue()) {
       ci.cancel();
     }
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/GameRendererMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/CameraMixin.java
similarity index 93%
rename from src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/GameRendererMixin.java
rename to src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/CameraMixin.java
index 61a88ec8..4ba38653 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/GameRendererMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/CameraMixin.java
@@ -1,9 +1,9 @@
 package org.infinite.mixin.infinite.features.local.rendering.zoomsight;
 
+import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.world.entity.Entity;
 import org.infinite.InfiniteClient;
 import org.infinite.infinite.features.local.rendering.zoomsight.ZoomSightFeature;
@@ -14,13 +14,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(GameRenderer.class)
-public class GameRendererMixin {
-  @Shadow private float fovModifier;
+@Mixin(Camera.class)
+public class CameraMixin {
+
+  @Shadow @Final private Minecraft minecraft;
 
   @Shadow private float oldFovModifier;
 
-  @Shadow @Final private Minecraft minecraft;
+  @Shadow private float fovModifier;
 
   @Inject(method = "tickFov", at = @At("HEAD"), cancellable = true)
   private void onTickFov(CallbackInfo ci) {
diff --git a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/MouseHandlerMixin.java b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/MouseHandlerMixin.java
index 13fd14b7..012f3299 100644
--- a/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/MouseHandlerMixin.java
+++ b/src/client/java/org/infinite/mixin/infinite/features/local/rendering/zoomsight/MouseHandlerMixin.java
@@ -14,7 +14,7 @@ public class MouseHandlerMixin {
 
   /** マウスホイールによる倍率調整 */
   @Inject(method = "onScroll", at = @At("HEAD"), cancellable = true)
-  private void onMouseScroll(long handle, double xOffset, double yOffset, CallbackInfo ci) {
+  private void onMouseScroll(long handle, double xoffset, double yoffset, CallbackInfo ci) {
     ZoomSightFeature zoom =
         InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getZoomSightFeature();
 
@@ -23,20 +23,19 @@ private void onMouseScroll(long handle, double xOffset, double yOffset, Callback
       float step = zoom.getZoomStep().getValue(); // プロパティから取得
 
       float next;
-      if (yOffset > 0) {
+      if (yoffset > 0) {
         next = current * step; // 拡大
       } else {
         next = current / step; // 縮小
       }
 
-      zoom.setCurrentZoom(Math.max(1.0f, Math.min(50.0f, next)));
+      zoom.setCurrentZoom(Math.clamp(next, 1.0f, 50.0f));
       ci.cancel();
     }
   }
 
-  /** ズーム倍率に応じた感度の動的補正 変数 'f' (e * e * e) は Minecraft 1.21 における回転デルタの基数です。 */
   @ModifyVariable(method = "turnPlayer", at = @At("STORE"), ordinal = 1)
-  private double modifySensitivityMultiplier(double originalF) {
+  private double modifySensitivityMultiplier(double ss) {
     ZoomSightFeature zoom =
         InfiniteClient.INSTANCE.getLocalFeatures().getRendering().getZoomSightFeature();
 
@@ -45,11 +44,16 @@ private double modifySensitivityMultiplier(double originalF) {
       float reduction = zoom.getSensitivityReduction().getValue();
 
       if (level > 1.0f) {
-        // 感度を (1 / 倍率) に近づける補正
-        // reduction = 1.0 の時、倍率に完全反比例します
-        return originalF / (1.0 + (level - 1.0) * reduction);
+        // 三乗根（Cube Root）をとることで、高倍率でも操作性を失わない
+        // 50倍ズーム時：1/50 ≒ 0.02 (重すぎ) -> 1/7.07 (平方根) -> 1/3.68 (三乗根)
+        double visualSpeedMatch = 1.0 / Math.cbrt(level);
+
+        // reduction = 1.0 のとき、三乗根による補正がフルに効く
+        double factor = 1.0 + (visualSpeedMatch - 1.0) * reduction;
+
+        return ss * factor;
       }
     }
-    return originalF;
+    return ss;
   }
 }
diff --git a/src/client/kotlin/org/infinite/InfiniteClient.kt b/src/client/kotlin/org/infinite/InfiniteClient.kt
index 93483b71..bfcd23cf 100644
--- a/src/client/kotlin/org/infinite/InfiniteClient.kt
+++ b/src/client/kotlin/org/infinite/InfiniteClient.kt
@@ -3,11 +3,10 @@ package org.infinite
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
 import net.minecraft.client.KeyMapping
 import net.minecraft.client.gui.screens.Screen
-import org.infinite.InfiniteClient.feature
 import org.infinite.infinite.command.InfiniteCommand
 import org.infinite.infinite.features.global.InfiniteGlobalFeatures
 import org.infinite.infinite.features.local.InfiniteLocalFeatures
@@ -41,9 +40,88 @@ import kotlin.reflect.KClass
 object InfiniteClient : MinecraftInterface(), ClientModInitializer {
     val globalFeatures = InfiniteGlobalFeatures()
     val localFeatures = InfiniteLocalFeatures()
-    val gameScreenBindingPair: LocalFeature.BindingPair by lazy {
-        LocalFeature.BindingPair(
-            KeyBindingHelper.registerKeyBinding(
+
+    val featureCategories get() = localFeatures
+    val globalFeatureCategories get() = globalFeatures
+
+    fun genTranslations(rootPath: String = ".") {
+        var langDir = java.io.File(rootPath, "infinite-client/src/main/resources/assets/infinite-client/lang")
+        if (!langDir.exists()) {
+            langDir = java.io.File(rootPath, "src/main/resources/assets/infinite-client/lang")
+        }
+        if (!langDir.exists()) return
+
+        val keys = mutableSetOf<String>()
+        // Collect keys from local features
+        localFeatures.categories.values.forEach { category ->
+            keys.add(category.translation())
+            category.features.values.forEach { feature ->
+                keys.add(feature.translation())
+                feature.properties.values.forEach { property ->
+                    property.translationKey()?.let { keys.add(it) }
+                }
+            }
+        }
+        // Collect keys from global features
+        globalFeatures.categories.values.forEach { category ->
+            keys.add(category.translation())
+            category.features.values.forEach { feature ->
+                keys.add(feature.translation())
+                feature.properties.values.forEach { property ->
+                    property.translationKey()?.let { keys.add(it) }
+                }
+            }
+        }
+
+        // Add standard documentation keys used in Document.kt
+        keys.add("doc.infinite.properties_section_title")
+        keys.add("doc.infinite.property_info_title")
+        keys.add("doc.infinite.property_type")
+        keys.add("doc.infinite.property_default")
+        keys.add("doc.infinite.property_min")
+        keys.add("doc.infinite.property_max")
+        keys.add("doc.infinite.property_options")
+        keys.add("doc.infinite.property_list_count")
+        keys.add("doc.infinite.property_list_type")
+
+        // Keymappings
+        localFeatures.categories.values.forEach { category ->
+            category.features.values.forEach { feature ->
+                keys.addAll(feature.getActionTranslationKeys())
+            }
+        }
+        keys.add("key.infinite.game_options")
+
+        val gson = com.google.gson.GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create()
+        val langFiles = langDir.listFiles { _, name -> name.endsWith(".json") } ?: return
+
+        for (file in langFiles) {
+            val type = object : com.google.gson.reflect.TypeToken<MutableMap<String, String>>() {}.type
+            val currentTranslations: MutableMap<String, String> = try {
+                gson.fromJson(file.readText(java.nio.charset.StandardCharsets.UTF_8), type) ?: mutableMapOf()
+            } catch (e: Exception) {
+                mutableMapOf()
+            }
+
+            var changed = false
+            for (key in keys) {
+                if (!currentTranslations.containsKey(key)) {
+                    currentTranslations[key] = key
+                    changed = true
+                }
+            }
+
+            if (changed) {
+                val sortedMap = currentTranslations.toSortedMap()
+                file.writeText(gson.toJson(sortedMap), java.nio.charset.StandardCharsets.UTF_8)
+                println("Updated translation file: ${file.name} with ${keys.size} keys.")
+            }
+        }
+    }
+
+    val gameScreenMappingPair: LocalFeature.MappingPair by lazy {
+        LocalFeature.MappingPair(
+            KeyMappingHelper.registerKeyMapping(
                 KeyMapping(
                     "key.infinite.game_options",
                     GLFW.GLFW_KEY_RIGHT_SHIFT,
diff --git a/src/client/kotlin/org/infinite/InfiniteClientDataGenerator.kt b/src/client/kotlin/org/infinite/InfiniteClientDataGenerator.kt
index 52b8ad32..d8a26aff 100644
--- a/src/client/kotlin/org/infinite/InfiniteClientDataGenerator.kt
+++ b/src/client/kotlin/org/infinite/InfiniteClientDataGenerator.kt
@@ -2,8 +2,22 @@ package org.infinite
 
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
+import org.infinite.utils.Document
+import java.nio.file.Path
 
 object InfiniteClientDataGenerator : DataGeneratorEntrypoint {
     override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {
+        var path = java.nio.file.Paths.get("").toAbsolutePath()
+        // Try to find the root directory that contains infinite-client
+        while (path != null && !java.nio.file.Files.exists(path.resolve("infinite-client"))) {
+            path = path.parent
+        }
+        val projectRoot = path ?: java.nio.file.Paths.get("").toAbsolutePath()
+
+        println("Generating documentation from DataGenerator at: $projectRoot")
+        val document = Document(projectRoot)
+        document.generateData()
+        document.getTranslations()
+        document.generateDocs()
     }
 }
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/loading/InfiniteLoadingFeature.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/loading/InfiniteLoadingFeature.kt
index 0c459ae6..1e14cb2d 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/loading/InfiniteLoadingFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/loading/InfiniteLoadingFeature.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.features.global.rendering.loading
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.InfiniteClient
 import org.infinite.libs.core.features.feature.GlobalFeature
 import org.infinite.libs.graphics.bundle.Graphics2DRenderer
@@ -10,7 +10,7 @@ import kotlin.math.PI
 
 class InfiniteLoadingFeature : GlobalFeature() {
     data class LoadingRenderContext(
-        val guiGraphics: GuiGraphics,
+        val guiGraphics: GuiGraphicsExtractor,
         val mouseX: Int,
         val mouseY: Int,
         val partialTick: Float,
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/EditBoxRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/EditBoxRenderer.kt
index 3f2a7968..ddc933eb 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/EditBoxRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/EditBoxRenderer.kt
@@ -1,15 +1,14 @@
 package org.infinite.infinite.features.global.rendering.theme.renderer
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.EditBox
 import org.infinite.InfiniteClient
-import org.infinite.infinite.features.global.rendering.theme.renderer.WidgetRenderUtils
 import org.infinite.libs.graphics.bundle.Graphics2DRenderer
 import org.infinite.utils.Font
 import org.infinite.utils.alpha
 
 class EditBoxRenderer : WidgetRenderer<EditBox> {
-    override fun render(widget: EditBox, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun render(widget: EditBox, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val theme = InfiniteClient.theme
         val colorScheme = theme.colorScheme
         val g2d = Graphics2DRenderer(guiGraphics)
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/PlainButtonRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/PlainButtonRenderer.kt
index f2147fef..efb957f2 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/PlainButtonRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/PlainButtonRenderer.kt
@@ -1,14 +1,14 @@
 package org.infinite.infinite.features.global.rendering.theme.renderer
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.Button
 import org.infinite.InfiniteClient
 import org.infinite.libs.graphics.bundle.Graphics2DRenderer
 import org.infinite.utils.alpha
 
 class PlainButtonRenderer : WidgetRenderer<Button> {
-    override fun render(widget: Button, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun render(widget: Button, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val theme = InfiniteClient.theme
         val colorScheme = theme.colorScheme
         val g2d = Graphics2DRenderer(guiGraphics)
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/ScrollWidgetRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/ScrollWidgetRenderer.kt
index d86e4eb1..cc3a60a3 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/ScrollWidgetRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/ScrollWidgetRenderer.kt
@@ -1,20 +1,20 @@
 // org.infinite.infinite.features.global.rendering.theme.renderer.ScrollWidgetRenderer.kt
 package org.infinite.infinite.features.global.rendering.theme.renderer
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractScrollArea
 import org.infinite.InfiniteClient
 import org.infinite.libs.graphics.bundle.Graphics2DRenderer
 import org.infinite.utils.alpha
 
 class ScrollWidgetRenderer : WidgetRenderer<AbstractScrollArea> {
-    override fun render(widget: AbstractScrollArea, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun render(widget: AbstractScrollArea, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         // 注: AbstractScrollArea 自体の render はバニラに任せ、
         // Mixinからは renderScrollbar だけをここに飛ばす形にします。
     }
-
-    fun renderScrollbar(widget: AbstractScrollArea, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int) {
-        if (!widget.scrollbarVisible()) return
+    private fun AbstractScrollArea.scrollable() = this.maxScrollAmount() > 0
+    fun extractScrollbar(widget: AbstractScrollArea, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int) {
+        if (!widget.scrollable()) return
 
         val theme = InfiniteClient.theme
         val colorScheme = theme.colorScheme
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/SliderButtonRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/SliderButtonRenderer.kt
index de4925e8..6a0e5ce2 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/SliderButtonRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/SliderButtonRenderer.kt
@@ -1,13 +1,13 @@
 package org.infinite.infinite.features.global.rendering.theme.renderer
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractSliderButton
 import org.infinite.InfiniteClient
 import org.infinite.libs.graphics.bundle.Graphics2DRenderer
 import org.infinite.utils.alpha
 
 class SliderButtonRenderer : WidgetRenderer<AbstractSliderButton> {
-    override fun render(widget: AbstractSliderButton, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun render(widget: AbstractSliderButton, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val theme = InfiniteClient.theme
         val colorScheme = theme.colorScheme
         val g2d = Graphics2DRenderer(guiGraphics)
diff --git a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/WidgetRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/WidgetRenderer.kt
index 139f8707..c1c05d64 100644
--- a/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/WidgetRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/global/rendering/theme/renderer/WidgetRenderer.kt
@@ -1,8 +1,8 @@
 package org.infinite.infinite.features.global.rendering.theme.renderer
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
 
 interface WidgetRenderer<T : AbstractWidget> {
-    fun render(widget: T, guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float)
+    fun render(widget: T, guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float)
 }
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/combat/counter/CounterFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/combat/counter/CounterFeature.kt
index 1162e298..b0b2d161 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/combat/counter/CounterFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/combat/counter/CounterFeature.kt
@@ -35,7 +35,7 @@ class CounterFeature : LocalFeature() {
             return
         }
         target?.distanceTo(player)?.let {
-            if (it > player.entityAttackRange().maxRange) {
+            if (it > player.entityInteractionRange()) {
                 target = null
             }
         }
@@ -96,7 +96,7 @@ class CounterFeature : LocalFeature() {
     }
 
     override fun onStartUiRendering(graphics2D: Graphics2D) {
-        val target = target?.getPosition(graphics2D.gameDelta) ?: return
+        val target = target?.getPosition(graphics2D.delta) ?: return
         val pos2d = graphics2D.projectWorldToScreen(target) ?: return
         val pos2f = pos2d.first to pos2d.second
         graphics2D.beginPath()
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/combat/lockon/LockOnFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/combat/lockon/LockOnFeature.kt
index 0d918d2a..0162a626 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/combat/lockon/LockOnFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/combat/lockon/LockOnFeature.kt
@@ -282,7 +282,7 @@ class LockOnFeature : LocalFeature() {
     }
 
     private fun renderTargetInfo(graphics2D: Graphics2D, target: LivingEntity, current: Int, total: Int) {
-        val pos = target.getPosition(graphics2D.gameDelta).add(0.0, target.eyeHeight.toDouble(), 0.0)
+        val pos = target.getPosition(graphics2D.delta).add(0.0, target.eyeHeight.toDouble(), 0.0)
         val screenPos = graphics2D.projectWorldToScreen(pos) ?: return
 
         val x = screenPos.first
@@ -297,7 +297,7 @@ class LockOnFeature : LocalFeature() {
 
     private fun renderTargetMark(graphics2D: Graphics2D, target: LivingEntity, active: Boolean, paused: Boolean) {
         // ターゲットの描画位置（目の高さ）
-        val targetPos = target.getPosition(graphics2D.gameDelta).add(0.0, target.eyeHeight.toDouble(), 0.0)
+        val targetPos = target.getPosition(graphics2D.delta).add(0.0, target.eyeHeight.toDouble(), 0.0)
         val screenPos = graphics2D.projectWorldToScreen(targetPos) ?: return
 
         val x = screenPos.first
@@ -388,9 +388,8 @@ class LockOnFeature : LocalFeature() {
 
         // 1. 距離（射程）のチェック
         // プレイヤーのリーチ（通常 3.0ブロック、クリエイティブ 4.5~5.0）
-        val maxRange = player.entityAttackRange().maxRange
-        val minRange = player.entityAttackRange().minRange
-        if (player.distanceTo(target) !in minRange..maxRange) return
+        val range = player.entityInteractionRange()
+        if (player.distanceTo(target) > range) return
 
         // 2. 攻撃クールダウン（インターバル）のチェック
         // getAttackStrengthScale(0.5f) が 1.0 ならフルチャージ状態
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/inventory/control/ContainerUtilFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/inventory/control/ContainerUtilFeature.kt
index 3f7a6f11..f7604f24 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/inventory/control/ContainerUtilFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/inventory/control/ContainerUtilFeature.kt
@@ -134,7 +134,7 @@ class ContainerUtilFeature : LocalFeature() {
         for (i in 0..8) {
             val anim = animations[i]
             if (anim.progress < 1.0f) {
-                anim.progress += 0.15f * graphics2D.realDelta
+                anim.progress += 0.15f * graphics2D.delta
                 if (anim.progress > 1.0f) anim.progress = 1.0f
             }
 
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/level/highlight/BlockHighlightFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/level/highlight/BlockHighlightFeature.kt
index 7f5b1029..ad0661be 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/level/highlight/BlockHighlightFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/level/highlight/BlockHighlightFeature.kt
@@ -11,8 +11,13 @@ import org.infinite.libs.graphics.Graphics3D
 class BlockHighlightFeature : LocalFeature() {
     override val featureType = FeatureLevel.Utils
 
+    @Suppress("Unused")
     enum class RenderStyle { Lines, Faces, Both }
+
+    @Suppress("Unused")
     enum class ViewFocus { None, Balanced, Strict }
+
+    @Suppress("Unused")
     enum class Animation { None, Pulse, FadeIn }
 
     val blocksToHighlight by property(
@@ -92,7 +97,7 @@ class BlockHighlightFeature : LocalFeature() {
     val scanRange by property(IntProperty(12, 1, 32, " chunks"))
     val renderRange by property(IntProperty(128, 8, 512, " blocks"))
     val renderStyle by property(EnumSelectionProperty(RenderStyle.Lines))
-    val maxDrawCount by property(IntProperty(20000, 1000, 100000, " elements"))
+    val maxDrawCount by property(IntProperty(2000, 1000, 100000, " elements"))
 
     val lineWidth by property(FloatProperty(1.5f, 0.1f, 5.0f, " px"))
     val viewFocus by property(EnumSelectionProperty(ViewFocus.Balanced))
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/level/tag/UltraTagFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/level/tag/UltraTagFeature.kt
index f4f482bb..c1cac571 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/level/tag/UltraTagFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/level/tag/UltraTagFeature.kt
@@ -53,7 +53,7 @@ class UltraTagFeature : LocalFeature() {
             }
 
             val offset = if (entity is LivingEntity) entity.bbHeight.toDouble() + 0.2 else 0.5
-            val worldPos = entity.getPosition(graphics2D.gameDelta).add(0.0, offset, 0.0)
+            val worldPos = entity.getPosition(graphics2D.delta).add(0.0, offset, 0.0)
 
             val screenPos = graphics2D.projectWorldToScreen(Vec3(worldPos.x, worldPos.y, worldPos.z))
             if (screenPos != null) {
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/level/xray/XRayFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/level/xray/XRayFeature.kt
index 50ca0bde..d6479800 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/level/xray/XRayFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/level/xray/XRayFeature.kt
@@ -3,10 +3,8 @@ package org.infinite.infinite.features.local.level.xray
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.world.level.BlockAndTintGetter
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.material.FluidState
 import org.infinite.libs.core.features.feature.LocalFeature
 import org.infinite.libs.core.features.property.list.BlockListProperty
 import org.infinite.libs.core.features.property.number.FloatProperty
@@ -187,36 +185,25 @@ class XRayFeature : LocalFeature() {
         return getBlockId(neighborState)
     }
 
-    /**
-     * 指定された FluidState から ID (例: "minecraft:water") を抽出します。
-     */
-    fun getFluidId(state: FluidState): String = BuiltInRegistries.FLUID.getKey(state.type).toString()
-
     /**
      * LiquidBlockRenderer 用の X-Ray 判定ロジック
      */
-    fun atLiquid(
-        fluidState: FluidState, // 現在の流体
-        blockState: BlockState, // 現在のブロック
-        direction: Direction, // 描画しようとしている面
-        neighborFluid: FluidState, // 隣接する流体
-        original: Boolean, // バニラの描画判定結果
+    fun shouldApply(
+        blockState: BlockState, // 現在の流体
     ): Boolean {
-        if (!isEnabled()) return original
+        if (!isEnabled()) return false
 
         // 1. IDの抽出 (FluidState から取得するのが正確)
-        val currentFluidId = getFluidId(fluidState)
+        val blockId = getBlockId(blockState)
 
         // 2. リストに含まれているか判定
-        val isOre = targetBlocks.value.contains(currentFluidId)
-        val isThrough = whiteListBlock.value.contains(currentFluidId)
-        return (isOre || isThrough) && original
+        val isOre = targetBlocks.value.contains(blockId)
+        val isThrough = whiteListBlock.value.contains(blockId)
+        return (isOre || isThrough)
     }
 
     fun atModelBlockRenderer(
-        blockAndTintGetter: BlockAndTintGetter,
         blockState: BlockState,
-        bl: Boolean,
         direction: Direction,
         blockPos: BlockPos,
         original: Boolean,
@@ -249,18 +236,4 @@ class XRayFeature : LocalFeature() {
             Method.TransparencyFull -> isOreCurrent || isThroughCurrent || original
         }
     }
-
-    /**
-     * ItemBlockRenderTypesMixin から呼び出され、
-     * そのブロックを半透明レイヤーで描画すべきか判定します。
-     */
-    fun shouldIsolate(state: BlockState): Boolean {
-        if (!isEnabled()) return false
-
-        val id = getBlockId(state)
-
-        // targetBlocks (鉱石など) に含まれている場合は、はっきり見せたいので隔離(Isolate)しない = false
-        // それ以外のブロック（石など）は、透かしたいので隔離(Isolate)する = true
-        return !targetBlocks.value.contains(id)
-    }
 }
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/rendering/hello/HelloFeature.kt b/src/client/kotlin/org/infinite/infinite/features/local/rendering/hello/HelloFeature.kt
index 302f65ca..8f683f0b 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/rendering/hello/HelloFeature.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/rendering/hello/HelloFeature.kt
@@ -174,7 +174,7 @@ class HelloFeature : LocalFeature() {
         graphics2D.text("Hello World", 10f, graphics2D.height - 20f)
 
         // --- 8. ワールド座標の投影 ---
-        val pos = player.getPosition(graphics2D.gameDelta)
+        val pos = player.getPosition(graphics2D.delta)
         graphics2D.projectWorldToScreen(pos)?.let { (screenX, screenY) ->
             graphics2D.push()
             graphics2D.fillStyle = 0xFF00FF00.toInt()
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/crosshair/CrosshairRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/crosshair/CrosshairRenderer.kt
index df367126..4eb375c9 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/crosshair/CrosshairRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/crosshair/CrosshairRenderer.kt
@@ -43,7 +43,7 @@ class CrosshairRenderer :
         } else {
             // 三人称視点：レイキャストで衝突地点を計算
             val pickRange = 100.0 // レイキャストの最大距離
-            val hitResult = player.pick(pickRange, graphics2D.gameDelta, false)
+            val hitResult = player.pick(pickRange, graphics2D.delta, false)
             val worldPos = hitResult.location
 
             // ワールド座標をスクリーン座標に投影
@@ -64,7 +64,7 @@ class CrosshairRenderer :
         val shadowColor = colorScheme.backgroundColor
         val mainColor = colorScheme.foregroundColor
         val alphaValue = ultraUiFeature.alpha.value
-        val partialTicks = graphics2D.gameDelta
+        val partialTicks = graphics2D.delta
 
         // 1. ターゲット解析
         val hit = minecraft.hitResult
@@ -129,7 +129,7 @@ class CrosshairRenderer :
             // 残り数の平方根に比例した速度で回転
             val baseSpeed = 120f
             val countFactor = sqrt(totalCount.toDouble()).toFloat()
-            smoothBreakRotation -= baseSpeed * countFactor * graphics2D.realDelta
+            smoothBreakRotation -= baseSpeed * countFactor * graphics2D.delta
         } else {
             // 破壊が終わったら、最も近い90度の倍数（0, 90, 180, 270...）にスナップさせる
             val target = (smoothBreakRotation / 90f).roundToInt() * 90f
@@ -137,7 +137,7 @@ class CrosshairRenderer :
 
             // なめらかに目標角度へ近づける (Lerp)
             val snapSpeed = 10f // スナップの速さ
-            smoothBreakRotation += diff * (1f - 0.1.pow((graphics2D.realDelta * snapSpeed).toDouble()).toFloat())
+            smoothBreakRotation += diff * (1f - 0.1.pow((graphics2D.delta * snapSpeed).toDouble()).toFloat())
 
             // 誤差が十分に小さくなったら完全に固定し、値を0-360の範囲に正規化
             if (abs(diff) < 0.05f) {
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/right/RightBoxRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/right/RightBoxRenderer.kt
index 47c9ebe1..81313331 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/right/RightBoxRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/right/RightBoxRenderer.kt
@@ -34,7 +34,7 @@ class RightBoxRenderer :
         val actualSaturation = (player.foodData.saturationLevel / 20f).coerceIn(0f, 1f)
         val vehicle = player.vehicle
         val actualVehicle = if (vehicle is LivingEntity) (vehicle.health / vehicle.maxHealth).coerceIn(0f, 1f) else 0f
-        val actualAir = (player.airSupply.toFloat() / player.maxAirSupply.toFloat()).coerceIn(0f, 1f)
+        val actualAir = (player.airSupply / player.maxAirSupply.toFloat()).coerceIn(0f, 1f)
         val animateSpeed = 0.2f
         animatedFood += (actualFood - animatedFood) * animateSpeed
         animatedSaturation += (actualSaturation - animatedSaturation) * animateSpeed
diff --git a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/topbox/TopBoxRenderer.kt b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/topbox/TopBoxRenderer.kt
index 2ba06f95..ee24ada7 100644
--- a/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/topbox/TopBoxRenderer.kt
+++ b/src/client/kotlin/org/infinite/infinite/features/local/rendering/ui/topbox/TopBoxRenderer.kt
@@ -29,7 +29,7 @@ class TopBoxRenderer :
         val theme = InfiniteClient.theme
 
         // --- 1. アニメーション更新 ---
-        renderTime += graphics2D.gameDelta * 0.05f
+        renderTime += graphics2D.delta * 0.05f
         val actualExp = player.experienceProgress.coerceIn(0f, 1f)
         animatedExp += (actualExp - animatedExp) * 0.1f
 
diff --git a/src/client/kotlin/org/infinite/infinite/ui/screen/CarouselFeatureScreen.kt b/src/client/kotlin/org/infinite/infinite/ui/screen/CarouselFeatureScreen.kt
index cc151066..57fcb731 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/screen/CarouselFeatureScreen.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/screen/CarouselFeatureScreen.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.screen
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.layouts.LinearLayout
 import net.minecraft.client.gui.screens.Screen
@@ -46,8 +46,8 @@ class CarouselFeatureScreen<T : Feature>(
         this.addRenderableWidget(container)
     }
 
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        super.render(guiGraphics, mouseX, mouseY, delta)
+    override fun extractRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractRenderState(guiGraphics, mouseX, mouseY, delta)
         val g2d = Graphics2DRenderer(guiGraphics)
         val theme = InfiniteClient.theme
         val colorScheme = theme.colorScheme
@@ -70,30 +70,26 @@ class CarouselFeatureScreen<T : Feature>(
         val description = Component.translatable(feature.translation()).string
         g2d.textCentered(description, centerX, 2f * size)
         g2d.flush()
-        container.render(guiGraphics, mouseX, mouseY, delta)
+        container.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 
-    override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, bl: Boolean): Boolean = container.mouseClicked(mouseButtonEvent, bl)
+    override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, bl: Boolean): Boolean = container.mouseClicked(mouseButtonEvent, bl) || super.mouseClicked(mouseButtonEvent, bl)
 
-    override fun mouseDragged(mouseButtonEvent: MouseButtonEvent, d: Double, e: Double): Boolean = container.mouseDragged(mouseButtonEvent, d, e)
+    override fun mouseDragged(mouseButtonEvent: MouseButtonEvent, d: Double, e: Double): Boolean = container.mouseDragged(mouseButtonEvent, d, e) || super.mouseDragged(mouseButtonEvent, d, e)
 
-    override fun mouseMoved(d: Double, e: Double) {
-        container.mouseMoved(d, e)
-    }
-
-    override fun mouseReleased(mouseButtonEvent: MouseButtonEvent): Boolean = container.mouseReleased(mouseButtonEvent)
+    override fun mouseReleased(mouseButtonEvent: MouseButtonEvent): Boolean = container.mouseReleased(mouseButtonEvent) || super.mouseReleased(mouseButtonEvent)
 
-    override fun mouseScrolled(d: Double, e: Double, f: Double, g: Double): Boolean = container.mouseScrolled(d, e, f, g)
+    override fun mouseScrolled(d: Double, e: Double, f: Double, g: Double): Boolean = container.mouseScrolled(d, e, f, g) || super.mouseScrolled(d, e, f, g)
 
     override fun keyPressed(keyEvent: KeyEvent): Boolean {
         if (keyEvent.key == GLFW.GLFW_KEY_ESCAPE) {
             minecraft.setScreen(parent)
             return true
         }
-        return container.keyPressed(keyEvent)
+        return container.keyPressed(keyEvent) || super.keyPressed(keyEvent)
     }
 
-    override fun charTyped(characterEvent: CharacterEvent): Boolean = container.charTyped(characterEvent)
+    override fun charTyped(characterEvent: CharacterEvent): Boolean = container.charTyped(characterEvent) || super.charTyped(characterEvent)
 
     override fun children(): List<GuiEventListener> = listOf(container)
 
diff --git a/src/client/kotlin/org/infinite/infinite/ui/screen/ClickGuiScreen.kt b/src/client/kotlin/org/infinite/infinite/ui/screen/ClickGuiScreen.kt
index cb718842..b5a74833 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/screen/ClickGuiScreen.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/screen/ClickGuiScreen.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.screen
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.input.MouseButtonEvent
@@ -101,7 +101,7 @@ abstract class ClickGuiScreen<T : Category<*, out Feature>>(
         addRenderableWidget(searchBox)
     }
 
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val g2d = Graphics2DRenderer(guiGraphics)
 
         // アニメーション計算
@@ -187,7 +187,7 @@ abstract class ClickGuiScreen<T : Category<*, out Feature>>(
         g2d.flush() // 最後にまとめてレンダリング
 
         // Widget (EditBox) の描画は最後に
-        super.render(guiGraphics, uiMouseX, uiMouseY, delta)
+        super.extractRenderState(guiGraphics, uiMouseX, uiMouseY, delta)
     }
 
     private fun renderCategoryRows(g2d: Graphics2DRenderer, mx: Int, my: Int, y: Float, h: Float) {
@@ -404,10 +404,9 @@ abstract class ClickGuiScreen<T : Category<*, out Feature>>(
         val my = toUiY(mouseButtonEvent.y).toInt()
 
         if (searchBox.isMouseOver(mx.toDouble(), my.toDouble())) {
-            searchBox.isFocused = true
+            this.focused = searchBox
             return searchBox.mouseClicked(mouseButtonEvent, bl)
         }
-        searchBox.isFocused = false
 
         if (mx.toFloat() in padding..(padding + sidebarWidth)) {
             val index = rowIndexFromMouse(
diff --git a/src/client/kotlin/org/infinite/infinite/ui/screen/ListFeatureScreen.kt b/src/client/kotlin/org/infinite/infinite/ui/screen/ListFeatureScreen.kt
index f1723b2e..83ea021f 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/screen/ListFeatureScreen.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/screen/ListFeatureScreen.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.screen
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.layouts.LinearLayout
 import net.minecraft.client.gui.screens.Screen
@@ -72,14 +72,14 @@ class ListFeatureScreen<T : Feature>(
         addRenderableWidget(container)
     }
 
-    override fun renderBackground(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        super.renderBackground(guiGraphics, mouseX, mouseY, delta)
+    override fun extractBackground(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractBackground(guiGraphics, mouseX, mouseY, delta)
         val g2d = Graphics2DRenderer(guiGraphics)
         InfiniteClient.theme.renderBackGround(0f, 0f, width.toFloat(), height.toFloat(), g2d, 0.1f)
         g2d.flush()
     }
 
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val g2d = Graphics2DRenderer(guiGraphics)
 
         // 1. パネル本体の描画
@@ -106,17 +106,17 @@ class ListFeatureScreen<T : Feature>(
         val titleY = panelY + 10
 
         // タイトル
-        guiGraphics.drawString(font, feature.name, titleX, titleY, themeScheme.foregroundColor, false)
+        guiGraphics.text(font, feature.name, titleX, titleY, themeScheme.foregroundColor, false)
 
         // 説明文（存在する場合）
         val descriptionKey = feature.translation()
         val description = Component.translatable(descriptionKey).string
         if (description != descriptionKey && description != feature.name) {
             val descY = titleY + font.lineHeight + 2
-            guiGraphics.drawString(font, description, titleX, descY, themeScheme.secondaryColor, false)
+            guiGraphics.text(font, description, titleX, descY, themeScheme.secondaryColor, false)
         }
 
-        super.render(guiGraphics, mouseX, mouseY, delta)
+        super.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 
     // --- インターフェース・イベントのブリッジ ---
@@ -125,10 +125,6 @@ class ListFeatureScreen<T : Feature>(
 
     override fun mouseDragged(mouseButtonEvent: MouseButtonEvent, d: Double, e: Double): Boolean = container.mouseDragged(mouseButtonEvent, d, e) || super.mouseDragged(mouseButtonEvent, d, e)
 
-    override fun mouseMoved(d: Double, e: Double) {
-        container.mouseMoved(d, e)
-    }
-
     override fun mouseReleased(mouseButtonEvent: MouseButtonEvent): Boolean = container.mouseReleased(mouseButtonEvent) || super.mouseReleased(mouseButtonEvent)
 
     override fun mouseScrolled(d: Double, e: Double, f: Double, g: Double): Boolean = container.mouseScrolled(d, e, f, g) || super.mouseScrolled(d, e, f, g)
diff --git a/src/client/kotlin/org/infinite/infinite/ui/widget/CarouselFeatureWidget.kt b/src/client/kotlin/org/infinite/infinite/ui/widget/CarouselFeatureWidget.kt
index ba34e0de..9e7bf7e3 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/widget/CarouselFeatureWidget.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/widget/CarouselFeatureWidget.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.widget
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractContainerWidget
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarrationElementOutput
@@ -18,7 +18,7 @@ abstract class CarouselFeatureWidget<T : Feature>(
     width: Int,
     height: Int = FONT_SIZE + PADDING * 2,
     protected val feature: T,
-) : AbstractContainerWidget(x, y, width, height, Component.literal(feature.name)) {
+) : AbstractContainerWidget(x, y, width, height, Component.literal(feature.name), defaultSettings(10)) {
 
     companion object {
         const val PADDING = 4
@@ -98,7 +98,7 @@ abstract class CarouselFeatureWidget<T : Feature>(
         relocateChildren()
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, i: Int, j: Int, f: Float) {
         val theme = InfiniteClient.theme
         val graphics2DRenderer = Graphics2DRenderer(guiGraphics)
         val colorScheme = theme.colorScheme
diff --git a/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureResetButton.kt b/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureResetButton.kt
index be9ee7a7..e000c962 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureResetButton.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureResetButton.kt
@@ -1,7 +1,7 @@
 package org.infinite.infinite.ui.widget
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.Button
 import net.minecraft.network.chat.Component
 import org.infinite.InfiniteClient
@@ -35,8 +35,8 @@ class FeatureResetButton(x: Int, y: Int, width: Int, height: Int, feature: Featu
     private var clickAnimStartTime: Long = -1L
     private val clickAnimDuration = 500.0 // 0.5秒で1回転
 
-    override fun renderContents(
-        guiGraphics: GuiGraphics,
+    override fun extractContents(
+        guiGraphics: GuiGraphicsExtractor,
         i: Int,
         j: Int,
         f: Float,
diff --git a/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureSettingButton.kt b/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureSettingButton.kt
index d1b9c59f..278e7f69 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureSettingButton.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/widget/FeatureSettingButton.kt
@@ -1,7 +1,7 @@
 package org.infinite.infinite.ui.widget
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.Button
 import net.minecraft.network.chat.Component
 import org.infinite.InfiniteClient
@@ -46,8 +46,8 @@ class FeatureSettingButton(x: Int, y: Int, width: Int, height: Int, feature: Fea
     private var clickAnimStartTime: Long = -1L
     private val clickAnimDuration = 600.0 // 0.6秒で1回転
 
-    override fun renderContents(
-        guiGraphics: GuiGraphics,
+    override fun extractContents(
+        guiGraphics: GuiGraphicsExtractor,
         i: Int,
         j: Int,
         f: Float,
diff --git a/src/client/kotlin/org/infinite/infinite/ui/widget/ListCategoryWidget.kt b/src/client/kotlin/org/infinite/infinite/ui/widget/ListCategoryWidget.kt
index 8212d5f6..52239613 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/widget/ListCategoryWidget.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/widget/ListCategoryWidget.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.widget
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.layouts.LinearLayout
 import net.minecraft.client.gui.narration.NarrationElementOutput
@@ -36,13 +36,6 @@ abstract class ListCategoryWidget<T : Category<*, out Feature>>(
         rebuildContent(width)
     }
 
-    fun setSearchQuery(query: String) {
-        val normalized = query.trim().lowercase()
-        if (normalized == searchQuery) return
-        searchQuery = normalized
-        rebuildContent(width)
-    }
-
     private fun rebuildContent(newWidth: Int) {
         val availableWidth = newWidth - 2 * containerMargin
         val innerWidth = (availableWidth - scrollbarWidth).coerceAtLeast(120)
@@ -95,7 +88,7 @@ abstract class ListCategoryWidget<T : Category<*, out Feature>>(
 
     abstract fun buildContent(layout: LinearLayout, width: Int, query: String)
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val colorScheme = InfiniteClient.theme.colorScheme
 
         // アニメーション計算
@@ -151,7 +144,7 @@ abstract class ListCategoryWidget<T : Category<*, out Feature>>(
 
         // 内部コンテナ（スクロールエリア）の描画
         // 注意: container 内部でも Graphics2DRenderer を使っている場合は、そこでも flush() が必要です
-        container.render(guiGraphics, mouseX, mouseY, delta)
+        container.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 
     private fun categoryDescription(): String {
diff --git a/src/client/kotlin/org/infinite/infinite/ui/widget/ListFeatureWidget.kt b/src/client/kotlin/org/infinite/infinite/ui/widget/ListFeatureWidget.kt
index 238dcc1d..447ee36d 100644
--- a/src/client/kotlin/org/infinite/infinite/ui/widget/ListFeatureWidget.kt
+++ b/src/client/kotlin/org/infinite/infinite/ui/widget/ListFeatureWidget.kt
@@ -1,6 +1,6 @@
 package org.infinite.infinite.ui.widget
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractContainerWidget
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarrationElementOutput
@@ -20,7 +20,7 @@ abstract class ListFeatureWidget<T : Feature>(
     width: Int,
     height: Int = FONT_SIZE + PADDING * 2 + 6,
     protected val feature: T,
-) : AbstractContainerWidget(x, y, width, height, Component.literal(feature.name)) {
+) : AbstractContainerWidget(x, y, width, height, Component.literal(feature.name), defaultSettings(10)) {
 
     companion object {
         const val PADDING = 8
@@ -101,7 +101,7 @@ abstract class ListFeatureWidget<T : Feature>(
         relocateChildren()
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, i: Int, j: Int, f: Float) {
         val theme = InfiniteClient.theme
         val graphics2DRenderer = Graphics2DRenderer(guiGraphics)
         val colorScheme = theme.colorScheme
diff --git a/src/client/kotlin/org/infinite/libs/core/features/categories/LocalFeatureCategories.kt b/src/client/kotlin/org/infinite/libs/core/features/categories/LocalFeatureCategories.kt
index 284447f8..afebb3f7 100644
--- a/src/client/kotlin/org/infinite/libs/core/features/categories/LocalFeatureCategories.kt
+++ b/src/client/kotlin/org/infinite/libs/core/features/categories/LocalFeatureCategories.kt
@@ -99,25 +99,25 @@ abstract class LocalFeatureCategories :
         finalCommands
     }
 
-    lateinit var keybindingPairs: List<LocalFeature.BindingPair>
+    lateinit var keyMappingPairs: List<LocalFeature.MappingPair>
     fun registerAllActions() {
-        val result = mutableListOf<LocalFeature.BindingPair>()
+        val result = mutableListOf<LocalFeature.MappingPair>()
         categories.values.forEach {
             result.addAll(it.registerAllActions())
         }
         result.add(
-            InfiniteClient.gameScreenBindingPair,
+            InfiniteClient.gameScreenMappingPair,
         )
         result.forEach { TranslationChecker.add(it.mapping.name) }
-        keybindingPairs = result.toList()
+        keyMappingPairs = result.toList()
     }
 
-    fun keyBindingActions() {
-        if (!::keybindingPairs.isInitialized) {
+    fun keyMappingActions() {
+        if (!::keyMappingPairs.isInitialized) {
             return
         }
-        if (keybindingPairs.isEmpty()) return
-        keybindingPairs.forEach { pair ->
+        if (keyMappingPairs.isEmpty()) return
+        keyMappingPairs.forEach { pair ->
             while (pair.mapping.consumeClick()) {
                 pair.action()
             }
diff --git a/src/client/kotlin/org/infinite/libs/core/features/categories/category/LocalCategory.kt b/src/client/kotlin/org/infinite/libs/core/features/categories/category/LocalCategory.kt
index 72b0d06d..d5372c96 100644
--- a/src/client/kotlin/org/infinite/libs/core/features/categories/category/LocalCategory.kt
+++ b/src/client/kotlin/org/infinite/libs/core/features/categories/category/LocalCategory.kt
@@ -92,7 +92,7 @@ abstract class LocalCategory : Category<KClass<out LocalFeature>, LocalFeature>(
         result
     }
 
-    fun registerAllActions(): List<LocalFeature.BindingPair> = features.values.flatMap { it.registerAllActions() }
+    fun registerAllActions(): List<LocalFeature.MappingPair> = features.values.flatMap { it.registerAllActions() }
 
     private data class InternalCommandWrapper(val priority: Int, val commands: List<RenderCommand2D>)
 }
diff --git a/src/client/kotlin/org/infinite/libs/core/features/feature/LocalFeature.kt b/src/client/kotlin/org/infinite/libs/core/features/feature/LocalFeature.kt
index a32e3a61..93f3db04 100644
--- a/src/client/kotlin/org/infinite/libs/core/features/feature/LocalFeature.kt
+++ b/src/client/kotlin/org/infinite/libs/core/features/feature/LocalFeature.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.core.features.feature
 
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper
 import net.minecraft.client.KeyMapping
 import org.infinite.libs.core.TickInterface
 import org.infinite.libs.core.features.Feature
@@ -27,17 +27,27 @@ open class LocalFeature :
         val action: () -> Unit, // 実行される処理
     )
 
-    data class BindingPair(
+    data class MappingPair(
         val mapping: KeyMapping,
         val action: () -> Unit,
     )
 
     private val registeredActions = mutableListOf<KeyAction>()
 
+    fun getActionTranslationKeys(): List<String> {
+        val parent = "key.${translation()}"
+        val keys = mutableListOf<String>()
+        registeredActions.forEach { action ->
+            keys.add("$parent.${action.name}")
+        }
+        keys.add("$parent.toggle")
+        return keys
+    }
+
     // LocalFeature.kt 修正案
-    fun registerAllActions(): List<BindingPair> {
+    fun registerAllActions(): List<MappingPair> {
         val parent = "key.${translation()}"
-        val mappings = mutableListOf<BindingPair>()
+        val mappings = mutableListOf<MappingPair>()
 
         // 1. 個別アクションの登録
         registeredActions.forEach { action ->
@@ -46,12 +56,12 @@ open class LocalFeature :
                 action.defaultKey,
                 action.category,
             )
-            // registerKeyBinding は 1回だけ呼ぶ
-            KeyBindingHelper.registerKeyBinding(mapping)
+            // registerKeyMapping は 1回だけ呼ぶ
+            KeyMappingHelper.registerKeyMapping(mapping)
             val wrappedAction = {
                 if (this.isEnabled()) action.action()
             }
-            mappings.add(BindingPair(mapping, wrappedAction))
+            mappings.add(MappingPair(mapping, wrappedAction))
         }
 
         // 2. デフォルトのトグルキーの登録
@@ -60,8 +70,8 @@ open class LocalFeature :
             defaultToggleKey,
             KeyMapping.Category.GAMEPLAY,
         )
-        KeyBindingHelper.registerKeyBinding(toggleMapping)
-        mappings.add(BindingPair(toggleMapping) { toggle() })
+        KeyMappingHelper.registerKeyMapping(toggleMapping)
+        mappings.add(MappingPair(toggleMapping) { toggle() })
 
         return mappings.toList()
     }
diff --git a/src/client/kotlin/org/infinite/libs/core/features/property/list/BlockAndColorListProperty.kt b/src/client/kotlin/org/infinite/libs/core/features/property/list/BlockAndColorListProperty.kt
index 5e6e3505..fb1629d2 100644
--- a/src/client/kotlin/org/infinite/libs/core/features/property/list/BlockAndColorListProperty.kt
+++ b/src/client/kotlin/org/infinite/libs/core/features/property/list/BlockAndColorListProperty.kt
@@ -3,7 +3,7 @@ package org.infinite.libs.core.features.property.list
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.client.gui.narration.NarrationElementOutput
@@ -186,9 +186,9 @@ class BlockAndColorListProperty(default: List<BlockAndColor>) : ListProperty<Blo
             return blockClicked || colorClicked || super.mouseClicked(mouseButtonEvent, bl)
         }
 
-        override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-            blockInput.render(guiGraphics, mouseX, mouseY, partialTick)
-            colorInput.render(guiGraphics, mouseX, mouseY, partialTick)
+        override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, partialTick: Float) {
+            blockInput.extractRenderState(guiGraphics, mouseX, mouseY, partialTick)
+            colorInput.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTick)
         }
 
         override fun updateWidgetNarration(narrationElementOutput: NarrationElementOutput) {
diff --git a/src/client/kotlin/org/infinite/libs/core/tick/GameTicks.kt b/src/client/kotlin/org/infinite/libs/core/tick/GameTicks.kt
index fff184ed..0c0ce7c5 100644
--- a/src/client/kotlin/org/infinite/libs/core/tick/GameTicks.kt
+++ b/src/client/kotlin/org/infinite/libs/core/tick/GameTicks.kt
@@ -18,7 +18,7 @@ class GameTicks(
     }
 
     fun register() {
-        ClientTickEvents.START_WORLD_TICK.register { _ -> onStartTick() }
-        ClientTickEvents.END_WORLD_TICK.register { _ -> onEndTick() }
+        ClientTickEvents.START_LEVEL_TICK.register { _ -> onStartTick() }
+        ClientTickEvents.END_LEVEL_TICK.register { _ -> onEndTick() }
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/core/tick/RenderTicks.kt b/src/client/kotlin/org/infinite/libs/core/tick/RenderTicks.kt
index bb8bcda8..86ea586a 100644
--- a/src/client/kotlin/org/infinite/libs/core/tick/RenderTicks.kt
+++ b/src/client/kotlin/org/infinite/libs/core/tick/RenderTicks.kt
@@ -3,17 +3,18 @@ package org.infinite.libs.core.tick
 import com.mojang.blaze3d.buffers.GpuBufferSlice
 import com.mojang.blaze3d.resource.GraphicsResourceAllocator
 import kotlinx.coroutines.runBlocking
-import net.minecraft.client.Camera
 import net.minecraft.client.DeltaTracker
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender
+import net.minecraft.client.renderer.state.level.CameraRenderState
 import org.infinite.InfiniteClient
 import org.infinite.libs.graphics.graphics2d.RenderSystem2D
 import org.infinite.libs.graphics.graphics3d.RenderSystem3D
 import org.infinite.libs.graphics.system.ProjectionData
 import org.infinite.libs.interfaces.MinecraftInterface
 import org.infinite.libs.minecraft.aim.AimSystem
-import org.joml.Matrix4d
 import org.joml.Matrix4f
+import org.joml.Matrix4fc
 import org.joml.Vector4f
 
 object RenderTicks : MinecraftInterface() {
@@ -35,7 +36,7 @@ object RenderTicks : MinecraftInterface() {
     }
 
     fun onStartUiRendering(
-        guiGraphics: GuiGraphics,
+        guiGraphics: GuiGraphicsExtractor,
         deltaTracker: DeltaTracker,
     ) {
         updateFps()
@@ -55,7 +56,7 @@ object RenderTicks : MinecraftInterface() {
     }
 
     fun onEndUiRendering(
-        guiGraphics: GuiGraphics,
+        guiGraphics: GuiGraphicsExtractor,
         deltaTracker: DeltaTracker,
     ) {
         val commands =
@@ -67,53 +68,53 @@ object RenderTicks : MinecraftInterface() {
     }
 
     private fun updateProjectionData(
-        camera: Camera,
-        positionMatrix: Matrix4f,
-        projectionMatrix: Matrix4f,
+        camera: CameraRenderState,
+        modelViewMatrix4fc: Matrix4fc,
     ) {
+        val modelViewMatrix = Matrix4f(modelViewMatrix4fc)
         val client = net.minecraft.client.Minecraft.getInstance()
         _latestProjectionData = ProjectionData(
-            cameraPos = camera.position(),
-            modelViewMatrix = Matrix4f(positionMatrix),
-            projectionMatrix = Matrix4f(projectionMatrix),
+            cameraPos = camera.pos,
+            modelViewMatrix = modelViewMatrix,
+            projectionMatrix = camera.projectionMatrix,
             scaledWidth = client.window.guiScaledWidth,
             scaledHeight = client.window.guiScaledHeight,
         )
     }
-
     fun onLevelRendering(
-        graphicsResourceAllocator: GraphicsResourceAllocator,
+        resourceAllocator: GraphicsResourceAllocator,
         deltaTracker: DeltaTracker,
-        renderBlockOutline: Boolean,
-        camera: Camera,
-        positionMatrix: Matrix4f,
-        projectionMatrix: Matrix4f,
-        frustumMatrix: Matrix4f,
-        gpuBufferSlice: GpuBufferSlice,
-        vector4f: Vector4f,
-        bl2: Boolean,
+        renderOutline: Boolean,
+        cameraState: CameraRenderState, // 新しいステート
+        modelViewMatrix: Matrix4fc, // Matrix4fcに変更
+        terrainFog: GpuBufferSlice,
+        fogColor: Vector4f,
+        shouldRenderSky: Boolean,
+        chunkSectionsToRender: ChunkSectionsToRender,
     ) {
-        updateProjectionData(
-            camera,
-            positionMatrix,
-            projectionMatrix,
-        )
+        updateProjectionData(cameraState, modelViewMatrix)
+        // 4. RenderSystem3Dの初期化
+        // ※RenderSystem3Dのコンストラクタもこれに合わせて修正が必要です
         val renderSystem3D = RenderSystem3D(
-            graphicsResourceAllocator,
+            resourceAllocator,
             deltaTracker,
-            renderBlockOutline,
-            camera,
-            positionMatrix,
-            projectionMatrix,
-            frustumMatrix,
-            gpuBufferSlice,
-            vector4f, bl2,
+            renderOutline,
+            cameraState,
+            latestProjectionData!!.modelViewMatrix,
+            latestProjectionData!!.projectionMatrix,
+            terrainFog,
+            fogColor,
+            shouldRenderSky,
+            chunkSectionsToRender,
         )
+
         _renderSnapShot = renderSystem3D.snapShot()
-        val commands =
-            runBlocking {
-                return@runBlocking InfiniteClient.localFeatures.onLevelRendering()
-            }
+
+        // 5. 特徴量（Features）の実行
+        val commands = runBlocking {
+            return@runBlocking InfiniteClient.localFeatures.onLevelRendering()
+        }
+
         renderSystem3D.render(commands)
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/core/tick/SystemTicks.kt b/src/client/kotlin/org/infinite/libs/core/tick/SystemTicks.kt
index b1a81882..c2b6e82c 100644
--- a/src/client/kotlin/org/infinite/libs/core/tick/SystemTicks.kt
+++ b/src/client/kotlin/org/infinite/libs/core/tick/SystemTicks.kt
@@ -9,7 +9,7 @@ object SystemTicks : TickInterface {
     }
 
     override fun onEndTick() {
-        InfiniteClient.localFeatures.keyBindingActions()
+        InfiniteClient.localFeatures.keyMappingActions()
     }
 
     fun register() {
diff --git a/src/client/kotlin/org/infinite/libs/graphics/Graphics2D.kt b/src/client/kotlin/org/infinite/libs/graphics/Graphics2D.kt
index ba0ff1c0..52c88302 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/Graphics2D.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/Graphics2D.kt
@@ -16,7 +16,6 @@ import org.infinite.libs.interfaces.MinecraftInterface
 import org.joml.Matrix4f
 import kotlin.math.PI
 import kotlin.math.min
-import kotlin.math.sqrt
 
 /**
  * MDN CanvasRenderingContext2D API を Minecraft GuiGraphics 上に再現するクラス。
@@ -24,9 +23,7 @@ import kotlin.math.sqrt
  */
 open class Graphics2D : MinecraftInterface() {
     private val deltaTracker: DeltaTracker by lazy { Minecraft.getInstance().deltaTracker }
-    val gameDelta: Float get() = deltaTracker.gameTimeDeltaTicks
-    val realDelta: Float get() = deltaTracker.realtimeDeltaTicks
-
+    val delta: Float get() = deltaTracker.getGameTimeDeltaPartialTick(false)
     open val width: Int get() = minecraft.window.guiScaledWidth
     open val height: Int get() = minecraft.window.guiScaledHeight
 
@@ -41,7 +38,7 @@ open class Graphics2D : MinecraftInterface() {
         get() {
             val gameRenderer = minecraft.gameRenderer
             val camera = gameRenderer.mainCamera
-            val fov = gameRenderer.getFov(camera, realDelta, true)
+            val fov = camera.fov
             val base = options.fov().get().toFloat()
             return fov / base
         }
diff --git a/src/client/kotlin/org/infinite/libs/graphics/bundle/Graphics2DRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/bundle/Graphics2DRenderer.kt
index 29758402..9efef0aa 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/bundle/Graphics2DRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/bundle/Graphics2DRenderer.kt
@@ -1,10 +1,10 @@
 package org.infinite.libs.graphics.bundle
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.libs.graphics.Graphics2D
 import org.infinite.libs.graphics.graphics2d.RenderSystem2D
 
-class Graphics2DRenderer(guiGraphics: GuiGraphics) : Graphics2D() {
+class Graphics2DRenderer(guiGraphics: GuiGraphicsExtractor) : Graphics2D() {
     private val renderSystem2D = RenderSystem2D(guiGraphics)
     fun flush() {
         renderSystem2D.render(commands())
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/RenderSystem2D.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/RenderSystem2D.kt
index 3c7ab4aa..ff6517c6 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/RenderSystem2D.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/RenderSystem2D.kt
@@ -1,11 +1,11 @@
 package org.infinite.libs.graphics.graphics2d
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.libs.graphics.graphics2d.structs.RenderCommand2D
 import org.infinite.libs.graphics.graphics2d.system.*
 
 class RenderSystem2D(
-    private val gui: GuiGraphics,
+    private val gui: GuiGraphicsExtractor,
 ) {
     private val rectRenderer = RectRenderer(gui)
     private val quadRenderer = QuadRenderer(gui)
@@ -16,9 +16,8 @@ class RenderSystem2D(
     private val blockRenderer = BlockRenderer(gui)
 
     fun render(commands: List<RenderCommand2D>) {
-        for (i in 0 until commands.size) {
-            val command = commands[i]
-            executeCommand(command)
+        for (element in commands) {
+            executeCommand(element)
         }
     }
 
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillQuad.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillQuad.kt
index 50bbef59..0c9e52f8 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillQuad.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillQuad.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.graphics.graphics2d.minecraft
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.render.TextureSetup
 import net.minecraft.client.renderer.RenderPipelines
 import org.infinite.libs.graphics.graphics2d.elements.ColoredQuadRenderState
@@ -9,7 +9,7 @@ import org.joml.Matrix3x2f
 /**
  * 4つの頂点とそれぞれの色を指定して四角形を描画します。
  */
-fun GuiGraphics.fillQuad(
+fun GuiGraphicsExtractor.fillQuad(
     x0: Float,
     y0: Float,
     x1: Float,
@@ -26,7 +26,7 @@ fun GuiGraphics.fillQuad(
     val renderPipeline = RenderPipelines.GUI
     val textureSetup = TextureSetup.noTexture()
 
-    this.guiRenderState.submitGuiElement(
+    this.guiRenderState.addGuiElement(
         ColoredQuadRenderState(
             renderPipeline,
             textureSetup,
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillRect.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillRect.kt
index c39ee310..d80ddb7f 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillRect.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillRect.kt
@@ -1,12 +1,12 @@
 package org.infinite.libs.graphics.graphics2d.minecraft
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.render.TextureSetup
 import net.minecraft.client.renderer.RenderPipelines
 import org.infinite.libs.graphics.graphics2d.elements.ColoredRectangleRenderState
 import org.joml.Matrix3x2f
 
-fun GuiGraphics.fill(
+fun GuiGraphicsExtractor.fill(
     x: Float,
     y: Float,
     width: Float,
@@ -16,7 +16,7 @@ fun GuiGraphics.fill(
     this.fill(x, y, width, height, color, color, color, color)
 }
 
-fun GuiGraphics.fill(
+fun GuiGraphicsExtractor.fill(
     x: Float,
     y: Float,
     width: Float,
@@ -28,7 +28,7 @@ fun GuiGraphics.fill(
 ) {
     val renderPipeline = RenderPipelines.GUI
     val textureSetup = TextureSetup.noTexture()
-    this.guiRenderState.submitGuiElement(
+    this.guiRenderState.addGuiElement(
         ColoredRectangleRenderState(
             renderPipeline,
             textureSetup,
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillTriangle.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillTriangle.kt
index 78def8e7..c5527c9d 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillTriangle.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/minecraft/FillTriangle.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.graphics.graphics2d.minecraft
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.render.TextureSetup
 import net.minecraft.client.renderer.RenderPipelines
 import org.infinite.libs.graphics.graphics2d.elements.ColoredTriangleRenderState
@@ -9,7 +9,7 @@ import org.joml.Matrix3x2f
 /**
  * 3つの頂点とそれぞれの色を指定して三角形を描画します。
  */
-fun GuiGraphics.fillTriangle(
+fun GuiGraphicsExtractor.fillTriangle(
     x0: Float,
     y0: Float,
     x1: Float,
@@ -23,7 +23,7 @@ fun GuiGraphics.fillTriangle(
     val renderPipeline = RenderPipelines.GUI
     val textureSetup = TextureSetup.noTexture()
 
-    this.guiRenderState.submitGuiElement(
+    this.guiRenderState.addGuiElement(
         ColoredTriangleRenderState(
             renderPipeline,
             textureSetup,
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/BlockRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/BlockRenderer.kt
index 077a9a0d..dd712827 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/BlockRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/BlockRenderer.kt
@@ -1,9 +1,9 @@
 package org.infinite.libs.graphics.graphics2d.system
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.renderer.RenderPipelines
-import net.minecraft.client.renderer.block.model.BlockModelPart
+import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart
 import net.minecraft.core.Direction
 import net.minecraft.util.RandomSource
 import net.minecraft.world.item.ItemStack
@@ -11,7 +11,7 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
 import org.infinite.InfiniteClient
 
-class BlockRenderer(private val gui: GuiGraphics) {
+class BlockRenderer(private val gui: GuiGraphicsExtractor) {
     private val random = RandomSource.create()
 
     fun block(block: Block, x: Float, y: Float, size: Float) {
@@ -23,19 +23,15 @@ class BlockRenderer(private val gui: GuiGraphics) {
             pose.pushMatrix()
             pose.translate(x, y)
             pose.scale(size / 16f, size / 16f)
-            gui.renderItem(itemStack, 0, 0)
+            gui.item(itemStack, 0, 0)
             pose.popMatrix()
         } else {
-            val model = mc.blockRenderer.getBlockModel(block.defaultBlockState())
-            val parts = mutableListOf<BlockModelPart>()
+            val model = mc.blockModelResolver.modelManager.blockStateModelSet.get(block.defaultBlockState())
+            val parts = mutableListOf<BlockStateModelPart>()
             model.collectParts(random, parts)
 
-            val sprite = if (parts.isNotEmpty()) {
-                parts.first().getQuads(Direction.UP).firstOrNull()?.sprite()
-                    ?: parts.first().particleIcon()
-            } else {
-                model.particleIcon()
-            }
+            val sprite =
+                parts.first().getQuads(Direction.UP).firstOrNull()?.materialInfo?.sprite ?: return
             val color = if (block == Blocks.WATER) {
                 val aqua = 210f
                 InfiniteClient.theme.colorScheme.color(aqua, 1f, 0.5f, 1f)
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/ItemRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/ItemRenderer.kt
index 6fc7868e..3c35ca61 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/ItemRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/ItemRenderer.kt
@@ -1,12 +1,12 @@
 package org.infinite.libs.graphics.graphics2d.system
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.renderer.item.TrackingItemStackRenderState
 import net.minecraft.world.item.ItemDisplayContext
 import org.infinite.libs.graphics.graphics2d.structs.RenderCommand2D
 import org.infinite.libs.interfaces.MinecraftInterface
 
-class ItemRenderer(private val gui: GuiGraphics) : MinecraftInterface() {
+class ItemRenderer(private val gui: GuiGraphicsExtractor) : MinecraftInterface() {
 
 // ItemRenderer.kt
 
@@ -31,7 +31,7 @@ class ItemRenderer(private val gui: GuiGraphics) : MinecraftInterface() {
             pose.pushMatrix()
             pose.translate(x, y)
             pose.scale(cmd.scale, cmd.scale)
-            gui.renderItem(stack, 0, 0)
+            gui.item(stack, 0, 0)
             pose.popMatrix()
         } catch (throwable: Throwable) {
             throw throwable
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/Path2D.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/Path2D.kt
index 6d98f7c5..6653c0b2 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/Path2D.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/Path2D.kt
@@ -2,11 +2,11 @@ package org.infinite.libs.graphics.graphics2d.system
 
 import org.infinite.libs.graphics.graphics2d.structs.FillRule
 import org.infinite.libs.graphics.graphics2d.structs.StrokeStyle
-import org.infinite.nativebind.XrossFillRule
-import org.infinite.nativebind.XrossLineCap
-import org.infinite.nativebind.XrossLineJoin
+import org.infinite.native.XrossFillRule
+import org.infinite.native.XrossLineCap
+import org.infinite.native.XrossLineJoin
 import java.lang.foreign.ValueLayout
-import org.infinite.nativebind.Path2D as NativePath2D
+import org.infinite.native.Path2D as NativePath2D
 
 class Path2D : AutoCloseable {
     private val native = NativePath2D()
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/QuadRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/QuadRenderer.kt
index 91288a04..9e29ae81 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/QuadRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/QuadRenderer.kt
@@ -1,9 +1,10 @@
 package org.infinite.libs.graphics.graphics2d.system
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.libs.graphics.graphics2d.minecraft.fillQuad
+import org.infinite.libs.graphics.graphics2d.normalizeToCCW
 
-class QuadRenderer(private val guiGraphics: GuiGraphics) {
+class QuadRenderer(private val guiGraphics: GuiGraphicsExtractor) {
 
     fun fillQuad(
         x0: Float,
@@ -36,55 +37,4 @@ class QuadRenderer(private val guiGraphics: GuiGraphics) {
     ) {
         fillQuad(x0, y0, x1, y1, x2, y2, x3, y3, color, color, color, color)
     }
-
-    /**
-     * 頂点と色のペアを保持するデータ構造
-     */
-    private data class NormalizedQuad(
-        val x0: Float,
-        val y0: Float,
-        val x1: Float,
-        val y1: Float,
-        val x2: Float,
-        val y2: Float,
-        val x3: Float,
-        val y3: Float,
-        val c0: Int,
-        val c1: Int,
-        val c2: Int,
-        val c3: Int,
-    )
-
-    /**
-     * 頂点の順序を反時計回り(CCW)に正規化し、対応する色も入れ替える
-     */
-    private fun normalizeToCCW(
-        x0: Float,
-        y0: Float,
-        x1: Float,
-        y1: Float,
-        x2: Float,
-        y2: Float,
-        x3: Float,
-        y3: Float,
-        c0: Int,
-        c1: Int,
-        c2: Int,
-        c3: Int,
-    ): NormalizedQuad {
-        // 符号付き面積の計算 (Shoelace formula)
-        // MinecraftのGUI座標系（下が正）では、この値が正なら時計回り(CW)
-        val area = (x1 - x0) * (y1 + y0) +
-            (x2 - x1) * (y2 + y1) +
-            (x3 - x2) * (y3 + y2) +
-            (x0 - x3) * (y0 + y3)
-
-        return if (area < 0) {
-            // 時計回りなので、頂点1と頂点3を入れ替えて反時計回りにする (0 -> 3 -> 2 -> 1)
-            NormalizedQuad(x0, y0, x3, y3, x2, y2, x1, y1, c0, c3, c2, c1)
-        } else {
-            // 既に反時計回り
-            NormalizedQuad(x0, y0, x1, y1, x2, y2, x3, y3, c0, c1, c2, c3)
-        }
-    }
 }
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/RectRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/RectRenderer.kt
index 76db25b5..c84aaae2 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/RectRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/RectRenderer.kt
@@ -1,11 +1,11 @@
 package org.infinite.libs.graphics.graphics2d.system
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.libs.graphics.graphics2d.minecraft.fill
 import org.infinite.libs.graphics.graphics2d.minecraft.fillQuad
 
 class RectRenderer(
-    private val guiGraphics: GuiGraphics,
+    private val guiGraphics: GuiGraphicsExtractor,
 ) {
 
     fun fillRect(x: Float, y: Float, w: Float, h: Float, color: Int) {
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextRenderer.kt
index e7d48130..ee10a2b2 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextRenderer.kt
@@ -1,14 +1,14 @@
 package org.infinite.libs.graphics.graphics2d.system
 
 import net.minecraft.client.gui.Font
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.client.gui.render.state.GuiTextRenderState
+import net.minecraft.client.gui.GuiGraphicsExtractor
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState
 import net.minecraft.locale.Language
 import net.minecraft.network.chat.FormattedText
 import org.infinite.libs.interfaces.MinecraftInterface
 import org.joml.Matrix3x2f
 
-class TextRenderer(private val guiGraphics: GuiGraphics) : MinecraftInterface() {
+class TextRenderer(private val guiGraphics: GuiGraphicsExtractor) : MinecraftInterface() {
     private fun font(name: String): Font = org.infinite.utils.Font(name)
 
     fun text(font: String, text: String, x: Float, y: Float, color: Int, size: Float = 8.0f, shadow: Boolean = false) {
@@ -22,7 +22,7 @@ class TextRenderer(private val guiGraphics: GuiGraphics) : MinecraftInterface()
 
         // 描画（座標は0, 0でOK）
         val formattedCharSequence = Language.getInstance().getVisualOrder(FormattedText.of(text))
-        guiGraphics.guiRenderState.submitText(
+        guiGraphics.guiRenderState.addText(
             GuiTextRenderState(
                 font,
                 formattedCharSequence,
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextureRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextureRenderer.kt
index 215a14b2..c9f0d1a0 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextureRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TextureRenderer.kt
@@ -1,10 +1,10 @@
 package org.infinite.libs.graphics.graphics2d.system
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.renderer.RenderPipelines
 import org.infinite.libs.graphics.graphics2d.structs.RenderCommand2D
 
-class TextureRenderer(private val gui: GuiGraphics) {
+class TextureRenderer(private val gui: GuiGraphicsExtractor) {
 
     fun drawTexture(cmd: RenderCommand2D.DrawTexture) {
         val pose = gui.pose()
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TriangleRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TriangleRenderer.kt
index 854d8665..840925e4 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TriangleRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics2d/system/TriangleRenderer.kt
@@ -1,10 +1,10 @@
 package org.infinite.libs.graphics.graphics2d.system
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import org.infinite.libs.graphics.graphics2d.minecraft.fillTriangle
 
 class TriangleRenderer(
-    private val guiGraphics: GuiGraphics,
+    private val guiGraphics: GuiGraphicsExtractor,
 ) {
     /**
      * 三角形を塗りつぶす（各頂点の色を指定可能）
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics3d/RenderSystem3D.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics3d/RenderSystem3D.kt
index ad3e1b39..141ac3bc 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics3d/RenderSystem3D.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics3d/RenderSystem3D.kt
@@ -2,11 +2,11 @@ package org.infinite.libs.graphics.graphics3d
 
 import com.mojang.blaze3d.buffers.GpuBufferSlice
 import com.mojang.blaze3d.resource.GraphicsResourceAllocator
-import net.minecraft.client.Camera
 import net.minecraft.client.DeltaTracker
-import net.minecraft.client.renderer.LightTexture
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender
 import net.minecraft.client.renderer.rendertype.RenderType
 import net.minecraft.client.renderer.rendertype.RenderTypes
+import net.minecraft.client.renderer.state.level.CameraRenderState
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.gizmos.GizmoStyle
 import net.minecraft.gizmos.Gizmos
@@ -16,25 +16,24 @@ import org.infinite.libs.graphics.graphics3d.system.QuadRenderer
 import org.infinite.libs.graphics.graphics3d.system.TexturedRenderer
 import org.infinite.libs.graphics.graphics3d.system.resource.RenderLayers
 import org.infinite.libs.interfaces.MinecraftInterface
-import org.infinite.nativebind.xross.runtime.XrossByteArrayView
 import org.joml.Matrix4f
 import org.joml.Vector4f
 import java.lang.foreign.ValueLayout
-import java.util.*
 
 @Suppress("unused")
 class RenderSystem3D(
     private val graphicsResourceAllocator: GraphicsResourceAllocator,
     private val deltaTracker: DeltaTracker,
     private val renderBlockOutline: Boolean,
-    private val camera: Camera,
-    private val positionMatrix: Matrix4f,
+    private val cameraState: CameraRenderState,
+    private val modelViewMatrix: Matrix4f,
     private val projectionMatrix: Matrix4f,
-    private val frustumMatrix: Matrix4f,
-    private val gpuBufferSlice: GpuBufferSlice,
-    private val vector4f: Vector4f,
-    private val bl2: Boolean,
+    private val terrainFog: GpuBufferSlice,
+    private val fogColor: Vector4f,
+    private val shouldRenderSky: Boolean,
+    private val chunkSectionsToRender: ChunkSectionsToRender? = null,
 ) : MinecraftInterface() {
+
     private val bufferSource = minecraft.renderBuffers().bufferSource()
     private val quadRenderer = QuadRenderer(bufferSource)
     private val texturedRenderer = TexturedRenderer(bufferSource)
@@ -43,22 +42,23 @@ class RenderSystem3D(
      * レンダリングスレッドから計算スレッドへ渡すための安全なスナップショット
      */
     data class RenderSnapshot(
-        val posMatrix: Matrix4f, // Matrix4f(positionMatrix) でコピー済み
-        val projMatrix: Matrix4f, // Matrix4f(projectionMatrix) でコピー済み
-        val cameraPos: Vec3, // camera.position
-        val partialTicks: Float, // deltaTracker.gameTimeDeltaTicks
+        val posMatrix: Matrix4f,
+        val projMatrix: Matrix4f,
+        val cameraPos: Vec3, // cameraState.pos から取得
+        val partialTicks: Float,
         val scaledWidth: Int,
         val scaledHeight: Int,
-        val isOutlineEnabled: Boolean, // renderBlockOutline
+        val isOutlineEnabled: Boolean,
     )
 
     fun snapShot(): RenderSnapshot {
         val window = minecraft.window
 
         return RenderSnapshot(
-            posMatrix = Matrix4f(positionMatrix),
+            posMatrix = Matrix4f(modelViewMatrix),
             projMatrix = Matrix4f(projectionMatrix),
-            cameraPos = Vec3(camera.position().x, camera.position().y, camera.position().z),
+            // CameraRenderState.pos は既に Vec3 (または Vector3f) なのでそれを利用
+            cameraPos = Vec3(cameraState.pos.x, cameraState.pos.y, cameraState.pos.z),
             partialTicks = deltaTracker.gameTimeDeltaTicks,
             scaledWidth = window.guiScaledWidth,
             scaledHeight = window.guiScaledHeight,
@@ -66,12 +66,7 @@ class RenderSystem3D(
         )
     }
 
-    fun test() {
-        val player = minecraft.player ?: return
-        val start = player.position()
-        val end = start.add(10.0, 10.0, 10.0)
-        drawLine(start, end, 0xFFFF0000.toInt(), 2f, false)
-    }
+    // --- 以下、描画ロジック (変更なしだが Matrix4fc 引数への対応を維持) ---
 
     fun drawLine(start: Vec3, end: Vec3, color: Int, lineWidth: Float, depthTest: Boolean = true) {
         val props = Gizmos.line(start, end, color, lineWidth)
@@ -92,33 +87,13 @@ class RenderSystem3D(
 
                 is RenderCommand3D.QuadFillGradient -> {
                     val renderType = RenderLayers.quads(c.depthTest)
-                    quadRenderer.drawQuad(
-                        renderType,
-                        Matrix4f(), // Unit matrix
-                        c.a,
-                        c.b,
-                        c.c,
-                        c.d,
-                        c.colorA,
-                        c.colorB,
-                        c.colorC,
-                        c.colorD,
-                    )
+                    quadRenderer.drawQuad(renderType, Matrix4f(), c.a, c.b, c.c, c.d, c.colorA, c.colorB, c.colorC, c.colorD)
                     usedRenderTypes.add(renderType)
                 }
 
                 is RenderCommand3D.QuadTextured -> {
                     val renderType = RenderTypes.entityTranslucent(c.texture)
-                    texturedRenderer.drawQuad(
-                        renderType,
-                        Matrix4f(), // Unit matrix
-                        c.a,
-                        c.b,
-                        c.c,
-                        c.d,
-                        OverlayTexture.NO_OVERLAY,
-                        LightTexture.FULL_BRIGHT,
-                    )
+                    texturedRenderer.drawQuad(renderType, Matrix4f(), c.a, c.b, c.c, c.d, OverlayTexture.NO_OVERLAY, 15)
                     usedRenderTypes.add(renderType)
                 }
 
@@ -128,36 +103,13 @@ class RenderSystem3D(
 
                 is RenderCommand3D.TriangleFillGradient -> {
                     val renderType = RenderLayers.quads(c.depthTest)
-                    quadRenderer.drawTriangle(
-                        renderType,
-                        Matrix4f(), // Unit matrix
-                        c.a,
-                        c.b,
-                        c.c,
-                        c.colorA,
-                        c.colorB,
-                        c.colorC,
-                    )
-                    usedRenderTypes.add(renderType)
-                }
-
-                is RenderCommand3D.TriangleTextured -> {
-                    val renderType = RenderTypes.entityTranslucent(c.texture)
-                    texturedRenderer.drawTriangle(
-                        renderType,
-                        Matrix4f(), // Unit matrix
-                        c.a,
-                        c.b,
-                        c.c,
-                        OverlayTexture.NO_OVERLAY,
-                        LightTexture.FULL_BRIGHT,
-                    )
+                    quadRenderer.drawTriangle(renderType, Matrix4f(), c.a, c.b, c.c, c.colorA, c.colorB, c.colorC)
                     usedRenderTypes.add(renderType)
                 }
 
                 is RenderCommand3D.MeshBuffer -> {
                     val modelViewMatrix = c.matrix
-                    // 1. Lines Rendering
+                    // MeshBufferの描画処理... (元のコードを維持)
                     c.lineBuffer?.let { buffer ->
                         val renderType = RenderLayers.lines(false)
                         val consumer = bufferSource.getBuffer(renderType)
@@ -170,55 +122,20 @@ class RenderSystem3D(
                             val y2 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 4) * 4)
                             val z2 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 5) * 4)
                             val color = buffer.get(ValueLayout.JAVA_INT, (cursor + 6) * 4)
-
                             val a = (color ushr 24) and 0xFF
                             val r = (color shr 16) and 0xFF
                             val g = (color shr 8) and 0xFF
                             val b = color and 0xFF
-
-                            consumer.addVertex(modelViewMatrix, x1, y1, z1).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                                .setLineWidth(2.0f)
-                            consumer.addVertex(modelViewMatrix, x2, y2, z2).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                                .setLineWidth(2.0f)
+                            consumer.addVertex(modelViewMatrix, x1, y1, z1).setColor(r, g, b, a).setNormal(0f, 1f, 0f).setLineWidth(2.0f)
+                            consumer.addVertex(modelViewMatrix, x2, y2, z2).setColor(r, g, b, a).setNormal(0f, 1f, 0f).setLineWidth(2.0f)
                             cursor += 7
                         }
                         usedRenderTypes.add(renderType)
                     }
-
-                    // 2. Quads Rendering
-                    c.quadBuffer?.let { buffer ->
-                        val renderType = RenderLayers.quads(false)
-                        val consumer = bufferSource.getBuffer(renderType)
-                        var cursor = 0L
-                        while (cursor < c.quadBufferSize) {
-                            val x1 = buffer.get(ValueLayout.JAVA_FLOAT, cursor * 4)
-                            val y1 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 1) * 4)
-                            val z1 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 2) * 4)
-                            val x2 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 3) * 4)
-                            val y2 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 4) * 4)
-                            val z2 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 5) * 4)
-                            val x3 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 6) * 4)
-                            val y3 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 7) * 4)
-                            val z3 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 8) * 4)
-                            val x4 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 9) * 4)
-                            val y4 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 10) * 4)
-                            val z4 = buffer.get(ValueLayout.JAVA_FLOAT, (cursor + 11) * 4)
-                            val color = buffer.get(ValueLayout.JAVA_INT, (cursor + 12) * 4)
-
-                            val a = (color ushr 24) and 0xFF
-                            val r = (color shr 16) and 0xFF
-                            val g = (color shr 8) and 0xFF
-                            val b = color and 0xFF
-
-                            consumer.addVertex(modelViewMatrix, x1, y1, z1).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                            consumer.addVertex(modelViewMatrix, x2, y2, z2).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                            consumer.addVertex(modelViewMatrix, x3, y3, z3).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                            consumer.addVertex(modelViewMatrix, x4, y4, z4).setColor(r, g, b, a).setNormal(0f, 1f, 0f)
-                            cursor += 13
-                        }
-                        usedRenderTypes.add(renderType)
-                    }
                 }
+
+                // その他省略...
+                else -> {}
             }
         }
         if (usedRenderTypes.isNotEmpty()) {
@@ -240,40 +157,17 @@ class RenderSystem3D(
     }
 
     private fun drawTriangleFill(a: Vec3, b: Vec3, c: Vec3, color: Int, depthTest: Boolean = true) {
-        val props = Gizmos.addGizmo { primitives, partialTick -> primitives.addTriangleFan(arrayOf(a, b, c), color) }
-        if (!depthTest) {
-            props.setAlwaysOnTop()
-        }
+        val props = Gizmos.addGizmo { primitives, _ -> primitives.addTriangleFan(arrayOf(a, b, c), color) }
+        if (!depthTest) props.setAlwaysOnTop()
     }
 
-    private fun drawQuad(
-        a: Vec3,
-        b: Vec3,
-        c: Vec3,
-        d: Vec3,
-        color: Int,
-        depthTest: Boolean = true,
-    ) {
+    private fun drawQuad(a: Vec3, b: Vec3, c: Vec3, d: Vec3, color: Int, depthTest: Boolean = true) {
         val props = Gizmos.rect(a, b, c, d, GizmoStyle.stroke(color, 2.0f))
-        if (!depthTest) {
-            props.setAlwaysOnTop()
-        }
-    }
-
-    private fun drawQuadFill(
-        a: Vec3,
-        b: Vec3,
-        c: Vec3,
-        d: Vec3,
-        color: Int,
-        depthTest: Boolean = true,
-    ) {
-        val props = Gizmos.addGizmo { primitives, partialTick -> primitives.addQuad(a, b, c, d, color) }
-        if (!depthTest) {
-            props.setAlwaysOnTop()
-        }
+        if (!depthTest) props.setAlwaysOnTop()
     }
 
-    fun processNative(buffer: XrossByteArrayView) {
+    private fun drawQuadFill(a: Vec3, b: Vec3, c: Vec3, d: Vec3, color: Int, depthTest: Boolean = true) {
+        val props = Gizmos.addGizmo { primitives, _ -> primitives.addQuad(a, b, c, d, color) }
+        if (!depthTest) props.setAlwaysOnTop()
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/graphics/graphics3d/system/resource/ShaderPipelines.kt b/src/client/kotlin/org/infinite/libs/graphics/graphics3d/system/resource/ShaderPipelines.kt
index 417f4db5..ba2ad6e4 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/graphics3d/system/resource/ShaderPipelines.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/graphics3d/system/resource/ShaderPipelines.kt
@@ -1,67 +1,70 @@
 package org.infinite.libs.graphics.graphics3d.system.resource
 
 import com.mojang.blaze3d.pipeline.BlendFunction
+import com.mojang.blaze3d.pipeline.ColorTargetState
+import com.mojang.blaze3d.pipeline.DepthStencilState
 import com.mojang.blaze3d.pipeline.RenderPipeline
-import com.mojang.blaze3d.platform.DepthTestFunction
+import com.mojang.blaze3d.platform.CompareOp
 import com.mojang.blaze3d.vertex.DefaultVertexFormat
 import com.mojang.blaze3d.vertex.VertexFormat
 import net.minecraft.client.renderer.RenderPipelines
 import net.minecraft.resources.Identifier
 
 object ShaderPipelines {
+    private val translucentState = ColorTargetState(BlendFunction.TRANSLUCENT)
+    private val noDepthTest = DepthStencilState(CompareOp.ALWAYS_PASS, false)
+    private val lequalDepthTest = DepthStencilState(CompareOp.LESS_THAN_OR_EQUAL, true)
     val foglessLinesSnippet: RenderPipeline.Snippet = RenderPipeline
         .builder(
-            RenderPipelines.MATRICES_FOG_SNIPPET,
+            RenderPipelines.FOG_SNIPPET,
             RenderPipelines.GLOBALS_SNIPPET,
         )
         .withVertexShader(Identifier.parse("infinite:core/fogless_lines"))
         .withFragmentShader(Identifier.parse("infinite:core/fogless_lines"))
-        .withBlend(BlendFunction.TRANSLUCENT).withCull(false)
+        // .withBlend(BlendFunction.TRANSLUCENT) から変更
+        .withColorTargetState(translucentState)
+        .withCull(false)
         .withVertexFormat(
             DefaultVertexFormat.POSITION_COLOR_NORMAL_LINE_WIDTH,
             VertexFormat.Mode.LINES,
         )
         .buildSnippet()
 
-    /**
-     * Similar to the LINES ShaderPipeline, but with no fog.
-     */
     val depthTestLines: RenderPipeline = RenderPipelines.register(
         RenderPipeline.builder(foglessLinesSnippet)
-            .withLocation(
-                Identifier.parse("infinite:pipeline/depth_test_lines"),
-            )
+            .withLocation(Identifier.parse("infinite:pipeline/depth_test_lines"))
+            // 必要に応じて明示的にセット
+            .withDepthStencilState(lequalDepthTest)
             .build(),
     )
 
     val espLines: RenderPipeline = RenderPipelines.register(
         RenderPipeline.builder(foglessLinesSnippet)
             .withLocation(Identifier.parse("infinite:pipeline/esp_lines"))
-            .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build(),
+            .withDepthStencilState(noDepthTest)
+            .build(),
     )
 
-    val quads: RenderPipeline = RenderPipelines
-        .register(
-            RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
-                .withLocation(Identifier.parse("infinite:pipeline/quads"))
-                .withCull(false)
-                .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
-                .build(),
-        )
-
-    val espQuads: RenderPipeline = RenderPipelines
-        .register(
-            RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
-                .withLocation(Identifier.parse("infinite:pipeline/esp_quads"))
-                .withCull(false)
-                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build(),
-        )
+    val quads: RenderPipeline = RenderPipelines.register(
+        RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
+            .withLocation(Identifier.parse("infinite:pipeline/quads"))
+            .withCull(false)
+            .withDepthStencilState(lequalDepthTest)
+            .build(),
+    )
 
+    val espQuads: RenderPipeline = RenderPipelines.register(
+        RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
+            .withLocation(Identifier.parse("infinite:pipeline/esp_quads"))
+            .withCull(false)
+            .withDepthStencilState(noDepthTest)
+            .build(),
+    )
     val espQuadsNoCulling: RenderPipeline = RenderPipelines
         .register(
             RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
                 .withLocation(Identifier.parse("infinite:pipeline/esp_quads_no_culling"))
                 .withCull(false)
-                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build(),
+                .withDepthStencilState(noDepthTest).build(),
         )
 }
diff --git a/src/client/kotlin/org/infinite/libs/graphics/text/ModernFontManager.kt b/src/client/kotlin/org/infinite/libs/graphics/text/ModernFontManager.kt
index 558ef633..b9cb11fe 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/text/ModernFontManager.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/text/ModernFontManager.kt
@@ -3,7 +3,7 @@ package org.infinite.libs.graphics.text
 import net.minecraft.client.gui.font.FontManager
 import net.minecraft.client.renderer.PlayerSkinRenderCache
 import net.minecraft.client.renderer.texture.TextureManager
-import net.minecraft.client.resources.model.AtlasManager
+import net.minecraft.client.resources.model.sprite.AtlasManager
 
 class ModernFontManager(
     textureManager: TextureManager,
diff --git a/src/client/kotlin/org/infinite/libs/graphics/text/ModernTextRenderer.kt b/src/client/kotlin/org/infinite/libs/graphics/text/ModernTextRenderer.kt
index f41ee50d..4a83ae4b 100644
--- a/src/client/kotlin/org/infinite/libs/graphics/text/ModernTextRenderer.kt
+++ b/src/client/kotlin/org/infinite/libs/graphics/text/ModernTextRenderer.kt
@@ -2,9 +2,9 @@ package org.infinite.libs.graphics.text
 
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ActiveTextCollector
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.TextAlignment
-import net.minecraft.client.gui.render.state.GuiTextRenderState
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.Style
 import net.minecraft.util.ARGB
@@ -17,14 +17,14 @@ import org.joml.Matrix3x2f
 import java.util.function.Consumer
 
 class ModernTextRenderer(
-    private val graphics: GuiGraphics,
-    private val hoveredTextEffects: GuiGraphics.HoveredTextEffects,
+    private val graphics: GuiGraphicsExtractor,
+    private val hoveredTextEffects: GuiGraphicsExtractor.HoveredTextEffects,
     alpha: Float = 1.0f, // 透過度を追加（デフォルト1.0）
     private val additionalConsumer: Consumer<Style>? = null,
 ) : ActiveTextCollector,
     Consumer<Style> {
     private var params: ActiveTextCollector.Parameters = createDefaultTextParameters(alpha)
-    private fun createDefaultTextParameters(f: Float): ActiveTextCollector.Parameters = ActiveTextCollector.Parameters(Matrix3x2f(graphics.pose()), f, graphics.scissorStack.peek())
+    private fun createDefaultTextParameters(f: Float): ActiveTextCollector.Parameters = ActiveTextCollector.Parameters(Matrix3x2f(graphics.pose()), f, null)
 
     private val minecraft: Minecraft = Minecraft.getInstance()
 
@@ -111,7 +111,7 @@ class ModernTextRenderer(
         )
 
         if (ARGB.as8BitChannel(parameters.opacity()) != 0) {
-            guiRenderState.submitText(renderState)
+            guiRenderState.addText(renderState)
         }
         if (hasEffects) {
             ActiveTextCollector.findElementUnderCursor(
@@ -163,7 +163,7 @@ class ModernTextRenderer(
             parameters.scissor(),
         )
         if (ARGB.as8BitChannel(parameters.opacity()) != 0) {
-            graphics.guiRenderState.submitText(guiTextRenderState)
+            graphics.guiRenderState.addText(guiTextRenderState)
         }
 
         if (bl) {
diff --git a/src/client/kotlin/org/infinite/libs/log/LogSystem.kt b/src/client/kotlin/org/infinite/libs/log/LogSystem.kt
index 69228f54..a869f99e 100644
--- a/src/client/kotlin/org/infinite/libs/log/LogSystem.kt
+++ b/src/client/kotlin/org/infinite/libs/log/LogSystem.kt
@@ -121,7 +121,7 @@ object LogSystem : MinecraftInterface() {
 
             repeat(MESSAGES_PER_TICK) {
                 val message = messageQueue.poll() ?: return@repeat
-                player.displayClientMessage(message, false)
+                player.sendSystemMessage(message)
             }
         }
     }
diff --git a/src/client/kotlin/org/infinite/libs/minecraft/aim/task/AimTask.kt b/src/client/kotlin/org/infinite/libs/minecraft/aim/task/AimTask.kt
index d2de52a3..43f23f01 100644
--- a/src/client/kotlin/org/infinite/libs/minecraft/aim/task/AimTask.kt
+++ b/src/client/kotlin/org/infinite/libs/minecraft/aim/task/AimTask.kt
@@ -157,7 +157,7 @@ open class AimTask(
             val player = player ?: return CameraRoll.Zero
 
             // 【修正】足元ではなく目の位置(EyePos)を基準に計算する
-            val eyePos: Vec3 = player.eyePosition
+            val eyePos: Vec3 = player.getPosition(minecraft.deltaTracker.getGameTimeDeltaPartialTick(false)).add(Vec3(0.0, player.eyeHeight.toDouble(), 0.0))
 
             val d = target.x - eyePos.x
             val e = target.y - eyePos.y
diff --git a/src/client/kotlin/org/infinite/libs/minecraft/aim/task/config/AimTarget.kt b/src/client/kotlin/org/infinite/libs/minecraft/aim/task/config/AimTarget.kt
index bd347baf..ae207ff4 100644
--- a/src/client/kotlin/org/infinite/libs/minecraft/aim/task/config/AimTarget.kt
+++ b/src/client/kotlin/org/infinite/libs/minecraft/aim/task/config/AimTarget.kt
@@ -1,9 +1,7 @@
 package org.infinite.libs.minecraft.aim.task.config
 
-import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.Entity
-import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.phys.Vec3
 import org.infinite.libs.graphics.graphics3d.structs.CameraRoll
 import org.infinite.libs.interfaces.MinecraftInterface
@@ -42,7 +40,6 @@ sealed class AimTarget : MinecraftInterface() {
         val blockPos: BlockPos,
         val face: BlockFace = BlockFace.Center, // デフォルトを中央 (CENTER) に設定
     ) : AimTarget() {
-        constructor(b: BlockEntity, face: BlockFace = BlockFace.Center) : this(b.blockPos, face)
 
         fun pos(offset: Double = 0.5): Vec3 {
             val center = blockPos.center
@@ -81,18 +78,13 @@ sealed class AimTarget : MinecraftInterface() {
         open val roll = r
     }
 
-    fun lookAt() {
-        val pos = pos() ?: return
-        player?.lookAt(EntityAnchorArgument.Anchor.EYES, pos)
-    }
-
     /**
      * AimTargetのワールド内位置を計算して返します。
      * RollTargetなど、位置を持たない場合は null を返します。
      */
     fun pos(): Vec3? = when (this) { // when式の対象を 'this' に変更し、スマートキャストを有効化
         is EntityTarget -> {
-            val basePos = this.entity.getPosition(minecraft.deltaTracker.gameTimeDeltaTicks)
+            val basePos = this.entity.getPosition(minecraft.deltaTracker.getGameTimeDeltaPartialTick(false))
             val height = this.entity.bbHeight
 
             val yOffset = when (this.anchor) {
diff --git a/src/client/kotlin/org/infinite/libs/minecraft/multiplayer/inventory/InventorySystem.kt b/src/client/kotlin/org/infinite/libs/minecraft/multiplayer/inventory/InventorySystem.kt
index 6f541e21..ad912be7 100644
--- a/src/client/kotlin/org/infinite/libs/minecraft/multiplayer/inventory/InventorySystem.kt
+++ b/src/client/kotlin/org/infinite/libs/minecraft/multiplayer/inventory/InventorySystem.kt
@@ -1,7 +1,6 @@
 package org.infinite.libs.minecraft.multiplayer.inventory
 
 import net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket
-import net.minecraft.world.inventory.ClickType
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import org.infinite.libs.interfaces.MinecraftInterface
@@ -70,14 +69,14 @@ object InventorySystem : MinecraftInterface() {
         val s2 = to.toContainerSlot()
         if (s1 == -1 || s2 == -1) return
 
-        controller.handleInventoryMouseClick(containerId, s1, 0, ClickType.PICKUP, p)
-        controller.handleInventoryMouseClick(containerId, s2, 0, ClickType.PICKUP, p)
-        controller.handleInventoryMouseClick(containerId, s1, 0, ClickType.PICKUP, p)
+        controller.handleInventoryButtonClick(containerId, s1)
+        controller.handleInventoryButtonClick(containerId, s2)
+        controller.handleInventoryButtonClick(containerId, s1)
 
         // カーソル残留チェック
         if (!p.inventoryMenu.carried.isEmpty) {
             val target = findFirstEmptyBackpack()?.toContainerSlot() ?: -999
-            controller.handleInventoryMouseClick(containerId, target, 0, ClickType.PICKUP, p)
+            controller.handleInventoryButtonClick(containerId, target)
         }
     }
 
diff --git a/src/client/kotlin/org/infinite/libs/rust/projectile/ProjectileEmulator.kt b/src/client/kotlin/org/infinite/libs/rust/projectile/ProjectileEmulator.kt
index 24966bc0..af6ad4b0 100644
--- a/src/client/kotlin/org/infinite/libs/rust/projectile/ProjectileEmulator.kt
+++ b/src/client/kotlin/org/infinite/libs/rust/projectile/ProjectileEmulator.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.rust.projectile
 
 import net.minecraft.world.phys.Vec3
-import org.infinite.nativebind.AdvancedResult as NativeAdvancedResult
+import org.infinite.native.AdvancedResult as NativeAdvancedResult
 
 object ProjectileEmulator {
 
diff --git a/src/client/kotlin/org/infinite/libs/translation/TranslationChecker.kt b/src/client/kotlin/org/infinite/libs/translation/TranslationChecker.kt
index 7f2bad59..8d15522c 100644
--- a/src/client/kotlin/org/infinite/libs/translation/TranslationChecker.kt
+++ b/src/client/kotlin/org/infinite/libs/translation/TranslationChecker.kt
@@ -53,6 +53,6 @@ object TranslationChecker : SimplePreparableReloadListener<Unit>() {
      */
     fun register() {
         // v1 ResourceLoader を使用してリローダーを登録
-        ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(ID, this)
+        ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloadListener(ID, this)
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/ui/layout/ScrollableLayoutContainer.kt b/src/client/kotlin/org/infinite/libs/ui/layout/ScrollableLayoutContainer.kt
index 42ef4486..5e2deebc 100644
--- a/src/client/kotlin/org/infinite/libs/ui/layout/ScrollableLayoutContainer.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/layout/ScrollableLayoutContainer.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.layout
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.ScrollableLayout
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -20,9 +20,12 @@ class ScrollableLayoutContainer(
     Renderable,
     GuiEventListener,
     NarratableEntry {
-    override fun render(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
+
+    private var focusedChild: GuiEventListener? = null
+
+    override fun extractRenderState(graphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, a: Float) {
         visitWidgets { widget ->
-            widget.render(guiGraphics, i, j, f)
+            widget.extractRenderState(graphics, mouseX, mouseY, a)
         }
     }
 
@@ -31,92 +34,86 @@ class ScrollableLayoutContainer(
 
     override fun setFocused(bl: Boolean) {
         focused = bl
+        if (!bl) {
+            focusedChild?.isFocused = false
+            focusedChild = null
+        }
+    }
+
+    override fun isFocused(): Boolean = focused
+
+    fun setFocused(listener: GuiEventListener?) {
+        if (focusedChild != listener) {
+            focusedChild?.isFocused = false
+            focusedChild = listener
+            listener?.isFocused = true
+        }
+    }
+
+    fun children(): List<GuiEventListener> {
+        val list = mutableListOf<GuiEventListener>()
+        visitWidgets { list.add(it) }
+        return list
     }
 
     override fun mouseScrolled(d: Double, e: Double, f: Double, g: Double): Boolean {
+        // 子要素への委譲
         var result = false
         visitWidgets { widget ->
             if (!result && widget.mouseScrolled(d, e, f, g)) {
                 result = true
             }
         }
-        if (super.mouseScrolled(d, e, f, g)) return true
-        return result
+        if (result) return true
+
+        // 自身のスクロール（スクロールバー等）
+        return super.mouseScrolled(d, e, f, g)
     }
 
     override fun mouseReleased(mouseButtonEvent: MouseButtonEvent): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.mouseReleased(mouseButtonEvent)) {
-                result = true
-            }
-        }
-        if (super.mouseReleased(mouseButtonEvent)) return true
-        return result
+        focusedChild?.mouseReleased(mouseButtonEvent)
+        return super.mouseReleased(mouseButtonEvent)
     }
 
     override fun mouseMoved(d: Double, e: Double) {
         super.mouseMoved(d, e)
-        visitWidgets { widget ->
-            widget.mouseMoved(d, e)
-        }
+        visitWidgets { it.mouseMoved(d, e) }
     }
 
     override fun mouseDragged(mouseButtonEvent: MouseButtonEvent, d: Double, e: Double): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.mouseDragged(mouseButtonEvent, d, e)) {
-                result = true
-            }
-        }
-        if (super.mouseDragged(mouseButtonEvent, d, e)) return true
-        return result
+        if (focusedChild?.mouseDragged(mouseButtonEvent, d, e) == true) return true
+        return super.mouseDragged(mouseButtonEvent, d, e)
     }
 
     override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, bl: Boolean): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.mouseClicked(mouseButtonEvent, bl)) {
-                result = true
+        var hitChild = false
+        visitWidgets { child ->
+            if (!hitChild && child.mouseClicked(mouseButtonEvent, bl)) {
+                setFocused(child)
+                hitChild = true
             }
         }
+
+        if (hitChild) return true
+
+        // 子要素にヒットしなかった場合、フォーカスをクリア（任意）
         if (super.mouseClicked(mouseButtonEvent, bl)) return true
-        return result
-    }
 
-    override fun charTyped(characterEvent: CharacterEvent): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.charTyped(characterEvent)) {
-                result = true
-            }
-        }
-        return result
+        return false
     }
 
+    override fun charTyped(characterEvent: CharacterEvent): Boolean = focusedChild?.charTyped(characterEvent) ?: false
+
     override fun keyPressed(keyEvent: KeyEvent): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.keyPressed(keyEvent)) {
-                result = true
-            }
-        }
-        if (super.keyPressed(keyEvent)) return true
-        return result
+        if (focusedChild?.keyPressed(keyEvent) == true) return true
+        return super.keyPressed(keyEvent)
     }
 
     override fun keyReleased(keyEvent: KeyEvent): Boolean {
-        var result = false
-        visitWidgets { widget ->
-            if (!result && widget.keyReleased(keyEvent)) {
-                result = true
-            }
-        }
-        if (super.keyReleased(keyEvent)) return true
-        return result
+        if (focusedChild?.keyReleased(keyEvent) == true) return true
+        return super.keyReleased(keyEvent)
     }
 
-    override fun isFocused(): Boolean = focused
     override fun narrationPriority(): NarratableEntry.NarrationPriority = NarratableEntry.NarrationPriority.FOCUSED
 
     override fun updateNarration(narrationElementOutput: NarrationElementOutput) {
diff --git a/src/client/kotlin/org/infinite/libs/ui/screen/AbstractCarouselScreen.kt b/src/client/kotlin/org/infinite/libs/ui/screen/AbstractCarouselScreen.kt
index 46518d69..9d523f50 100644
--- a/src/client/kotlin/org/infinite/libs/ui/screen/AbstractCarouselScreen.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/screen/AbstractCarouselScreen.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.ui.screen
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.input.KeyEvent
 import net.minecraft.client.input.MouseButtonEvent
@@ -115,7 +115,7 @@ abstract class AbstractCarouselScreen<T>(title: Component, private val parent: S
         }
     }
 
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         // 1. アニメーション更新
         if (!isDragging) {
             // ドラッグ中でない時だけ pageIndex へ追従
@@ -160,7 +160,7 @@ abstract class AbstractCarouselScreen<T>(title: Component, private val parent: S
 
         for (bundle in sortedBundles) {
             renderSystem2D.render(bundle.commands)
-            bundle.widget.render(guiGraphics, mouseX, mouseY, delta)
+            bundle.widget.extractRenderState(guiGraphics, mouseX, mouseY, delta)
         }
     }
 
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/AbstractCarouselWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/AbstractCarouselWidget.kt
index eea58d8b..25ce710c 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/AbstractCarouselWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/AbstractCarouselWidget.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractContainerWidget
 import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -19,7 +19,7 @@ abstract class AbstractCarouselWidget<T>(
     val parent: AbstractCarouselScreen<T>,
     val thisIndex: Int,
     title: Component,
-) : AbstractContainerWidget(x, y, width, height, title) {
+) : AbstractContainerWidget(x, y, width, height, title, defaultSettings(10)) {
     var widgetFrameData: AbstractCarouselScreen.WidgetFrameData? = null
     protected val children = mutableListOf<Renderable>()
     override fun children(): List<GuiEventListener> = children.filterIsInstance<GuiEventListener>()
@@ -27,7 +27,7 @@ abstract class AbstractCarouselWidget<T>(
     /**
      * 描画時の行列変換
      */
-    private fun GuiGraphics.carouselTransform() {
+    private fun GuiGraphicsExtractor.carouselTransform() {
         val frame = widgetFrameData ?: return
         val minecraft = Minecraft.getInstance()
         val screenWidth = minecraft.window.guiScaledWidth
@@ -87,12 +87,12 @@ abstract class AbstractCarouselWidget<T>(
         return MouseButtonEvent(tx, ty, this.buttonInfo)
     }
 
-    public final override fun renderWidget(guiGraphics: GuiGraphics, x: Int, y: Int, delta: Float) {
+    public final override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, x: Int, y: Int, delta: Float) {
         guiGraphics.carouselTransform()
 
         // 内部ウィジェットの描画（既に座標系がズレているので(x,y)は0,0基準で渡すのが一般的）
         for (child in children) {
-            child.render(guiGraphics, x, y, delta)
+            child.extractRenderState(guiGraphics, x, y, delta)
         }
 
         guiGraphics.pose().popMatrix()
@@ -112,7 +112,10 @@ abstract class AbstractCarouselWidget<T>(
 
         // 子要素への伝播 (any判定)
         for (child in children()) {
-            if (child.mouseClicked(transformedEvent, bl)) return true
+            if (child.mouseClicked(transformedEvent, bl)) {
+                this.setFocused(child)
+                return true
+            }
         }
 
         // 自身のクリック判定 (onClickのトリガー)
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/BooleanPropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/BooleanPropertyWidget.kt
index b7e97bc9..041d64f7 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/BooleanPropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/BooleanPropertyWidget.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.ui.widgets
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.events.GuiEventListener
 import org.infinite.libs.core.features.property.BooleanProperty
 
@@ -39,8 +39,8 @@ class BooleanPropertyWidget(
             }
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-        propertyToggleButton.render(guiGraphics, mouseX, mouseY, delta)
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
+        propertyToggleButton.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/ListPropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/ListPropertyWidget.kt
index d4fd47ba..170144d8 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/ListPropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/ListPropertyWidget.kt
@@ -1,7 +1,8 @@
 package org.infinite.libs.ui.widgets
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
+import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.input.CharacterEvent
 import net.minecraft.client.input.KeyEvent
 import net.minecraft.client.input.MouseButtonEvent
@@ -30,14 +31,17 @@ class ListPropertyWidget<T : Any>(
 
     private val itemHeight = 22f
     private val headerHeight = DEFAULT_WIDGET_HEIGHT.toFloat()
+
     private val viewHeight: Float get() = height - headerHeight
 
     // コンテンツの総高さ（アイテム数 + 追加ボタン1つ分）
-    private val contentHeight: Float
+    private val listContentHeight: Float
         get() = (property.value.size + 1) * itemHeight
 
     // スクロール可能な最大値（0未満にならないようにする）
-    private fun getMaxScroll(): Double = (contentHeight - viewHeight).toDouble().coerceAtLeast(0.0)
+    private fun getMaxScroll(): Double = (listContentHeight - viewHeight).toDouble().coerceAtLeast(0.0)
+
+    override fun children(): List<GuiEventListener> = listOfNotNull(activeInputWidget)
 
     override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, bl: Boolean): Boolean {
         val mx = mouseButtonEvent.x
@@ -103,10 +107,9 @@ class ListPropertyWidget<T : Any>(
         return false
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         // 1. 背景とタイトルの描画 (PropertyWidget の基本描画)
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
         val g2d = Graphics2DRenderer(guiGraphics)
         val theme = InfiniteClient.theme
 
@@ -149,7 +152,7 @@ class ListPropertyWidget<T : Any>(
 
         // 3. アクティブな入力ウィジェットを最前面に描画 (Scissor 外)
         g2d.flush()
-        activeInputWidget?.render(guiGraphics, mouseX, mouseY, delta)
+        activeInputWidget?.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 
     private fun renderScrollbar(g2d: Graphics2DRenderer) {
@@ -161,7 +164,7 @@ class ListPropertyWidget<T : Any>(
         val barAreaHeight = viewHeight
 
         // ノブの高さ (コンテンツ比率に応じるが、最小 20px)
-        val knobHeight = (barAreaHeight * (viewHeight / contentHeight)).coerceAtLeast(20f)
+        val knobHeight = (barAreaHeight * (viewHeight / listContentHeight)).coerceAtLeast(20f)
         val scrollPercent = (scrollAmount / max).toFloat()
         val knobY = (y + headerHeight) + (barAreaHeight - knobHeight) * scrollPercent
 
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/NumberPropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/NumberPropertyWidget.kt
index e944e853..93a1b901 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/NumberPropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/NumberPropertyWidget.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.events.GuiEventListener
 import org.infinite.InfiniteClient
 import org.infinite.libs.core.features.property.NumberProperty
@@ -61,9 +61,9 @@ class NumberPropertyWidget<T>(
         propertySliderWidget.y = y + height - propertySliderWidget.height
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-        propertySliderWidget.render(guiGraphics, mouseX, mouseY, delta)
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
+        propertySliderWidget.extractRenderState(guiGraphics, mouseX, mouseY, delta)
         val colorScheme = InfiniteClient.theme.colorScheme
         val displayText = property.display()
         val g2d = Graphics2DRenderer(guiGraphics)
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/PropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/PropertyWidget.kt
index daacdcd8..f0ea4a80 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/PropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/PropertyWidget.kt
@@ -2,7 +2,7 @@ package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.Font
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractContainerWidget
 import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -23,7 +23,7 @@ open class PropertyWidget<T : Property<*>>(
     width: Int,
     height: Int = DEFAULT_WIDGET_HEIGHT,
     protected val property: T,
-) : AbstractContainerWidget(x, y, width, height, Component.literal("")),
+) : AbstractContainerWidget(x, y, width, height, Component.literal(""), defaultSettings(10)),
     Renderable {
 
     companion object {
@@ -77,8 +77,8 @@ open class PropertyWidget<T : Property<*>>(
 
     protected open fun relocate() {}
 
-    override fun renderWidget(
-        guiGraphics: GuiGraphics,
+    override fun extractWidgetRenderState(
+        guiGraphics: GuiGraphicsExtractor,
         mouseX: Int,
         mouseY: Int,
         delta: Float,
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/SelectionPropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/SelectionPropertyWidget.kt
index 1dfb8c53..95088178 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/SelectionPropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/SelectionPropertyWidget.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.narration.NarrationElementOutput
 import net.minecraft.client.input.MouseButtonEvent
@@ -47,7 +47,7 @@ class SelectionPropertyWidget<T : Any>(
             }
         }
 
-        override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
             val g2d = Graphics2DRenderer(guiGraphics)
             val alphaMult = if (active) 1.0f else 0.5f
             val radius = (height / 2f).coerceAtLeast(4f)
@@ -104,7 +104,6 @@ class SelectionPropertyWidget<T : Any>(
         val twoLineLimit = 220 // 少し厳しめに設定
         val padding = 8
         val font = Minecraft.getInstance().font
-
         // 選択肢の中で最大の幅を持つ文字列に合わせてボタン幅を調整
         val maxOptionWidth = property.propertyString(property.value).let { font.width(it) }
         cycleButton.height = (DEFAULT_WIDGET_HEIGHT * 0.9f).toInt()
@@ -121,9 +120,9 @@ class SelectionPropertyWidget<T : Any>(
         }
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         // PropertyWidgetのラベル描画を呼び出す
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-        cycleButton.render(guiGraphics, mouseX, mouseY, delta)
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
+        cycleButton.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 }
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/SliderWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/SliderWidget.kt
index 34756dc8..8d37784c 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/SliderWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/SliderWidget.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.ui.widgets
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.narration.NarrationElementOutput
 import net.minecraft.client.input.MouseButtonEvent
@@ -122,8 +122,8 @@ abstract class SliderWidget<T>(
         graphics2D.strokeCircle(knobX, knobY, knobRadius)
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        val renderer = Graphics2DRenderer(guiGraphics)
+    override fun extractWidgetRenderState(graphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, a: Float) {
+        val renderer = Graphics2DRenderer(graphics)
         render(renderer)
         renderer.flush()
     }
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/StringPropertyWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/StringPropertyWidget.kt
index fdc6fa00..8b32e624 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/StringPropertyWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/StringPropertyWidget.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.input.CharacterEvent
@@ -52,12 +52,9 @@ class StringPropertyWidget(
         // 高さやその他のスタイル調整が必要な場合はここで行う
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        // PropertyWidget の基本描画（タイトル/ラベル）
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-
-        // テキストボックスの描画
-        editBox.render(guiGraphics, mouseX, mouseY, delta)
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
+        editBox.extractRenderState(guiGraphics, mouseX, mouseY, delta)
     }
 
     override fun charTyped(characterEvent: CharacterEvent): Boolean = editBox.charTyped(characterEvent) || super.charTyped(characterEvent)
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/SuggestInputWidget.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/SuggestInputWidget.kt
index 444cc1f0..5c2f22d6 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/SuggestInputWidget.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/SuggestInputWidget.kt
@@ -1,7 +1,7 @@
 package org.infinite.libs.ui.widgets
 
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.client.input.KeyEvent
 import net.minecraft.network.chat.Component
@@ -109,10 +109,8 @@ open class SuggestInputWidget(
         return super.keyPressed(keyEvent)
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        // 本体の入力ボックスを描画 (Minecraft標準の描画を維持)
-        super.renderWidget(guiGraphics, mouseX, mouseY, delta)
-
+    override fun extractWidgetRenderState(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
+        super.extractWidgetRenderState(guiGraphics, mouseX, mouseY, delta)
         if (isFocused && filteredSuggestions.isNotEmpty()) {
             val theme = InfiniteClient.theme
             val colorScheme = theme.colorScheme
diff --git a/src/client/kotlin/org/infinite/libs/ui/widgets/ToggleButton.kt b/src/client/kotlin/org/infinite/libs/ui/widgets/ToggleButton.kt
index 7de6412a..030201c3 100644
--- a/src/client/kotlin/org/infinite/libs/ui/widgets/ToggleButton.kt
+++ b/src/client/kotlin/org/infinite/libs/ui/widgets/ToggleButton.kt
@@ -1,6 +1,6 @@
 package org.infinite.libs.ui.widgets
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor
 import net.minecraft.client.gui.components.Button
 import net.minecraft.network.chat.Component
 import org.infinite.InfiniteClient
@@ -109,7 +109,7 @@ abstract class ToggleButton(
         if (rawProgress >= 1f) animationStartTime = -1L
     }
 
-    override fun renderContents(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun extractContents(guiGraphics: GuiGraphicsExtractor, mouseX: Int, mouseY: Int, delta: Float) {
         val graphics2DRenderer = Graphics2DRenderer(guiGraphics)
         render(graphics2DRenderer)
         graphics2DRenderer.flush()
diff --git a/src/client/kotlin/org/infinite/utils/Document.kt b/src/client/kotlin/org/infinite/utils/Document.kt
new file mode 100644
index 00000000..feea9a1c
--- /dev/null
+++ b/src/client/kotlin/org/infinite/utils/Document.kt
@@ -0,0 +1,353 @@
+package org.infinite.utils
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.infinite.InfiniteClient
+import org.infinite.libs.core.features.Property
+import org.infinite.libs.core.features.property.*
+import org.infinite.libs.core.features.property.list.*
+import org.infinite.libs.core.features.property.number.*
+import org.infinite.libs.core.features.property.selection.*
+import java.nio.charset.StandardCharsets
+import java.nio.file.Path
+import kotlin.io.path.*
+
+class Document(
+    val projectDir: Path,
+) {
+    data class AllFeaturesDocumentData(
+        val local: List<CategoryDocumentData>,
+        val global: List<CategoryDocumentData>,
+    )
+
+    data class CategoryDocumentData(
+        val name: String,
+        val features: List<FeatureDocumentData>,
+    )
+
+    data class FeatureDocumentData(
+        val name: String,
+        val key: String,
+        val settings: List<SettingDocumentData>,
+    )
+
+    data class SettingDocumentData(
+        val name: String,
+        val key: String,
+        val setting: Property<*>,
+    )
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            println("Documentクラスのmain関数が実行されました。")
+            // Minecraftの初期化が必要な場合があるため、ブートストラップを呼び出す
+            try {
+                val scClass = Class.forName("net.minecraft.SharedConstants")
+                try {
+                    scClass.getMethod("tryCheckInitialize").invoke(null)
+                } catch (e: NoSuchMethodException) {
+                    try {
+                        scClass.getMethod("create").invoke(null)
+                    } catch (e2: NoSuchMethodException) {
+                        // Ignore
+                    }
+                }
+                net.minecraft.server.Bootstrap.bootStrap()
+            } catch (e: Throwable) {
+                // Ignore
+            }
+
+            val rootPath = args[0]
+            val document = Document(Path(rootPath))
+            println("Documentのインスタンスを作成しました: $document")
+            document.generateData()
+            document.getTranslations()
+            document.generateDocs()
+        }
+    }
+
+    private val buildDir: Path
+        get() = projectDir.resolve("build")
+    private var documentData: AllFeaturesDocumentData? = null
+    private var translations: Map<String, Map<String, String>> = emptyMap()
+
+    @OptIn(ExperimentalPathApi::class)
+    fun generateDocs() {
+        val data = documentData ?: return
+        val supportedLocales = translations.keys
+
+        if (supportedLocales.isEmpty()) {
+            System.err.println("警告: 翻訳ファイルが見つからなかったため、ドキュメント生成をスキップします。")
+            return
+        }
+
+        val docsBaseDir = buildDir.resolve("docs")
+
+        if (docsBaseDir.isDirectory()) {
+            docsBaseDir.deleteRecursively()
+            println("既存のDocsディレクトリをクリアしました: $docsBaseDir")
+        }
+
+        initializeDocsDirectory(docsBaseDir, supportedLocales)
+
+        supportedLocales.forEach { langCode ->
+            val langDir = docsBaseDir.resolve(langCode)
+            generateFeaturesListDocs(
+                dir = langDir.resolve("local-features"),
+                data = data.local,
+                langCode = langCode,
+            )
+            generateFeaturesListDocs(langDir.resolve("global-features"), data.global, langCode)
+            println("✅ $langCode のドキュメントを $langDir に生成しました。")
+        }
+    }
+
+    private fun generateFeaturesListDocs(
+        dir: Path,
+        data: List<CategoryDocumentData>,
+        langCode: String,
+    ) {
+        val isLocal = dir.fileName.toString() == "local-features"
+        val label =
+            if (isLocal) {
+                if (langCode == "ja_jp") "ローカル機能" else "Local Features"
+            } else {
+                if (langCode == "ja_jp") "グローバル機能" else "Global Features"
+            }
+
+        dir.resolve("_category_.json").writeText(
+            """
+            {
+              "label": "$label",
+              "position": ${if (isLocal) 1 else 2},
+              "link": {
+                "type": "generated-index",
+                "title": "$label"
+              }
+            }
+            """.trimIndent(),
+            StandardCharsets.UTF_8,
+        )
+
+        data.forEach { category ->
+            generateCategoryDocs(
+                parentDir = dir,
+                category = category,
+                langCode = langCode,
+            )
+        }
+    }
+
+    private fun generateCategoryDocs(
+        parentDir: Path,
+        category: CategoryDocumentData,
+        langCode: String,
+    ) {
+        val categoryFolderName = category.name.toKebabCase()
+        val categoryDir = parentDir.resolve(categoryFolderName)
+        categoryDir.createDirectories()
+
+        val label = translate(category.name, langCode)
+        val isLocal = parentDir.fileName?.toString() == "local-features"
+        categoryDir.resolve("_category_.json").writeText(
+            """
+            {
+              "label": "$label(${if (isLocal) "Local" else "Global"})",
+              "link": {
+                "type": "generated-index", 
+                "title": "$label 機能一覧"
+              }
+            }
+            """.trimIndent(),
+            StandardCharsets.UTF_8,
+        )
+        println("  - カテゴリメタファイル生成: ${categoryDir.resolve("_category_.json")}")
+
+        category.features.forEach { feature ->
+            generateFeatureDocs(
+                dir = categoryDir,
+                data = feature,
+                langCode = langCode,
+            )
+        }
+    }
+
+    private fun generateFeatureDocs(
+        dir: Path,
+        data: FeatureDocumentData,
+        langCode: String,
+    ) {
+        val featureFileName = data.name.toKebabCase() + ".mdx"
+        val featurePath = dir.resolve(featureFileName)
+
+        val featureContent = StringBuilder()
+        featureContent.append("---\n")
+        featureContent.append("title: ${data.name.escapeMdx()}\n")
+        featureContent.append("---\n\n")
+
+        featureContent.append("# ${data.name.escapeMdx()}\n")
+        featureContent.append("${translate(data.key, langCode).escapeMdx()}\n\n")
+
+        if (data.settings.isNotEmpty()) {
+            featureContent.append("## ${translate("doc.infinite.properties_section_title", langCode).escapeMdx()}\n\n")
+
+            data.settings.forEach { settingData ->
+                val setting = settingData.setting
+                featureContent.append("### ${settingData.name.escapeMdx()}\n")
+                featureContent.append("${translate(settingData.key, langCode).escapeMdx()}\n\n")
+
+                // Table header
+                featureContent.append("| ${translate("doc.infinite.property_type", langCode).escapeMdx()} | ${translate("doc.infinite.property_default", langCode).escapeMdx()} | ${translate("doc.infinite.property_info_title", langCode).escapeMdx()} |\n")
+                featureContent.append("| :--- | :--- | :--- |\n")
+
+                val shortTypeName = setting::class.simpleName?.removeSuffix("Property") ?: "Unknown"
+                val defaultValue = "`${setting.default}`"
+                val details = StringBuilder()
+
+                when (setting) {
+                    is IntProperty -> {
+                        details.append("${translate("doc.infinite.property_min", langCode).escapeMdx()}: `${setting.min}`, ${translate("doc.infinite.property_max", langCode).escapeMdx()}: `${setting.max}`")
+                    }
+
+                    is FloatProperty -> {
+                        details.append("${translate("doc.infinite.property_min", langCode).escapeMdx()}: `${setting.min}`, ${translate("doc.infinite.property_max", langCode).escapeMdx()}: `${setting.max}`")
+                    }
+
+                    is DoubleProperty -> {
+                        details.append("${translate("doc.infinite.property_min", langCode).escapeMdx()}: `${setting.min}`, ${translate("doc.infinite.property_max", langCode).escapeMdx()}: `${setting.max}`")
+                    }
+
+                    is LongProperty -> {
+                        details.append("${translate("doc.infinite.property_min", langCode).escapeMdx()}: `${setting.min}`, ${translate("doc.infinite.property_max", langCode).escapeMdx()}: `${setting.max}`")
+                    }
+
+                    is StringListProperty -> {
+                        details.append("${translate("doc.infinite.property_options", langCode).escapeMdx()}: ${setting.default.joinToString(", ") { "`$it`" }}")
+                    }
+
+                    is SelectionProperty<*> -> {
+                        details.append("${translate("doc.infinite.property_options", langCode).escapeMdx()}: ${setting.options.joinToString(", ") { "`$it`" }}")
+                    }
+
+                    is BlockListProperty -> {
+                        details.append("${translate("doc.infinite.property_list_count", langCode).escapeMdx()}: ${setting.default.size} (Block IDs)")
+                    }
+
+                    is ItemListProperty -> {
+                        details.append("${translate("doc.infinite.property_list_count", langCode).escapeMdx()}: ${setting.default.size} (Item IDs)")
+                    }
+
+                    is BlockAndColorListProperty -> {
+                        details.append("${translate("doc.infinite.property_list_count", langCode).escapeMdx()}: ${setting.default.size} (Block-Color Map)")
+                    }
+
+                    else -> details.append("-")
+                }
+
+                featureContent.append("| `$shortTypeName` | $defaultValue | $details |\n\n")
+                featureContent.append("---\n\n")
+            }
+        }
+        featurePath.writeText(featureContent.toString(), StandardCharsets.UTF_8)
+        println("  - ファイル生成: $featurePath")
+    }
+
+    private fun String.escapeMdx(): String = this.replace("<", "&lt;").replace(">", "&gt;")
+
+    private fun translate(key: String, lang: String): String = translations[lang]?.get(key) ?: key
+
+    private fun initializeDocsDirectory(
+        docsBaseDir: Path,
+        supportedLocales: Set<String>,
+    ) {
+        docsBaseDir.createDirectories()
+        println("作成されたDocsディレクトリ: $docsBaseDir")
+
+        val data = documentData ?: return
+
+        supportedLocales.forEach { langCode ->
+            val langDir = docsBaseDir.resolve(langCode)
+            val localFeaturesDir = langDir.resolve("local-features")
+            localFeaturesDir.createDirectories()
+
+            data.local.forEach { category ->
+                val categoryDir = localFeaturesDir.resolve(category.name.toKebabCase())
+                categoryDir.createDirectories()
+            }
+
+            val globalFeaturesDir = langDir.resolve("global-features")
+            globalFeaturesDir.createDirectories()
+
+            data.global.forEach { category ->
+                val categoryDir = globalFeaturesDir.resolve(category.name.toKebabCase())
+                categoryDir.createDirectories()
+            }
+        }
+    }
+
+    fun getTranslations() {
+        var langDirPath = projectDir.resolve("infinite-client/src/main/resources/assets/infinite-client/lang/")
+        if (!langDirPath.isDirectory()) {
+            langDirPath = projectDir.resolve("src/main/resources/assets/infinite-client/lang/")
+        }
+        if (!langDirPath.isDirectory()) {
+            System.err.println("エラー: 翻訳ディレクトリが見つからないか、ディレクトリではありません: $langDirPath")
+            return
+        }
+
+        val allTranslations = mutableMapOf<String, Map<String, String>>()
+        val gson = Gson()
+        val translationFiles = langDirPath.listDirectoryEntries("*.json")
+
+        translationFiles.forEach { langFile ->
+            try {
+                val langCode = langFile.nameWithoutExtension
+                val jsonString = langFile.readText(StandardCharsets.UTF_8)
+                val mapType = object : TypeToken<Map<String, String>>() {}.type
+                val translationsMap = gson.fromJson<Map<String, String>>(jsonString, mapType)
+                allTranslations[langCode] = translationsMap
+            } catch (e: Exception) {
+                System.err.println("エラー: 翻訳ファイル ${langFile.fileName} の読み込みまたはパースに失敗しました: ${e.message}")
+            }
+        }
+        translations = allTranslations
+    }
+
+    fun generateData() {
+        println("localFeatures: ${InfiniteClient.featureCategories.size}")
+        println("globalFeatures: ${InfiniteClient.globalFeatureCategories.size}")
+        InfiniteClient.genTranslations(projectDir.absolutePathString())
+
+        val localDocumentData = InfiniteClient.featureCategories.map { category ->
+            val name = category.name
+            val features = category.map { feature ->
+                val featureName = feature.name
+                val featureKey = feature.translation()
+                val settings = feature.map { property ->
+                    val settingName = property.name
+                    val settingKey = property.translationKey() ?: ""
+                    SettingDocumentData(settingName, settingKey, property)
+                }
+                FeatureDocumentData(featureName, featureKey, settings)
+            }
+            CategoryDocumentData(name, features)
+        }
+
+        val globalDocumentData = InfiniteClient.globalFeatureCategories.map { category ->
+            val name = category.name
+            val features = category.map { feature ->
+                val featureName = feature.name
+                val featureKey = feature.translation()
+                val settings = feature.map { property ->
+                    val settingName = property.name
+                    val settingKey = property.translationKey() ?: ""
+                    SettingDocumentData(settingName, settingKey, property)
+                }
+                FeatureDocumentData(featureName, featureKey, settings)
+            }
+            CategoryDocumentData(name, features)
+        }
+        documentData = AllFeaturesDocumentData(localDocumentData, globalDocumentData)
+    }
+}
diff --git a/src/client/kotlin/org/infinite/utils/Player.kt b/src/client/kotlin/org/infinite/utils/Player.kt
index d3fb72bb..902266bc 100644
--- a/src/client/kotlin/org/infinite/utils/Player.kt
+++ b/src/client/kotlin/org/infinite/utils/Player.kt
@@ -10,15 +10,11 @@ import net.minecraft.world.phys.HitResult
  * ターゲットを正確に捉えているかを判定する。
  */
 fun Player.isLookingAtEntity(target: Entity): Boolean {
-    // 1.21.1+ の属性から射程を取得
-    val attackRange = this.entityAttackRange()
-    val maxRange = attackRange.maxRange // 槍などの最長到達距離
-    val minRange = attackRange.minRange // 最短（近接）の有効距離
+    val attackRange = this.entityInteractionRange()
 
     val eyePos = this.eyePosition
     val viewVec = this.getViewVector(1.0f)
-    // 最大射程まで視線を伸ばす
-    val endPos = eyePos.add(viewVec.x * maxRange, viewVec.y * maxRange, viewVec.z * maxRange)
+    val endPos = eyePos.add(viewVec.multiply(attackRange, attackRange, attackRange))
 
     // ターゲットのBounding Box（当たり判定）を取得。pickRadiusで微調整。
     val collisionBox = target.boundingBox.inflate(target.pickRadius.toDouble())
@@ -30,10 +26,8 @@ fun Player.isLookingAtEntity(target: Entity): Boolean {
     val entityHitPos = hitResultOptional.get()
     val distanceToEntity = eyePos.distanceTo(entityHitPos)
 
-    // 2. 距離チェック (maxRange以内、かつ武器の特性的に有効な距離か)
-    // 基本的には maxRange 以内であれば「視線は合っている」とみなせますが、
-    // 攻撃の有効判定として使うなら distanceToEntity >= minRange も考慮すべき場合があります。
-    if (distanceToEntity !in minRange..maxRange) return false
+    // 2. 距離チェック
+    if (distanceToEntity > attackRange) return false
 
     // 3. 壁越し判定 (Raytrace)
     val blockHit = this.level().clip(
diff --git a/src/client/resources/infinite-client.mixins.json b/src/client/resources/infinite-client.mixins.json
index 5b23ffc0..ba689364 100644
--- a/src/client/resources/infinite-client.mixins.json
+++ b/src/client/resources/infinite-client.mixins.json
@@ -8,7 +8,7 @@
     "graphics.FontManagerMixin",
     "graphics.FontMixin",
     "graphics.GuiGraphicsAccessor",
-    "graphics.GuiGraphicsMixin",
+    "graphics.GuiGraphicsExtractorMixin",
     "graphics.LevelRendererMixin",
     "graphics.MinecraftAccessor",
     "graphics.MinecraftMixin",
@@ -26,19 +26,18 @@
     "infinite.features.local.combat.attack.CriticalFeatureMixin",
     "infinite.features.local.combat.counter.CounterFeatureMixin",
     "infinite.features.local.combat.mace.MultiPlayerGameModeMixin",
-    "infinite.features.local.level.blockbreak.BlockBreakMixin",
-    "infinite.features.local.level.blockbreak.MultiPlayerGameModeAccessor",
     "infinite.features.local.combat.swapshot.ConnectionMixin",
     "infinite.features.local.combat.throwable.ConnectionMixin",
+    "infinite.features.local.level.blockbreak.BlockBreakMixin",
+    "infinite.features.local.level.blockbreak.MultiPlayerGameModeAccessor",
     "infinite.features.local.level.esp.EntityMixin",
     "infinite.features.local.level.esp.EntityRendererMixin",
     "infinite.features.local.level.xray.ItemBlockRenderTypesMixin",
-    "infinite.features.local.level.xray.LightTextureMixin",
-    "infinite.features.local.level.xray.LiquidBlockRendererMixin",
+    "infinite.features.local.level.xray.LightmapMixin",
     "infinite.features.local.level.xray.ModelBlockRendererMixin",
     "infinite.features.local.level.xray.OptionsMixin",
     "infinite.features.local.rendering.brightsight.GameRendererMixin",
-    "infinite.features.local.rendering.brightsight.LightTextureMixin",
+    "infinite.features.local.rendering.brightsight.LightmapMixin",
     "infinite.features.local.rendering.brightsight.LivingEntityMixin",
     "infinite.features.local.rendering.brightsight.ModelBlockRendererMixin",
     "infinite.features.local.rendering.clearsight.AbstractClientPlayerMixin",
@@ -50,12 +49,16 @@
     "infinite.features.local.rendering.toughsight.OptionInstanceMixin",
     "infinite.features.local.rendering.ui.GuiMixin",
     "infinite.features.local.rendering.zoomsight.AbstractClientPlayerMixin",
-    "infinite.features.local.rendering.zoomsight.GameRendererMixin",
+    "infinite.features.local.rendering.zoomsight.CameraMixin",
     "infinite.features.local.rendering.zoomsight.MouseHandlerMixin",
     "infinite.features.local.rendering.zoomsight.OptionsMixin",
     "ui.OptionsScreenMixin"
   ],
   "injectors": {
     "defaultRequire": 1
-  }
+  },
+  "mixins": [
+    "infinite.features.local.level.xray.BlockModelLighterMixin",
+    "infinite.features.local.level.xray.BlockStateBaseMixin"
+  ]
 }
diff --git a/src/main/resources/assets/infinite-client/lang/en_us.json b/src/main/resources/assets/infinite-client/lang/en_us.json
index 41c319b1..91e232cb 100644
--- a/src/main/resources/assets/infinite-client/lang/en_us.json
+++ b/src/main/resources/assets/infinite-client/lang/en_us.json
@@ -1,99 +1,194 @@
 {
-  "infinite.features.infinite": "Modules",
-  "infinite.features.local.combat": "Combat (Local)",
-  "infinite.features.local.level": "World (Local)",
-  "infinite.features.local.movement": "Movement (Local)",
-  "infinite.features.local.movement.quick_move": "Quick Move",
-  "infinite.features.local.movement.super_fly": "Super Fly",
-  "infinite.features.local.rendering": "Rendering (Local)",
-  "infinite.features.local.rendering.hello_feature": "Hello",
+  "doc.infinite.properties_section_title": "Properties",
+  "doc.infinite.property_default": "Default",
+  "doc.infinite.property_info_title": "Details",
+  "doc.infinite.property_list_count": "Default Count",
+  "doc.infinite.property_list_type": "List Type",
+  "doc.infinite.property_max": "Maximum",
+  "doc.infinite.property_min": "Minimum",
+  "doc.infinite.property_options": "Options",
+  "doc.infinite.property_type": "Type",
+  "infinite.features.features.local.swap_tool_feature": "Automatically switches to the best tool for the block you are breaking.",
+  "infinite.features.features.local.swap_tool_feature.fine_tool_strategy": "Fine Tool Strategy",
+  "infinite.features.features.local.swap_tool_feature.method": "Method",
+  "infinite.features.features.local.swap_tool_feature.switch_delay": "Switch Delay",
+  "infinite.features.global": "Global Features",
+  "infinite.features.global.control": "Global Control",
+  "infinite.features.global.control.ime_input_feature": "Improves IME input handling for chat and other text fields.",
   "infinite.features.global.rendering": "Rendering (Global)",
   "infinite.features.global.rendering.infinite_font_feature": "Infinite Font",
-  "infinite.features.global.rendering.theme_feature": "Theme",
-  "infinite.features.local.combat.critical_feature": "Land critical hits automatically when possible. Detection risk depends on mode.",
-  "infinite.features.local.combat.critical_feature.mode": "Critical Mode",
-  "infinite.features.local.movement.quick_move.acceleration_constant": "Acceleration Constant",
-  "infinite.features.local.movement.quick_move.acceleration_multiplier": "Acceleration Multiplier",
-  "infinite.features.local.movement.quick_move.allow_in_air": "Allow in Air",
-  "infinite.features.local.movement.quick_move.allow_in_lava": "Allow in Lava",
-  "infinite.features.local.movement.quick_move.allow_in_water": "Allow in Water",
-  "infinite.features.local.movement.quick_move.allow_on_gliding": "Allow While Gliding",
-  "infinite.features.local.movement.quick_move.allow_on_ground": "Allow When Grounded",
-  "infinite.features.local.movement.quick_move.allow_on_swimming": "Allow While Swimming",
-  "infinite.features.local.movement.quick_move.allow_with_vehicle": "Allow in Vehicle",
-  "infinite.features.local.movement.quick_move.anti_friction_boost": "Anti-Friction Boost",
-  "infinite.features.local.movement.quick_move.anti_friction_point": "Anti-Friction Point",
-  "infinite.features.local.movement.quick_move.friction_property": "Friction",
-  "infinite.features.local.movement.quick_move.item_use_boost": "Item-Use Boost",
-  "infinite.features.local.movement.quick_move.reduction_threshold": "Reduction Threshold",
-  "infinite.features.local.movement.quick_move.speed": "Speed",
-  "infinite.features.local.movement.super_fly.keep_fly": "Keep Flying",
-  "infinite.features.local.movement.super_fly.method": "Method",
-  "infinite.features.local.movement.super_fly.power": "Power",
-  "infinite.features.local.rendering.hello_feature.boolean_property": "Boolean Value",
-  "infinite.features.local.rendering.hello_feature.double_property": "Double Value",
-  "infinite.features.local.rendering.hello_feature.float_property": "Float Value",
-  "infinite.features.local.rendering.hello_feature.int_property": "Int Value",
-  "infinite.features.local.rendering.hello_feature.item_list_property": "Item List",
-  "infinite.features.local.rendering.hello_feature.long_property": "Long Value",
-  "infinite.features.local.rendering.hello_feature.selection_property": "Selection",
-  "infinite.features.local.rendering.hello_feature.string_property": "String",
   "infinite.features.global.rendering.infinite_font_feature.bold_font": "Bold",
   "infinite.features.global.rendering.infinite_font_feature.bold_italic_font": "Bold Italic",
   "infinite.features.global.rendering.infinite_font_feature.italic_font": "Italic",
   "infinite.features.global.rendering.infinite_font_feature.regular_font": "Regular",
+  "infinite.features.global.rendering.infinite_loading_feature": "Changes the game loading screen to a custom, stylish design.",
+  "infinite.features.global.rendering.theme_feature": "Theme",
   "infinite.features.global.rendering.theme_feature.current_theme": "Current Theme",
-  "key.infinite.features.local.rendering.hello_feature.toggle": "Toggle Hello",
-  "key.infinite.game_options": "Infinite Options",
-  "key.infinite.features.local.combat.lock_on.toggle": "Toggle Lock-On",
-  "infinite.features.local.combat.archery_feature": "Archery",
+  "infinite.features.global.rendering.theme_feature.style": "Theme Style",
+  "infinite.features.infinite": "Modules",
+  "infinite.features.local": "Local Features",
+  "infinite.features.local.combat": "Combat (Local)",
+  "infinite.features.local.combat.archery_feature": "Automatically predicts projectile trajectories for bows and crossbows, helping you land perfect shots by accounting for gravity and air resistance.",
   "infinite.features.local.combat.archery_feature.ignore_terrain": "Ignore Terrain",
   "infinite.features.local.combat.archery_feature.max_reach": "Max Reach",
   "infinite.features.local.combat.archery_feature.only_when_lock_on": "Only When Lock-On",
   "infinite.features.local.combat.archery_feature.simulation_max_steps": "Simulation Steps",
   "infinite.features.local.combat.archery_feature.simulation_precision": "Simulation Precision",
-  "infinite.features.local.combat.counter_feature": "Counter",
+  "infinite.features.local.combat.counter_feature": "Automatically retaliates against attackers when you receive damage.",
   "infinite.features.local.combat.counter_feature.aim_speed": "Aim Speed",
   "infinite.features.local.combat.counter_feature.anchor_point": "Anchor Point",
   "infinite.features.local.combat.counter_feature.method": "Method",
   "infinite.features.local.combat.counter_feature.process_tick": "Process Interval",
   "infinite.features.local.combat.counter_feature.randomizer": "Randomization",
   "infinite.features.local.combat.counter_feature.reaction_tick": "Reaction Delay",
-  "infinite.features.local.combat.lock_on_feature": "Lock-On",
+  "infinite.features.local.combat.critical_feature": "Land critical hits automatically when possible. Detection risk depends on mode.",
+  "infinite.features.local.combat.critical_feature.mode": "Critical Mode",
+  "infinite.features.local.combat.instant_use_feature": "Allows for near-instant usage of items like food, potions, or blocks.",
+  "infinite.features.local.combat.instant_use_feature.allow_all": "Allow All Items",
+  "infinite.features.local.combat.instant_use_feature.allow_blocks": "Allow Blocks",
+  "infinite.features.local.combat.instant_use_feature.allow_crystals": "Allow Crystals",
+  "infinite.features.local.combat.instant_use_feature.allow_exp_bottles": "Allow XP Bottles",
+  "infinite.features.local.combat.instant_use_feature.allow_food": "Allow Food",
+  "infinite.features.local.combat.instant_use_feature.allow_throwables": "Allow Throwables",
+  "infinite.features.local.combat.instant_use_feature.check_offhand": "Check Offhand",
+  "infinite.features.local.combat.instant_use_feature.custom_delay": "Custom Delay",
+  "infinite.features.local.combat.instant_use_feature.custom_items": "Custom Items",
+  "infinite.features.local.combat.instant_use_feature.fast_place_speed": "Fast Place Speed",
+  "infinite.features.local.combat.instant_use_feature.mode": "Mode",
+  "infinite.features.local.combat.instant_use_feature.only_when_lock_on": "Only When Lock-On",
+  "infinite.features.local.combat.lock_on_feature": "Smoothly tracks targets automatically. Essential for maintaining precise aim during intense PvP or PvE encounters. Customizable tracking speed and methods.",
+  "infinite.features.local.combat.lock_on_feature.aim_bias": "Aim Bias (Distance vs Angle)",
   "infinite.features.local.combat.lock_on_feature.aim_speed": "Aim Speed",
   "infinite.features.local.combat.lock_on_feature.anchor_point": "Anchor Point",
+  "infinite.features.local.combat.lock_on_feature.attack_randomization": "Random Delay",
+  "infinite.features.local.combat.lock_on_feature.attack_strength": "Attack Strength",
+  "infinite.features.local.combat.lock_on_feature.attack_target": "Auto Attack",
   "infinite.features.local.combat.lock_on_feature.auto_attack": "Auto Attack",
+  "infinite.features.local.combat.lock_on_feature.auto_next_target": "Auto Next Target",
+  "infinite.features.local.combat.lock_on_feature.auto_reselect": "Auto Reselect",
   "infinite.features.local.combat.lock_on_feature.check_line_of_sight": "Check Line of Sight",
   "infinite.features.local.combat.lock_on_feature.fov": "Field of View",
   "infinite.features.local.combat.lock_on_feature.method": "Method",
   "infinite.features.local.combat.lock_on_feature.mobs": "Target Mobs",
+  "infinite.features.local.combat.lock_on_feature.pause_on_kill": "Pause on Kill",
   "infinite.features.local.combat.lock_on_feature.players": "Target Players",
   "infinite.features.local.combat.lock_on_feature.priority_mode": "Target Priority",
   "infinite.features.local.combat.lock_on_feature.range": "Range",
-  "infinite.features.local.combat.mace_boost_feature": "Mace Boost",
+  "infinite.features.local.combat.mace_boost_feature": "Assists with increasing fall damage for Mace attacks.",
   "infinite.features.local.combat.mace_boost_feature.fall_multiply": "Fall Multiplier",
   "infinite.features.local.combat.mace_boost_feature.max_step": "Max Step",
   "infinite.features.local.combat.mace_boost_feature.min_charge": "Minimum Charge",
-  "infinite.features.local.combat.mace_boost_feature.mode": "Mode",
+  "infinite.features.local.combat.mace_boost_feature.mode": "infinite.features.local.combat.mace_boost_feature.mode",
   "infinite.features.local.combat.mace_boost_feature.target_fall_dist": "Target Fall Distance",
-  "infinite.features.local.combat.throwable_feature": "Throwable",
+  "infinite.features.local.combat.quick_shot_feature": "Allows you to fire bows and crossbows rapidly.",
+  "infinite.features.local.combat.quick_shot_feature.interval_shift": "Interval Shift",
+  "infinite.features.local.combat.swap_shot_feature": "Rapidly fires weapons by alternating between main and off-hand items.",
+  "infinite.features.local.combat.swap_shot_feature.auto_fire": "Auto Fire",
+  "infinite.features.local.combat.swap_shot_feature.offhand_fireworks": "Offhand Fireworks",
+  "infinite.features.local.combat.swap_shot_feature.shot_interval": "Shot Interval",
+  "infinite.features.local.combat.throwable_feature": "Displays the trajectory of throwable items like Snowballs or Ender Pearls to improve accuracy.",
   "infinite.features.local.combat.throwable_feature.max_reach": "Max Reach",
   "infinite.features.local.combat.throwable_feature.only_when_lock_on": "Only When Lock-On",
   "infinite.features.local.combat.throwable_feature.simulation_max_steps": "Simulation Steps",
   "infinite.features.local.combat.throwable_feature.simulation_precision": "Simulation Precision",
-  "infinite.features.local.level.esp_feature": "ESP",
+  "infinite.features.local.inventory": "Inventory",
+  "infinite.features.local.inventory.auto_armor_feature": "Automatically equips the best armor in your inventory. Can also switch to Elytra based on durability.",
+  "infinite.features.local.inventory.auto_armor_feature.auto_equip": "Auto Equip",
+  "infinite.features.local.inventory.auto_armor_feature.delay": "Equip Delay",
+  "infinite.features.local.inventory.auto_armor_feature.durability_threshold": "Durability Threshold",
+  "infinite.features.local.inventory.auto_armor_feature.elytra_switch": "Elytra Switch",
+  "infinite.features.local.inventory.container_util_feature": "Provides various utilities for container interaction, like hotbar rotation.",
+  "infinite.features.local.inventory.container_util_feature.auto_rocket": "Auto Rocket",
+  "infinite.features.local.inventory.container_util_feature.hotbar_rotate": "Hotbar Rotate",
+  "infinite.features.local.inventory.container_util_feature.instant_stop": "Instant Stop",
+  "infinite.features.local.inventory.item_relocate_feature": "Automatically organizes or moves items within your inventory.",
+  "infinite.features.local.inventory.item_relocate_feature.delay_property": "Relocate Delay",
+  "infinite.features.local.inventory.item_restock_feature": "Automatically refills item stacks in your hotbar from your inventory.",
+  "infinite.features.local.inventory.item_restock_feature.delay_property": "Restock Delay",
+  "infinite.features.local.inventory.item_restock_feature.threshold_property": "Restock Threshold",
+  "infinite.features.local.inventory.restock_feature": "Automatically refills item stacks in your hotbar from your inventory.",
+  "infinite.features.local.inventory.restock_feature.delay_property": "Restock Delay",
+  "infinite.features.local.inventory.restock_feature.threshold_property": "Restock Threshold",
+  "infinite.features.local.level": "World (Local)",
+  "infinite.features.local.level.block_highlight_feature": "Outlines and highlights specific blocks to make them stand out.",
+  "infinite.features.local.level.block_highlight_feature.animation": "Animation",
+  "infinite.features.local.level.block_highlight_feature.blocks_to_highlight": "Blocks to Highlight",
+  "infinite.features.local.level.block_highlight_feature.highlight_mode": "Highlight Mode",
+  "infinite.features.local.level.block_highlight_feature.line_width": "Line Width",
+  "infinite.features.local.level.block_highlight_feature.max_draw_count": "Max Draw Count",
+  "infinite.features.local.level.block_highlight_feature.render_range": "Render Range",
+  "infinite.features.local.level.block_highlight_feature.render_style": "Render Style",
+  "infinite.features.local.level.block_highlight_feature.scan_range": "Scan Range",
+  "infinite.features.local.level.block_highlight_feature.view_focus": "View Focus",
+  "infinite.features.local.level.cave_highlight_feature": "Highlights caves and air pockets to make subterranean exploration easier.",
+  "infinite.features.local.level.cave_highlight_feature.animation": "Animation",
+  "infinite.features.local.level.cave_highlight_feature.blocks_to_highlight": "Blocks to Highlight",
+  "infinite.features.local.level.cave_highlight_feature.check_surroundings": "Check Surroundings",
+  "infinite.features.local.level.cave_highlight_feature.line_width": "Line Width",
+  "infinite.features.local.level.cave_highlight_feature.max_draw_count": "Max Draw Count",
+  "infinite.features.local.level.cave_highlight_feature.max_y": "Max Y Coordinate",
+  "infinite.features.local.level.cave_highlight_feature.player_exclusion_radius": "Player Exclusion Radius",
+  "infinite.features.local.level.cave_highlight_feature.render_range": "Render Range",
+  "infinite.features.local.level.cave_highlight_feature.render_style": "Render Style",
+  "infinite.features.local.level.cave_highlight_feature.scan_range": "Scan Range",
+  "infinite.features.local.level.cave_highlight_feature.sky_light_threshold": "Sky Light Threshold",
+  "infinite.features.local.level.cave_highlight_feature.view_focus": "View Focus",
+  "infinite.features.local.level.esp_feature": "Allows you to see entities (players, mobs, items) through walls. Includes opacity settings and distance-based fade-out.",
   "infinite.features.local.level.esp_feature.alpha_max_distance": "Max Fade Distance",
   "infinite.features.local.level.esp_feature.alpha_min_distance": "Min Fade Distance",
   "infinite.features.local.level.esp_feature.item_esp": "Show Items",
   "infinite.features.local.level.esp_feature.min_alpha_percent": "Minimum Opacity",
   "infinite.features.local.level.esp_feature.mob_esp": "Show Mobs",
   "infinite.features.local.level.esp_feature.player_esp": "Show Players",
-  "infinite.features.local.level.xray_feature": "X-Ray",
+  "infinite.features.local.level.fast_break_feature": "Enables faster block breaking in survival mode.",
+  "infinite.features.local.level.fast_break_feature.interval": "Interval",
+  "infinite.features.local.level.fast_break_feature.safe_mode": "Safe Mode",
+  "infinite.features.local.level.fast_break_feature.threshold_percentage": "Threshold Percentage",
+  "infinite.features.local.level.fast_break_feature.threshold_tick": "Threshold Tick",
+  "infinite.features.local.level.linear_break_feature": "Instantly breaks multiple blocks in a straight line.",
+  "infinite.features.local.level.linear_break_feature.break_range": "Break Range",
+  "infinite.features.local.level.ultra_tag_feature": "Adds detailed info tags above entities, including health and equipment.",
+  "infinite.features.local.level.ultra_tag_feature.fade_end": "Fade-Out End",
+  "infinite.features.local.level.ultra_tag_feature.fade_start": "Fade-Out Start",
+  "infinite.features.local.level.ultra_tag_feature.item_hide_angle": "Item Hide Angle",
+  "infinite.features.local.level.ultra_tag_feature.range": "Display Range",
+  "infinite.features.local.level.ultra_tag_feature.show_equipments": "Show Equipment",
+  "infinite.features.local.level.ultra_tag_feature.show_items": "Show Items",
+  "infinite.features.local.level.ultra_tag_feature.show_mobs": "Show Mobs",
+  "infinite.features.local.level.ultra_tag_feature.show_players": "Show Players",
+  "infinite.features.local.level.vein_break_feature": "Breaks entire veins of connected ore blocks at once.",
+  "infinite.features.local.level.vein_break_feature.block_list": "Block List",
+  "infinite.features.local.level.vein_break_feature.break_range": "Break Range",
+  "infinite.features.local.level.vein_break_feature.max_blocks": "Max Blocks",
+  "infinite.features.local.level.xray_feature": "Renders selected blocks transparently to help you find ores or specific structures efficiently.",
   "infinite.features.local.level.xray_feature.method": "Method",
   "infinite.features.local.level.xray_feature.target_blocks": "Target Blocks",
   "infinite.features.local.level.xray_feature.transparency": "Transparency",
   "infinite.features.local.level.xray_feature.white_list_block": "Whitelist Blocks",
-  "infinite.features.local.movement.quick_move_feature": "Quick Move",
+  "infinite.features.local.movement": "Movement (Local)",
+  "infinite.features.local.movement.better_sneak_feature": "Improves sneaking behavior and fall protection near edges.",
+  "infinite.features.local.movement.better_sneak_feature.edge_distance": "Edge Distance",
+  "infinite.features.local.movement.better_sneak_feature.safe_walk": "Safe Walk",
+  "infinite.features.local.movement.fast_descent_feature": "Increases falling speed for quicker landings.",
+  "infinite.features.local.movement.fast_descent_feature.descent_factor": "Descent Factor",
+  "infinite.features.local.movement.keep_walk_feature": "Allows you to continue walking without holding down keys.",
+  "infinite.features.local.movement.quick_move": "Quick Move",
+  "infinite.features.local.movement.quick_move.acceleration_constant": "Acceleration Constant",
+  "infinite.features.local.movement.quick_move.acceleration_multiplier": "Acceleration Multiplier",
+  "infinite.features.local.movement.quick_move.allow_in_air": "Allow in Air",
+  "infinite.features.local.movement.quick_move.allow_in_lava": "Allow in Lava",
+  "infinite.features.local.movement.quick_move.allow_in_water": "Allow in Water",
+  "infinite.features.local.movement.quick_move.allow_on_gliding": "Allow While Gliding",
+  "infinite.features.local.movement.quick_move.allow_on_ground": "Allow When Grounded",
+  "infinite.features.local.movement.quick_move.allow_on_swimming": "Allow While Swimming",
+  "infinite.features.local.movement.quick_move.allow_with_vehicle": "Allow in Vehicle",
+  "infinite.features.local.movement.quick_move.anti_friction_boost": "Anti-Friction Boost",
+  "infinite.features.local.movement.quick_move.anti_friction_point": "Anti-Friction Point",
+  "infinite.features.local.movement.quick_move.friction_property": "Friction",
+  "infinite.features.local.movement.quick_move.item_use_boost": "Item-Use Boost",
+  "infinite.features.local.movement.quick_move.reduction_threshold": "Reduction Threshold",
+  "infinite.features.local.movement.quick_move.speed": "Speed",
+  "infinite.features.local.movement.quick_move_feature": "Boosts player movement speed across various conditions, including ground, air, water, and gliding.",
   "infinite.features.local.movement.quick_move_feature.acceleration_constant": "Acceleration Constant",
   "infinite.features.local.movement.quick_move_feature.acceleration_multiplier": "Acceleration Multiplier",
   "infinite.features.local.movement.quick_move_feature.allow_in_air": "Allow in Air",
@@ -109,199 +204,104 @@
   "infinite.features.local.movement.quick_move_feature.item_use_boost": "Item-Use Boost",
   "infinite.features.local.movement.quick_move_feature.reduction_threshold": "Reduction Threshold",
   "infinite.features.local.movement.quick_move_feature.speed": "Speed",
-  "infinite.features.local.movement.super_fly_feature": "Super Fly",
+  "infinite.features.local.movement.super_fly": "Super Fly",
+  "infinite.features.local.movement.super_fly.keep_fly": "Keep Flying",
+  "infinite.features.local.movement.super_fly.method": "Method",
+  "infinite.features.local.movement.super_fly.power": "Power",
+  "infinite.features.local.movement.super_fly_feature": "Enables freedom of flight similar to creative mode for easy exploration.",
   "infinite.features.local.movement.super_fly_feature.keep_fly": "Keep Flying",
   "infinite.features.local.movement.super_fly_feature.method": "Method",
   "infinite.features.local.movement.super_fly_feature.power": "Power",
-  "infinite.features.local.movement.water_hovering_feature": "Water Hover",
+  "infinite.features.local.movement.water_hovering_feature": "Walk on water surfaces as if they were solid ground.",
   "infinite.features.local.movement.water_hovering_feature.method": "Method",
-  "infinite.features.local.rendering.bright_sight_feature": "Bright Vision",
+  "infinite.features.local.rendering": "Rendering (Local)",
+  "infinite.features.local.rendering.bright_sight_feature": "Brightens the world in dark areas, ensuring full visibility at all times.",
   "infinite.features.local.rendering.bright_sight_feature.method": "Method",
-  "infinite.features.local.rendering.clear_sight_feature": "Clear Vision",
+  "infinite.features.local.rendering.clear_sight_feature": "Removes fog and screen overlays (like fire or water) for a clear, unobstructed view.",
   "infinite.features.local.rendering.clear_sight_feature.anti_fog": "Anti-Fog",
   "infinite.features.local.rendering.clear_sight_feature.anti_fov_change": "Anti FOV Change",
   "infinite.features.local.rendering.clear_sight_feature.anti_overlay": "Anti-Overlay",
   "infinite.features.local.rendering.clear_sight_feature.fov_intensity": "FOV Intensity",
   "infinite.features.local.rendering.clear_sight_feature.fov_max_increase": "Max FOV Increase",
-  "infinite.features.local.rendering.tough_sight_feature": "Tough Vision",
+  "infinite.features.local.rendering.hello_feature": "Hello",
+  "infinite.features.local.rendering.hello_feature.boolean_property": "Boolean Value",
+  "infinite.features.local.rendering.hello_feature.double_property": "Double Value",
+  "infinite.features.local.rendering.hello_feature.float_property": "Float Value",
+  "infinite.features.local.rendering.hello_feature.int_property": "Int Value",
+  "infinite.features.local.rendering.hello_feature.item_list_property": "Item List",
+  "infinite.features.local.rendering.hello_feature.long_property": "Long Value",
+  "infinite.features.local.rendering.hello_feature.selection_property": "Selection",
+  "infinite.features.local.rendering.hello_feature.string_property": "String",
+  "infinite.features.local.rendering.stable_sight_feature": "Reduces camera shake and stabilizes your view.",
+  "infinite.features.local.rendering.stable_sight_feature.camera_distance": "Camera Distance",
+  "infinite.features.local.rendering.stable_sight_feature.ignore_terrain": "Ignore Terrain",
+  "infinite.features.local.rendering.tough_sight_feature": "Negates visual impairments from status effects like Blindness or Nausea.",
   "infinite.features.local.rendering.tough_sight_feature.anti_blindness": "Anti-Blindness",
   "infinite.features.local.rendering.tough_sight_feature.anti_darkness": "Anti-Darkness",
   "infinite.features.local.rendering.tough_sight_feature.anti_nausea": "Anti-Nausea",
-  "infinite.features.local.rendering.zoom_sight_feature": "Zoom",
+  "infinite.features.local.rendering.ultra_ui_feature": "Displays a stylish and highly functional custom HUD.",
+  "infinite.features.local.rendering.ultra_ui_feature.alpha": "UI Alpha",
+  "infinite.features.local.rendering.ultra_ui_feature.bar_height": "Bar Height",
+  "infinite.features.local.rendering.ultra_ui_feature.crosshair_ui": "Crosshair UI",
+  "infinite.features.local.rendering.ultra_ui_feature.hotbar_ui": "Hotbar UI",
+  "infinite.features.local.rendering.ultra_ui_feature.left_box_ui": "Left Box UI",
+  "infinite.features.local.rendering.ultra_ui_feature.padding": "UI Padding",
+  "infinite.features.local.rendering.ultra_ui_feature.right_box_ui": "Right Box UI",
+  "infinite.features.local.rendering.ultra_ui_feature.top_box_ui": "Top Box UI",
+  "infinite.features.local.rendering.zoom_sight_feature": "Magnifies your view smoothly, providing a telescope-like effect with a simple key press.",
   "infinite.features.local.rendering.zoom_sight_feature.auto_release_on_move": "Release on Move",
   "infinite.features.local.rendering.zoom_sight_feature.max_zoom": "Max Zoom",
   "infinite.features.local.rendering.zoom_sight_feature.sensitivity_reduction": "Sensitivity Reduction",
   "infinite.features.local.rendering.zoom_sight_feature.smooth_zoom": "Smooth Zoom",
   "infinite.features.local.rendering.zoom_sight_feature.zoom_level": "Zoom Level",
   "infinite.features.local.rendering.zoom_sight_feature.zoom_step": "Zoom Step",
+  "key.infinite.features.features.local.swap_tool_feature.toggle": "Toggle Swap Tool",
   "key.infinite.features.local.combat.archery_feature.toggle": "Toggle Archery",
   "key.infinite.features.local.combat.counter_feature.toggle": "Toggle Counter",
   "key.infinite.features.local.combat.critical_feature.toggle": "Toggle Critical",
+  "key.infinite.features.local.combat.instant_use_feature.cycle_mode": "Cycle Mode",
+  "key.infinite.features.local.combat.instant_use_feature.toggle": "Toggle Instant Use",
+  "key.infinite.features.local.combat.lock_on.toggle": "Toggle Lock-On",
+  "key.infinite.features.local.combat.lock_on_feature.add_target": "Add Target",
+  "key.infinite.features.local.combat.lock_on_feature.clear_all": "Clear All Targets",
+  "key.infinite.features.local.combat.lock_on_feature.focus_best": "Focus Best Target",
+  "key.infinite.features.local.combat.lock_on_feature.next_target_spatial": "Next Target (Right)",
+  "key.infinite.features.local.combat.lock_on_feature.prev_target_spatial": "Previous Target (Left)",
+  "key.infinite.features.local.combat.lock_on_feature.remove_target": "Remove Current Target",
   "key.infinite.features.local.combat.lock_on_feature.toggle": "Toggle Lock-On",
+  "key.infinite.features.local.combat.lock_on_feature.toggle_pause": "Toggle Lock-On Pause",
   "key.infinite.features.local.combat.mace_boost_feature.toggle": "Toggle Mace Boost",
+  "key.infinite.features.local.combat.quick_shot_feature.toggle": "Toggle Quick Shot",
+  "key.infinite.features.local.combat.swap_shot_feature.switch_mode": "Switch Mode",
+  "key.infinite.features.local.combat.swap_shot_feature.toggle": "Toggle Swap Shot",
   "key.infinite.features.local.combat.throwable_feature.toggle": "Toggle Throwable",
+  "key.infinite.features.local.inventory.auto_armor_feature.toggle": "Toggle Auto Armor",
+  "key.infinite.features.local.inventory.container_util_feature.toggle": "Toggle Container Utility",
+  "key.infinite.features.local.inventory.item_relocate_feature.toggle": "Toggle Item Relocate",
+  "key.infinite.features.local.inventory.item_restock_feature.toggle": "Toggle Restock",
+  "key.infinite.features.local.inventory.restock_feature.toggle": "Toggle Restock",
+  "key.infinite.features.local.level.block_highlight_feature.toggle": "Toggle Block Highlight",
+  "key.infinite.features.local.level.cave_highlight_feature.toggle": "Toggle Cave Highlight",
   "key.infinite.features.local.level.esp_feature.toggle": "Toggle ESP",
+  "key.infinite.features.local.level.fast_break_feature.toggle": "Toggle Fast Break",
+  "key.infinite.features.local.level.linear_break_feature.toggle": "Toggle Linear Break",
+  "key.infinite.features.local.level.ultra_tag_feature.toggle": "Toggle Ultra Tag",
+  "key.infinite.features.local.level.vein_break_feature.toggle": "Toggle Vein Break",
   "key.infinite.features.local.level.xray_feature.toggle": "Toggle X-Ray",
+  "key.infinite.features.local.movement.better_sneak_feature.toggle": "Toggle Better Sneak",
+  "key.infinite.features.local.movement.fast_descent_feature.toggle": "Toggle Fast Descent",
+  "key.infinite.features.local.movement.keep_walk_feature.toggle": "Toggle Keep Walk",
   "key.infinite.features.local.movement.quick_move_feature.toggle": "Toggle Quick Move",
   "key.infinite.features.local.movement.super_fly_feature.toggle": "Toggle Super Fly",
   "key.infinite.features.local.movement.water_hovering_feature.toggle": "Toggle Water Hover",
   "key.infinite.features.local.rendering.bright_sight_feature.toggle": "Toggle Bright Vision",
   "key.infinite.features.local.rendering.clear_sight_feature.toggle": "Toggle Clear Vision",
+  "key.infinite.features.local.rendering.hello_feature.toggle": "Toggle Hello",
+  "key.infinite.features.local.rendering.stable_sight_feature.toggle": "Toggle Stable Sight",
   "key.infinite.features.local.rendering.tough_sight_feature.toggle": "Toggle Tough Vision",
+  "key.infinite.features.local.rendering.ultra_ui_feature.toggle": "Toggle Ultra UI",
+  "key.infinite.features.local.rendering.zoom_sight_feature.toggle": "Toggle Zoom",
   "key.infinite.features.local.rendering.zoom_sight_feature.zoom_in": "Zoom In",
   "key.infinite.features.local.rendering.zoom_sight_feature.zoom_out": "Zoom Out",
-  "key.infinite.features.local.rendering.zoom_sight_feature.toggle": "Toggle Zoom",
-  "infinite.features.local.combat.quick_shot_feature": "Quick Shot",
-  "infinite.features.local.level.ultra_tag_feature": "Ultra Tag",
-  "infinite.features.local.level.ultra_tag_feature.fade_end": "Fade-Out End",
-  "infinite.features.local.level.ultra_tag_feature.fade_start": "Fade-Out Start",
-  "infinite.features.local.level.ultra_tag_feature.item_hide_angle": "Item Hide Angle",
-  "infinite.features.local.level.ultra_tag_feature.range": "Display Range",
-  "infinite.features.local.level.ultra_tag_feature.show_equipments": "Show Equipment",
-  "infinite.features.local.level.ultra_tag_feature.show_items": "Show Items",
-  "infinite.features.local.level.ultra_tag_feature.show_mobs": "Show Mobs",
-  "infinite.features.local.level.ultra_tag_feature.show_players": "Show Players",
-  "key.infinite.features.local.combat.quick_shot_feature.toggle": "Toggle Quick Shot",
-  "key.infinite.features.local.level.ultra_tag_feature.toggle": "Toggle Ultra Tag",
-  "infinite.features.local.combat.lock_on_feature.auto_next_target": "Auto Next Target",
-  "infinite.features.local.combat.lock_on_feature.auto_reselect": "Auto Reselect",
-  "infinite.features.local.combat.lock_on_feature.pause_on_kill": "Pause on Kill",
-  "infinite.features.local.combat.swap_shot_feature": "Swap Shot",
-  "infinite.features.local.combat.swap_shot_feature.auto_fire": "Auto Fire",
-  "infinite.features.local.combat.swap_shot_feature.offhand_fireworks": "Offhand Fireworks",
-  "infinite.features.local.combat.swap_shot_feature.shot_interval": "Shot Interval",
-  "infinite.features.local.inventory": "Inventory (Local)",
-  "infinite.features.local.inventory.restock_feature": "Restock",
-  "infinite.features.local.inventory.restock_feature.delay_property": "Restock Delay",
-  "infinite.features.local.inventory.restock_feature.threshold_property": "Restock Threshold",
-  "key.infinite.features.local.combat.lock_on_feature.add_target": "Add Target",
-  "key.infinite.features.local.combat.lock_on_feature.toggle_pause": "Toggle Lock-On Pause",
-  "key.infinite.features.local.combat.lock_on_feature.remove_target": "Remove Current Target",
-  "key.infinite.features.local.combat.lock_on_feature.next_target_spatial": "Next Target (Right)",
-  "key.infinite.features.local.combat.lock_on_feature.prev_target_spatial": "Previous Target (Left)",
-  "key.infinite.features.local.combat.lock_on_feature.focus_best": "Focus Best Target",
-  "key.infinite.features.local.combat.lock_on_feature.clear_all": "Clear All Targets",
-  "key.infinite.features.local.combat.swap_shot_feature.switch_mode": "Switch Mode",
-  "key.infinite.features.local.combat.swap_shot_feature.toggle": "Toggle Swap Shot",
-  "key.infinite.features.local.inventory.restock_feature.toggle": "Toggle Restock",
-  "infinite.features.local.combat.lock_on_feature.aim_bias": "Aim Bias (Distance vs Angle)",
-  "infinite.features.global.rendering.infinite_loading_feature": "Infinite Loading",
-  "doc.infinite.properties_section_title": "Properties",
-  "doc.infinite.property_info_title": "Details",
-  "doc.infinite.property_type": "Type",
-  "doc.infinite.property_default": "Default",
-  "doc.infinite.property_min": "Minimum",
-  "doc.infinite.property_max": "Maximum",
-  "doc.infinite.property_options": "Options",
-  "doc.infinite.property_list_count": "Default Count",
-  "doc.infinite.property_list_type": "List Type",
-  "infinite.features.local": "Local Features",
-  "infinite.features.local.inventory.auto_armor_feature": "Auto Armor",
-  "infinite.features.local.inventory.auto_armor_feature.auto_equip": "Auto Equip",
-  "infinite.features.local.inventory.auto_armor_feature.delay": "Equip Delay",
-  "infinite.features.local.inventory.auto_armor_feature.durability_threshold": "Durability Threshold",
-  "infinite.features.local.inventory.auto_armor_feature.elytra_switch": "Elytra Switch",
-  "infinite.features.local.inventory.container_util_feature": "Container Utility",
-  "infinite.features.local.inventory.container_util_feature.auto_rocket": "Auto Rocket",
-  "infinite.features.local.inventory.container_util_feature.hotbar_rotate": "Hotbar Rotate",
-  "infinite.features.local.inventory.container_util_feature.instant_stop": "Instant Stop",
-  "infinite.features.local.inventory.item_relocate_feature": "Item Relocate",
-  "infinite.features.local.inventory.item_relocate_feature.delay_property": "Relocate Delay",
-  "infinite.features.local.rendering.stable_sight_feature": "Stable Sight",
-  "infinite.features.local.rendering.stable_sight_feature.camera_distance": "Camera Distance",
-  "infinite.features.local.rendering.stable_sight_feature.ignore_terrain": "Ignore Terrain",
-  "infinite.features.local.rendering.ultra_ui_feature": "Ultra UI",
-  "infinite.features.local.rendering.ultra_ui_feature.alpha": "UI Alpha",
-  "infinite.features.local.rendering.ultra_ui_feature.bar_height": "Bar Height",
-  "infinite.features.local.rendering.ultra_ui_feature.crosshair_ui": "Crosshair UI",
-  "infinite.features.local.rendering.ultra_ui_feature.hotbar_ui": "Hotbar UI",
-  "infinite.features.local.rendering.ultra_ui_feature.left_box_ui": "Left Box UI",
-  "infinite.features.local.rendering.ultra_ui_feature.padding": "UI Padding",
-  "infinite.features.local.rendering.ultra_ui_feature.right_box_ui": "Right Box UI",
-  "infinite.features.local.rendering.ultra_ui_feature.top_box_ui": "Top Box UI",
-  "infinite.features.global": "Global Features",
-  "infinite.features.global.rendering.theme_feature.style": "Theme Style",
-  "key.infinite.features.local.inventory.auto_armor_feature.toggle": "Toggle Auto Armor",
-  "key.infinite.features.local.inventory.container_util_feature.toggle": "Toggle Container Utility",
-  "key.infinite.features.local.inventory.item_relocate_feature.toggle": "Toggle Item Relocate",
-  "key.infinite.features.local.rendering.stable_sight_feature.toggle": "Toggle Stable Sight",
-  "key.infinite.features.local.rendering.ultra_ui_feature.toggle": "Toggle Ultra UI",
-  "infinite.features.local.inventory.item_restock_feature": "Item Restock Feature",
-  "infinite.features.local.inventory.item_restock_feature.delay_property": "Restock Delay",
-  "infinite.features.local.inventory.item_restock_feature.threshold_property": "Restock Threshold",
-  "key.infinite.features.local.inventory.item_restock_feature.toggle": "Toggle Item Restock Feature",
-  "infinite.features.local.combat.quick_shot_feature.interval_shift": "Quick Shot Interval Shift",
-  "infinite.features.local.movement.better_sneak_feature": "Better Sneak Feature",
-  "infinite.features.local.movement.better_sneak_feature.edge_distance": "Edge Distance",
-  "infinite.features.local.movement.better_sneak_feature.safe_walk": "Safe Walk",
-  "infinite.features.local.movement.fast_descent_feature": "Fast Descent Feature",
-  "infinite.features.local.movement.fast_descent_feature.descent_factor": "Descent Factor",
-  "infinite.features.global.control": "Global Control Features",
-  "infinite.features.global.control.ime_input_feature": "IME Input Support Feature",
-  "key.infinite.features.local.movement.better_sneak_feature.toggle": "Toggle Better Sneak Feature",
-  "key.infinite.features.local.movement.fast_descent_feature.toggle": "Toggle Fast Descent Feature",
-  "infinite.features.local.movement.keep_walk_feature": "Easy Keep Walking feature",
-  "key.infinite.features.local.movement.keep_walk_feature.toggle": "Toggle Keep Walk Feature",
-  "infinite.features.local.combat.instant_use_feature": "Instant Use",
-  "infinite.features.local.combat.instant_use_feature.mode": "Mode",
-  "infinite.features.local.combat.instant_use_feature.custom_delay": "Custom Delay",
-  "infinite.features.local.combat.instant_use_feature.fast_place_speed": "Fast Place Speed",
-  "infinite.features.local.combat.instant_use_feature.allow_crystals": "Allow Crystals",
-  "infinite.features.local.combat.instant_use_feature.allow_exp_bottles": "Allow XP Bottles",
-  "infinite.features.local.combat.instant_use_feature.allow_blocks": "Allow Blocks",
-  "infinite.features.local.combat.instant_use_feature.allow_throwables": "Allow Throwables",
-  "infinite.features.local.combat.instant_use_feature.allow_food": "Allow Food",
-  "infinite.features.local.combat.instant_use_feature.allow_all": "Allow All Items",
-  "infinite.features.local.combat.instant_use_feature.custom_items": "Custom Items",
-  "infinite.features.local.combat.instant_use_feature.only_when_lock_on": "Only When Lock-On",
-  "infinite.features.local.combat.instant_use_feature.check_offhand": "Check Offhand",
-  "key.infinite.features.local.combat.instant_use_feature.toggle": "Toggle Instant Use",
-  "key.infinite.features.local.combat.instant_use_feature.cycle_mode": "Cycle Instant Use Mode",
-  "infinite.features.local.combat.lock_on_feature.attack_target": "Auto Attack",
-  "infinite.features.local.combat.lock_on_feature.attack_strength": "Attack Strength (Cooldown)",
-  "infinite.features.local.combat.lock_on_feature.attack_randomization": "Random Delay (Tick)",
-  "infinite.features.local.level.block_highlight_feature": "Block Highlight",
-    "infinite.features.local.level.block_highlight_feature.blocks_to_highlight": "Blocks to Highlight",
-    "infinite.features.local.level.block_highlight_feature.highlight_mode": "Highlight Mode",
-    "infinite.features.local.level.block_highlight_feature.scan_range": "Scan Range",
-    "infinite.features.local.level.block_highlight_feature.render_range": "Render Range",
-    "infinite.features.local.level.block_highlight_feature.render_style": "Render Style",
-    "infinite.features.local.level.block_highlight_feature.max_draw_count": "Max Draw Count",
-    "infinite.features.local.level.block_highlight_feature.line_width": "Line Width",
-    "infinite.features.local.level.block_highlight_feature.view_focus": "View Focus",
-    "infinite.features.local.level.block_highlight_feature.animation": "Animation",
-    "key.infinite.features.local.level.block_highlight_feature.toggle": "Toggle Block Highlight",
-  "infinite.features.features.local.swap_tool_feature": "Swap Tool Feature",
-  "infinite.features.features.local.swap_tool_feature.method": "Method",
-  "infinite.features.features.local.swap_tool_feature.fine_tool_strategy": "Fine Tool Strategy",
-  "infinite.features.features.local.swap_tool_feature.switch_delay": "Switch Delay",
-  "infinite.features.local.level.cave_highlight_feature": "Cave Highlight Feature",
-  "infinite.features.local.level.cave_highlight_feature.blocks_to_highlight": "Blocks to Highlight",
-  "infinite.features.local.level.cave_highlight_feature.scan_range": "Scan Range",
-  "infinite.features.local.level.cave_highlight_feature.render_range": "Render Range",
-  "infinite.features.local.level.cave_highlight_feature.render_style": "Render Style",
-  "infinite.features.local.level.cave_highlight_feature.max_draw_count": "Max Draw Count",
-  "infinite.features.local.level.cave_highlight_feature.line_width": "Line Width",
-  "infinite.features.local.level.cave_highlight_feature.view_focus": "View Focus",
-  "infinite.features.local.level.cave_highlight_feature.animation": "Animation",
-  "infinite.features.local.level.cave_highlight_feature.max_y": "Max Y Coordinate",
-  "infinite.features.local.level.cave_highlight_feature.check_surroundings": "Check Surroundings",
-  "infinite.features.local.level.cave_highlight_feature.sky_light_threshold": "Sky Light Threshold",
-  "infinite.features.local.level.cave_highlight_feature.player_exclusion_radius": "Player Exclusion Radius",
-  "infinite.features.local.level.fast_break_feature": "Fast Break Feature",
-  "infinite.features.local.level.fast_break_feature.safe_mode": "Safe Mode",
-  "infinite.features.local.level.fast_break_feature.interval": "Interval",
-  "infinite.features.local.level.fast_break_feature.threshold_percentage": "Threshold Percentage",
-  "infinite.features.local.level.fast_break_feature.threshold_tick": "Threshold Tick",
-  "infinite.features.local.level.linear_break_feature": "Linear Break Feature",
-  "infinite.features.local.level.linear_break_feature.break_range": "Break Range",
-  "infinite.features.local.level.vein_break_feature": "Vein Break Feature",
-  "infinite.features.local.level.vein_break_feature.block_list": "Block List",
-  "infinite.features.local.level.vein_break_feature.break_range": "Break Range",
-  "infinite.features.local.level.vein_break_feature.max_blocks": "Max Blocks",
-  "key.infinite.features.features.local.swap_tool_feature.toggle": "Toggle Swap Tool Feature",
-  "key.infinite.features.local.level.cave_highlight_feature.toggle": "Toggle Cave Highlight Feature",
-  "key.infinite.features.local.level.fast_break_feature.toggle": "Toggle Fast Break Feature",
-  "key.infinite.features.local.level.linear_break_feature.toggle": "Toggle Linear Break Feature",
-  "key.infinite.features.local.level.vein_break_feature.toggle": "Toggle Vein Break Feature"
-}
\ No newline at end of file
+  "key.infinite.game_options": "Infinite Options"
+}
diff --git a/src/main/resources/assets/infinite-client/lang/ja_jp.json b/src/main/resources/assets/infinite-client/lang/ja_jp.json
index 346f4eed..996d8c88 100644
--- a/src/main/resources/assets/infinite-client/lang/ja_jp.json
+++ b/src/main/resources/assets/infinite-client/lang/ja_jp.json
@@ -1,15 +1,15 @@
 {
   "infinite.features.infinite": "Infinite Features",
-  "infinite.features.local.combat": "Local Combat Features",
-  "infinite.features.local.level": "Local Level Features",
-  "infinite.features.local.movement": "Local Movement Features",
-  "infinite.features.local.movement.quick_move": "Quick Move",
-  "infinite.features.local.movement.super_fly": "Super Fly",
-  "infinite.features.local.rendering": "Local Rendering Features",
-  "infinite.features.local.rendering.hello_feature": "Hello",
-  "infinite.features.global.rendering": "Global Rendering Features",
-  "infinite.features.global.rendering.infinite_font_feature": "Infinite Font Feature",
-  "infinite.features.global.rendering.theme_feature": "Theme Feature",
+  "infinite.features.local.combat": "戦闘（ローカル）",
+  "infinite.features.local.level": "ワールド（ローカル）",
+  "infinite.features.local.movement": "移動（ローカル）",
+  "infinite.features.local.movement.quick_move": "クイックムーブ",
+  "infinite.features.local.movement.super_fly": "スーパーフライ",
+  "infinite.features.local.rendering": "描画（ローカル）",
+  "infinite.features.local.rendering.hello_feature": "ハロー",
+  "infinite.features.global.rendering": "描画（グローバル）",
+  "infinite.features.global.rendering.infinite_font_feature": "カスタムフォント",
+  "infinite.features.global.rendering.theme_feature": "テーマ設定",
   "infinite.features.local.combat.critical_feature": "攻撃時に自動的にクリティカル判定を発生させます。モードによって検知リスクと挙動が異なります。",
   "infinite.features.local.combat.critical_feature.mode": "判定モード",
   "infinite.features.local.movement.quick_move.acceleration_constant": "加速定数",
@@ -30,36 +30,36 @@
   "infinite.features.local.movement.super_fly.keep_fly": "飛行維持",
   "infinite.features.local.movement.super_fly.method": "飛行方法",
   "infinite.features.local.movement.super_fly.power": "飛行速度倍率",
-  "infinite.features.local.rendering.hello_feature.boolean_property": "Boolean Value",
-  "infinite.features.local.rendering.hello_feature.double_property": "Double Value",
-  "infinite.features.local.rendering.hello_feature.float_property": "Float Value",
-  "infinite.features.local.rendering.hello_feature.int_property": "Int Value",
-  "infinite.features.local.rendering.hello_feature.item_list_property": "Item List",
-  "infinite.features.local.rendering.hello_feature.long_property": "Long Value",
-  "infinite.features.local.rendering.hello_feature.selection_property": "Selection",
-  "infinite.features.local.rendering.hello_feature.string_property": "String",
+  "infinite.features.local.rendering.hello_feature.boolean_property": "真偽値設定",
+  "infinite.features.local.rendering.hello_feature.double_property": "数値設定 (Double)",
+  "infinite.features.local.rendering.hello_feature.float_property": "数値設定 (Float)",
+  "infinite.features.local.rendering.hello_feature.int_property": "数値設定 (Int)",
+  "infinite.features.local.rendering.hello_feature.item_list_property": "アイテムリスト",
+  "infinite.features.local.rendering.hello_feature.long_property": "数値設定 (Long)",
+  "infinite.features.local.rendering.hello_feature.selection_property": "選択項目",
+  "infinite.features.local.rendering.hello_feature.string_property": "文字列設定",
   "infinite.features.global.rendering.infinite_font_feature.bold_font": "太字フォント",
   "infinite.features.global.rendering.infinite_font_feature.bold_italic_font": "太字斜体フォント",
   "infinite.features.global.rendering.infinite_font_feature.italic_font": "斜体フォント",
   "infinite.features.global.rendering.infinite_font_feature.regular_font": "標準フォント",
   "infinite.features.global.rendering.theme_feature.current_theme": "現在のテーマ",
-  "key.infinite.features.local.rendering.hello_feature.toggle": "Toggle Hello",
-  "key.infinite.game_options": "Infinite Game Options",
-  "key.infinite.features.local.combat.lock_on.toggle": "Toggle LockOn Feature",
-  "infinite.features.local.combat.archery_feature": "Archery Feature",
+  "key.infinite.features.local.rendering.hello_feature.toggle": "ハロー機能を切り替え",
+  "key.infinite.game_options": "Infinite クライアント設定",
+  "key.infinite.features.local.combat.lock_on.toggle": "ロックオン機能を切り替え",
+  "infinite.features.local.combat.archery_feature": "弓やクロスボウの弾道を予測し、エイムを補助します。重力や空気抵抗を考慮した正確な射撃をサポートします。",
   "infinite.features.local.combat.archery_feature.ignore_terrain": "地形を無視",
   "infinite.features.local.combat.archery_feature.max_reach": "最大射程",
   "infinite.features.local.combat.archery_feature.only_when_lock_on": "ロックオン時のみ",
   "infinite.features.local.combat.archery_feature.simulation_max_steps": "シミュレーション最大ステップ",
   "infinite.features.local.combat.archery_feature.simulation_precision": "シミュレーション精度",
-  "infinite.features.local.combat.counter_feature": "Counter Feature",
+  "infinite.features.local.combat.counter_feature": "攻撃を受けた際に、自動的にカウンター（反撃）を行います。",
   "infinite.features.local.combat.counter_feature.aim_speed": "エイム速度",
   "infinite.features.local.combat.counter_feature.anchor_point": "アンカーポイント",
   "infinite.features.local.combat.counter_feature.method": "方式",
   "infinite.features.local.combat.counter_feature.process_tick": "処理ティック",
   "infinite.features.local.combat.counter_feature.randomizer": "ランダマイザー",
   "infinite.features.local.combat.counter_feature.reaction_tick": "反応ティック",
-  "infinite.features.local.combat.lock_on_feature": "Lock On Feature",
+  "infinite.features.local.combat.lock_on_feature": "ターゲットを自動的に追尾する機能です。PvPやMobとの戦闘において、エイムを正確に保つことができます。方式や追尾速度を細かく調整可能です。",
   "infinite.features.local.combat.lock_on_feature.aim_speed": "エイム速度",
   "infinite.features.local.combat.lock_on_feature.anchor_point": "アンカーポイント",
   "infinite.features.local.combat.lock_on_feature.auto_attack": "自動攻撃",
@@ -70,30 +70,30 @@
   "infinite.features.local.combat.lock_on_feature.players": "プレイヤーを対象",
   "infinite.features.local.combat.lock_on_feature.priority_mode": "優先モード",
   "infinite.features.local.combat.lock_on_feature.range": "範囲",
-  "infinite.features.local.combat.mace_boost_feature": "Mace Boost Feature",
+  "infinite.features.local.combat.mace_boost_feature": "メイスの落下ダメージ増加をサポートします。",
   "infinite.features.local.combat.mace_boost_feature.fall_multiply": "落下乗数",
   "infinite.features.local.combat.mace_boost_feature.max_step": "最大ステップ",
   "infinite.features.local.combat.mace_boost_feature.min_charge": "最小チャージ",
   "infinite.features.local.combat.mace_boost_feature.mode": "モード",
   "infinite.features.local.combat.mace_boost_feature.target_fall_dist": "目標落下距離",
-  "infinite.features.local.combat.throwable_feature": "Throwable Feature",
+  "infinite.features.local.combat.throwable_feature": "雪玉やエンダーパールなどの投擲アイテムの軌道を表示し、命中を補助します。",
   "infinite.features.local.combat.throwable_feature.max_reach": "最大射程",
   "infinite.features.local.combat.throwable_feature.only_when_lock_on": "ロックオン時のみ",
   "infinite.features.local.combat.throwable_feature.simulation_max_steps": "シミュレーション最大ステップ",
   "infinite.features.local.combat.throwable_feature.simulation_precision": "シミュレーション精度",
-  "infinite.features.local.level.esp_feature": "ESP Feature",
+  "infinite.features.local.level.esp_feature": "壁越しにエンティティ（プレイヤー、Mob、アイテム）を視認できるようにします。不透明度や距離に応じたフェードアウトも設定可能です。",
   "infinite.features.local.level.esp_feature.alpha_max_distance": "最大透過距離",
   "infinite.features.local.level.esp_feature.alpha_min_distance": "最小透過距離",
   "infinite.features.local.level.esp_feature.item_esp": "アイテム ESP",
   "infinite.features.local.level.esp_feature.min_alpha_percent": "最小不透明度 (%)",
   "infinite.features.local.level.esp_feature.mob_esp": "Mob ESP",
   "infinite.features.local.level.esp_feature.player_esp": "プレイヤー ESP",
-  "infinite.features.local.level.xray_feature": "Xray Feature",
+  "infinite.features.local.level.xray_feature": "特定のブロックのみを透過表示し、鉱石探しなどを効率化します。透過率やターゲットとなるブロックを自由に選択できます。",
   "infinite.features.local.level.xray_feature.method": "方式",
   "infinite.features.local.level.xray_feature.target_blocks": "対象ブロック",
   "infinite.features.local.level.xray_feature.transparency": "透明度",
   "infinite.features.local.level.xray_feature.white_list_block": "ホワイトリスト",
-  "infinite.features.local.movement.quick_move_feature": "Quick Move Feature",
+  "infinite.features.local.movement.quick_move_feature": "プレイヤーの移動速度をブーストします。地上だけでなく、空中や水中、滑空中など様々な状況での加速をサポートします。",
   "infinite.features.local.movement.quick_move_feature.acceleration_constant": "加速度定数",
   "infinite.features.local.movement.quick_move_feature.acceleration_multiplier": "加速度乗数",
   "infinite.features.local.movement.quick_move_feature.allow_in_air": "空中での使用",
@@ -109,50 +109,50 @@
   "infinite.features.local.movement.quick_move_feature.item_use_boost": "アイテム使用ブースト",
   "infinite.features.local.movement.quick_move_feature.reduction_threshold": "減速しきい値",
   "infinite.features.local.movement.quick_move_feature.speed": "速度",
-  "infinite.features.local.movement.super_fly_feature": "Super Fly Feature",
+  "infinite.features.local.movement.super_fly_feature": "クリエイティブ飛行のような挙動で、自由に空を飛び回ることができます。",
   "infinite.features.local.movement.super_fly_feature.keep_fly": "飛行維持",
   "infinite.features.local.movement.super_fly_feature.method": "方式",
   "infinite.features.local.movement.super_fly_feature.power": "パワー",
-  "infinite.features.local.movement.water_hovering_feature": "Water Hovering Feature",
+  "infinite.features.local.movement.water_hovering_feature": "水面を沈まずに歩くことができます。",
   "infinite.features.local.movement.water_hovering_feature.method": "方式",
-  "infinite.features.local.rendering.bright_sight_feature": "Bright Sight Feature",
+  "infinite.features.local.rendering.bright_sight_feature": "暗い場所でも明るく表示し、視認性を確保します。",
   "infinite.features.local.rendering.bright_sight_feature.method": "方式",
-  "infinite.features.local.rendering.clear_sight_feature": "Clear Sight Feature",
+  "infinite.features.local.rendering.clear_sight_feature": "フォグ（霧）やオーバーレイ（水中、炎など）を除去し、視界をクリアにします。",
   "infinite.features.local.rendering.clear_sight_feature.anti_fog": "フォグ除去",
   "infinite.features.local.rendering.clear_sight_feature.anti_fov_change": "FOV変化耐性",
   "infinite.features.local.rendering.clear_sight_feature.anti_overlay": "オーバーレイ除去",
   "infinite.features.local.rendering.clear_sight_feature.fov_intensity": "FOV強度",
   "infinite.features.local.rendering.clear_sight_feature.fov_max_increase": "最大FOV増加",
-  "infinite.features.local.rendering.tough_sight_feature": "Tough Sight Feature",
+  "infinite.features.local.rendering.tough_sight_feature": "盲目や吐き気などのステータス効果による視覚的な妨害を無効化します。",
   "infinite.features.local.rendering.tough_sight_feature.anti_blindness": "盲目耐性",
   "infinite.features.local.rendering.tough_sight_feature.anti_darkness": "暗闇耐性",
   "infinite.features.local.rendering.tough_sight_feature.anti_nausea": "吐き気耐性",
-  "infinite.features.local.rendering.zoom_sight_feature": "Zoom Sight Feature",
+  "infinite.features.local.rendering.zoom_sight_feature": "視界をズーム（拡大）します。望遠鏡のような効果を、キー操作ひとつでスムーズに利用可能です。",
   "infinite.features.local.rendering.zoom_sight_feature.auto_release_on_move": "移動時に自動解除",
   "infinite.features.local.rendering.zoom_sight_feature.max_zoom": "最大ズーム",
   "infinite.features.local.rendering.zoom_sight_feature.sensitivity_reduction": "感度低下",
   "infinite.features.local.rendering.zoom_sight_feature.smooth_zoom": "スムーズズーム",
   "infinite.features.local.rendering.zoom_sight_feature.zoom_level": "ズームレベル",
   "infinite.features.local.rendering.zoom_sight_feature.zoom_step": "ズームステップ",
-  "key.infinite.features.local.combat.archery_feature.toggle": "Toggle Archery Feature",
-  "key.infinite.features.local.combat.counter_feature.toggle": "Toggle Counter Feature",
-  "key.infinite.features.local.combat.critical_feature.toggle": "Toggle Critical Feature",
-  "key.infinite.features.local.combat.lock_on_feature.toggle": "Toggle Lock On Feature",
-  "key.infinite.features.local.combat.mace_boost_feature.toggle": "Toggle Mace Boost Feature",
-  "key.infinite.features.local.combat.throwable_feature.toggle": "Toggle Throwable Feature",
-  "key.infinite.features.local.level.esp_feature.toggle": "Toggle ESP Feature",
-  "key.infinite.features.local.level.xray_feature.toggle": "Toggle Xray Feature",
-  "key.infinite.features.local.movement.quick_move_feature.toggle": "Toggle Quick Move Feature",
-  "key.infinite.features.local.movement.super_fly_feature.toggle": "Toggle Super Fly Feature",
-  "key.infinite.features.local.movement.water_hovering_feature.toggle": "Toggle Water Hovering Feature",
-  "key.infinite.features.local.rendering.bright_sight_feature.toggle": "Toggle Bright Sight Feature",
-  "key.infinite.features.local.rendering.clear_sight_feature.toggle": "Toggle Clear Sight Feature",
-  "key.infinite.features.local.rendering.tough_sight_feature.toggle": "Toggle Tough Sight Feature",
-  "key.infinite.features.local.rendering.zoom_sight_feature.zoom_in": "Zoom In",
-  "key.infinite.features.local.rendering.zoom_sight_feature.zoom_out": "Zoom Out",
-  "key.infinite.features.local.rendering.zoom_sight_feature.toggle": "Toggle Zoom Sight Feature",
-  "infinite.features.local.combat.quick_shot_feature": "Quick Shot Feature",
-  "infinite.features.local.level.ultra_tag_feature": "Ultra Tag Feature",
+  "key.infinite.features.local.combat.archery_feature.toggle": "アーチェリー機能を切り替え",
+  "key.infinite.features.local.combat.counter_feature.toggle": "カウンター機能を切り替え",
+  "key.infinite.features.local.combat.critical_feature.toggle": "クリティカル機能を切り替え",
+  "key.infinite.features.local.combat.lock_on_feature.toggle": "ロックオン機能を切り替え",
+  "key.infinite.features.local.combat.mace_boost_feature.toggle": "メイスブーストを切り替え",
+  "key.infinite.features.local.combat.throwable_feature.toggle": "投擲補助を切り替え",
+  "key.infinite.features.local.level.esp_feature.toggle": "ESP機能を切り替え",
+  "key.infinite.features.local.level.xray_feature.toggle": "X-Ray機能を切り替え",
+  "key.infinite.features.local.movement.quick_move_feature.toggle": "クイックムーブを切り替え",
+  "key.infinite.features.local.movement.super_fly_feature.toggle": "スーパーフライを切り替え",
+  "key.infinite.features.local.movement.water_hovering_feature.toggle": "ウォーターホバーを切り替え",
+  "key.infinite.features.local.rendering.bright_sight_feature.toggle": "ブライトサイトを切り替え",
+  "key.infinite.features.local.rendering.clear_sight_feature.toggle": "クリアサイトを切り替え",
+  "key.infinite.features.local.rendering.tough_sight_feature.toggle": "タフサイトを切り替え",
+  "key.infinite.features.local.rendering.zoom_sight_feature.zoom_in": "ズームイン",
+  "key.infinite.features.local.rendering.zoom_sight_feature.zoom_out": "ズームアウト",
+  "key.infinite.features.local.rendering.zoom_sight_feature.toggle": "ズーム機能を切り替え",
+  "infinite.features.local.combat.quick_shot_feature": "弓やクロスボウを素早く連射できるようにします。",
+  "infinite.features.local.level.ultra_tag_feature": "エンティティの上に詳細な情報を表示するタグを追加します。",
   "infinite.features.local.level.ultra_tag_feature.fade_end": "フェードアウトが終了する距離",
   "infinite.features.local.level.ultra_tag_feature.fade_start": "フェードアウトが始まる距離",
   "infinite.features.local.level.ultra_tag_feature.item_hide_angle": "アイテムを隠す角度",
@@ -161,31 +161,31 @@
   "infinite.features.local.level.ultra_tag_feature.show_items": "アイテムを表示する",
   "infinite.features.local.level.ultra_tag_feature.show_mobs": "モブを表示する",
   "infinite.features.local.level.ultra_tag_feature.show_players": "プレイヤーを表示する",
-  "key.infinite.features.local.combat.quick_shot_feature.toggle": "Toggle Quick Shot Feature",
-  "key.infinite.features.local.level.ultra_tag_feature.toggle": "Toggle Ultra Tag Feature",
+  "key.infinite.features.local.combat.quick_shot_feature.toggle": "クイックショットを切り替え",
+  "key.infinite.features.local.level.ultra_tag_feature.toggle": "ウルトラタグを切り替え",
   "infinite.features.local.combat.lock_on_feature.auto_next_target": "ターゲット自動検索",
   "infinite.features.local.combat.lock_on_feature.auto_reselect": "最適ターゲット再選択",
   "infinite.features.local.combat.lock_on_feature.pause_on_kill": "キル時に一時停止",
-  "infinite.features.local.combat.swap_shot_feature": "スワップショット",
+  "infinite.features.local.combat.swap_shot_feature": "メインハンドとオフハンドの武器を交互に使用して連射します。",
   "infinite.features.local.combat.swap_shot_feature.auto_fire": "自動連射",
   "infinite.features.local.combat.swap_shot_feature.offhand_fireworks": "オフハンド花火補充",
   "infinite.features.local.combat.swap_shot_feature.shot_interval": "射撃間隔(ticks)",
   "infinite.features.local.inventory": "インベントリ",
-  "infinite.features.local.inventory.restock_feature": "Restock",
-  "infinite.features.local.inventory.restock_feature.delay_property": "Restock Delay",
-  "infinite.features.local.inventory.restock_feature.threshold_property": "Restock Threshold",
-  "key.infinite.features.local.combat.lock_on_feature.add_target": "Add Target",
-  "key.infinite.features.local.combat.lock_on_feature.toggle_pause": "Toggle Lock-On Pause",
-  "key.infinite.features.local.combat.lock_on_feature.remove_target": "Remove Current Target",
-  "key.infinite.features.local.combat.lock_on_feature.next_target_spatial": "Next Target (Right)",
-  "key.infinite.features.local.combat.lock_on_feature.prev_target_spatial": "Prev Target (Left)",
-  "key.infinite.features.local.combat.lock_on_feature.focus_best": "Focus Best Target",
-  "key.infinite.features.local.combat.lock_on_feature.clear_all": "Clear All Targets",
-  "key.infinite.features.local.combat.swap_shot_feature.switch_mode": "Switch Swap Mode",
-  "key.infinite.features.local.combat.swap_shot_feature.toggle": "Toggle Swap Shot",
-  "key.infinite.features.local.inventory.restock_feature.toggle": "Toggle Restock",
-  "infinite.features.local.combat.lock_on_feature.aim_bias": "エイム優先度 (距離 <-> 角度)",
-  "infinite.features.global.rendering.infinite_loading_feature": "Infinite Loading Feature",
+  "infinite.features.local.inventory.restock_feature": "アイテムの自動補充を行います。",
+  "infinite.features.local.inventory.restock_feature.delay_property": "補充遅延",
+  "infinite.features.local.inventory.restock_feature.threshold_property": "補充のしきい値",
+  "key.infinite.features.local.combat.lock_on_feature.add_target": "ターゲットを追加",
+  "key.infinite.features.local.combat.lock_on_feature.toggle_pause": "一時停止を切り替え",
+  "key.infinite.features.local.combat.lock_on_feature.remove_target": "現在のターゲットを削除",
+  "key.infinite.features.local.combat.lock_on_feature.next_target_spatial": "次のターゲット (右)",
+  "key.infinite.features.local.combat.lock_on_feature.prev_target_spatial": "前のターゲット (左)",
+  "key.infinite.features.local.combat.lock_on_feature.focus_best": "最良のターゲットに集中",
+  "key.infinite.features.local.combat.lock_on_feature.clear_all": "すべてのターゲットをクリア",
+  "key.infinite.features.local.combat.swap_shot_feature.switch_mode": "スワップモード切替",
+  "key.infinite.features.local.combat.swap_shot_feature.toggle": "スワップショットを切り替え",
+  "key.infinite.features.local.inventory.restock_feature.toggle": "自動補充を切り替え",
+  "infinite.features.local.combat.lock_on_feature.aim_bias": "エイム優先度 (距離 &lt;-&gt; 角度)",
+  "infinite.features.global.rendering.infinite_loading_feature": "ゲームのロード画面をカスタムデザインに変更します。",
   "doc.infinite.properties_section_title": "設定項目",
   "doc.infinite.property_info_title": "詳細情報",
   "doc.infinite.property_type": "タイプ",
@@ -196,21 +196,21 @@
   "doc.infinite.property_list_count": "デフォルト要素数",
   "doc.infinite.property_list_type": "リスト形式",
   "infinite.features.local": "ローカル機能",
-  "infinite.features.local.inventory.auto_armor_feature": "自動装備",
+  "infinite.features.local.inventory.auto_armor_feature": "インベントリ内の最適な防具を自動的に装備します。耐久値が低下した際のエリトラ切り替え機能なども搭載しています。",
   "infinite.features.local.inventory.auto_armor_feature.auto_equip": "自動装備を有効にする",
   "infinite.features.local.inventory.auto_armor_feature.delay": "装備遅延",
   "infinite.features.local.inventory.auto_armor_feature.durability_threshold": "耐久値のしきい値",
   "infinite.features.local.inventory.auto_armor_feature.elytra_switch": "エリトラ自動切り替え",
-  "infinite.features.local.inventory.container_util_feature": "コンテナユーティリティ",
+  "infinite.features.local.inventory.container_util_feature": "コンテナ操作を便利にする各種機能（ホットバー回転など）を提供します。",
   "infinite.features.local.inventory.container_util_feature.auto_rocket": "ロケット自動補充",
   "infinite.features.local.inventory.container_util_feature.hotbar_rotate": "ホットバー回転",
   "infinite.features.local.inventory.container_util_feature.instant_stop": "インスタント停止",
-  "infinite.features.local.inventory.item_relocate_feature": "アイテム自動移動",
+  "infinite.features.local.inventory.item_relocate_feature": "インベントリ内のアイテムを自動的に整理・移動します。",
   "infinite.features.local.inventory.item_relocate_feature.delay_property": "移動遅延",
-  "infinite.features.local.rendering.stable_sight_feature": "安定視界",
+  "infinite.features.local.rendering.stable_sight_feature": "カメラの揺れを抑え、視点を安定させます。",
   "infinite.features.local.rendering.stable_sight_feature.camera_distance": "カメラ距離",
   "infinite.features.local.rendering.stable_sight_feature.ignore_terrain": "地形を無視",
-  "infinite.features.local.rendering.ultra_ui_feature": "Ultra UI",
+  "infinite.features.local.rendering.ultra_ui_feature": "スタイリッシュで高機能なカスタムHUDを表示します。",
   "infinite.features.local.rendering.ultra_ui_feature.alpha": "UIの透明度",
   "infinite.features.local.rendering.ultra_ui_feature.bar_height": "バーの高さ",
   "infinite.features.local.rendering.ultra_ui_feature.crosshair_ui": "十字線UI",
@@ -226,23 +226,23 @@
   "key.infinite.features.local.inventory.item_relocate_feature.toggle": "アイテム自動移動を切り替え",
   "key.infinite.features.local.rendering.stable_sight_feature.toggle": "安定視界を切り替え",
   "key.infinite.features.local.rendering.ultra_ui_feature.toggle": "Ultra UIを切り替え",
-  "infinite.features.local.inventory.item_restock_feature": "自動補充",
+  "infinite.features.local.inventory.item_restock_feature": "アイテムの自動補充を行います。",
   "infinite.features.local.inventory.item_restock_feature.delay_property": "補充遅延",
   "infinite.features.local.inventory.item_restock_feature.threshold_property": "補充のしきい値",
-  "key.infinite.features.local.inventory.item_restock_feature.toggle": "Toggle Restock",
-  "infinite.features.local.combat.quick_shot_feature.interval_shift": "Quick Shot Interval Shift",
-  "infinite.features.local.movement.better_sneak_feature": "Better Sneak",
-  "infinite.features.local.movement.better_sneak_feature.edge_distance": "Edge Distance",
-  "infinite.features.local.movement.better_sneak_feature.safe_walk": "Safe Walk",
-  "infinite.features.local.movement.fast_descent_feature": "Fast Descent",
-  "infinite.features.local.movement.fast_descent_feature.descent_factor": "Descent Factor",
-  "infinite.features.global.control": "Global Control",
-  "infinite.features.global.control.ime_input_feature": "IME Input Support",
-  "key.infinite.features.local.movement.better_sneak_feature.toggle": "Toggle Better Sneak",
-  "key.infinite.features.local.movement.fast_descent_feature.toggle": "Toggle Fast Descent",
-  "infinite.features.local.movement.keep_walk_feature": "簡単に歩き続けられる",
-  "key.infinite.features.local.movement.keep_walk_feature.toggle": "Toggle Keep Walk Feature",
-  "infinite.features.local.combat.instant_use_feature": "即時使用",
+  "key.infinite.features.local.inventory.item_restock_feature.toggle": "アイテム補充を切り替え",
+  "infinite.features.local.combat.quick_shot_feature.interval_shift": "クイックショット間隔調整",
+  "infinite.features.local.movement.better_sneak_feature": "スニーク時の挙動を改善し、崖からの落下防止などを強化します。",
+  "infinite.features.local.movement.better_sneak_feature.edge_distance": "エッジ距離",
+  "infinite.features.local.movement.better_sneak_feature.safe_walk": "セーフウォーク",
+  "infinite.features.local.movement.fast_descent_feature": "落下速度を速め、素早い着地を可能にします。",
+  "infinite.features.local.movement.fast_descent_feature.descent_factor": "落下係数",
+  "infinite.features.global.control": "制御（グローバル）",
+  "infinite.features.global.control.ime_input_feature": "チャット等でのIME入力を快適にします。",
+  "key.infinite.features.local.movement.better_sneak_feature.toggle": "ベタースニークを切り替え",
+  "key.infinite.features.local.movement.fast_descent_feature.toggle": "ファストディセントを切り替え",
+  "infinite.features.local.movement.keep_walk_feature": "キーを押し続けなくても、自動的に歩き続けることができます。",
+  "key.infinite.features.local.movement.keep_walk_feature.toggle": "自動歩行を切り替え",
+  "infinite.features.local.combat.instant_use_feature": "回復アイテムやブロックなどを、瞬時に使用・設置できるようにします。",
   "infinite.features.local.combat.instant_use_feature.mode": "モード",
   "infinite.features.local.combat.instant_use_feature.custom_delay": "カスタム遅延",
   "infinite.features.local.combat.instant_use_feature.fast_place_speed": "高速設置速度",
@@ -260,22 +260,22 @@
   "infinite.features.local.combat.lock_on_feature.attack_target": "自動攻撃",
   "infinite.features.local.combat.lock_on_feature.attack_strength": "攻撃強度 (クールダウン)",
   "infinite.features.local.combat.lock_on_feature.attack_randomization": "ランダムディレイ (Tick)",
-  "infinite.features.local.level.block_highlight_feature": "ブロックハイライト",
-    "infinite.features.local.level.block_highlight_feature.blocks_to_highlight": "ハイライト対象",
-    "infinite.features.local.level.block_highlight_feature.highlight_mode": "描画モード",
-    "infinite.features.local.level.block_highlight_feature.scan_range": "スキャン範囲",
-    "infinite.features.local.level.block_highlight_feature.render_range": "描画範囲",
-    "infinite.features.local.level.block_highlight_feature.render_style": "描画スタイル",
-    "infinite.features.local.level.block_highlight_feature.max_draw_count": "最大描画数",
-    "infinite.features.local.level.block_highlight_feature.line_width": "線の太さ",
-    "infinite.features.local.level.block_highlight_feature.view_focus": "視線フォーカス",
-    "infinite.features.local.level.block_highlight_feature.animation": "アニメーション",
-    "key.infinite.features.local.level.block_highlight_feature.toggle": "ブロックハイライトを切り替え",
-  "infinite.features.features.local.swap_tool_feature": "ツールスワップ",
+  "infinite.features.local.level.block_highlight_feature": "特定のブロックの周囲に枠線を表示し、強調します。",
+  "infinite.features.local.level.block_highlight_feature.blocks_to_highlight": "ハイライト対象",
+  "infinite.features.local.level.block_highlight_feature.highlight_mode": "描画モード",
+  "infinite.features.local.level.block_highlight_feature.scan_range": "スキャン範囲",
+  "infinite.features.local.level.block_highlight_feature.render_range": "描画範囲",
+  "infinite.features.local.level.block_highlight_feature.render_style": "描画スタイル",
+  "infinite.features.local.level.block_highlight_feature.max_draw_count": "最大描画数",
+  "infinite.features.local.level.block_highlight_feature.line_width": "線の太さ",
+  "infinite.features.local.level.block_highlight_feature.view_focus": "視線フォーカス",
+  "infinite.features.local.level.block_highlight_feature.animation": "アニメーション",
+  "key.infinite.features.local.level.block_highlight_feature.toggle": "ブロックハイライトを切り替え",
+  "infinite.features.features.local.swap_tool_feature": "破壊するブロックに合わせて、最適なツールに自動的に持ち替えます。",
   "infinite.features.features.local.swap_tool_feature.method": "方法",
   "infinite.features.features.local.swap_tool_feature.fine_tool_strategy": "精密ツール戦略",
   "infinite.features.features.local.swap_tool_feature.switch_delay": "切り替え遅延",
-  "infinite.features.local.level.cave_highlight_feature": "洞窟ハイライト",
+  "infinite.features.local.level.cave_highlight_feature": "洞窟や空洞を強調表示し、探索を容易にします。",
   "infinite.features.local.level.cave_highlight_feature.blocks_to_highlight": "ハイライト対象ブロック",
   "infinite.features.local.level.cave_highlight_feature.scan_range": "スキャン範囲",
   "infinite.features.local.level.cave_highlight_feature.render_range": "描画範囲",
@@ -288,20 +288,20 @@
   "infinite.features.local.level.cave_highlight_feature.check_surroundings": "周囲をチェック",
   "infinite.features.local.level.cave_highlight_feature.sky_light_threshold": "空の明るさしきい値",
   "infinite.features.local.level.cave_highlight_feature.player_exclusion_radius": "プレイヤー除外半径",
-  "infinite.features.local.level.fast_break_feature": "高速破壊",
+  "infinite.features.local.level.fast_break_feature": "ブロックを通常よりも速く破壊できるようにします（サバイバルモード用）。",
   "infinite.features.local.level.fast_break_feature.safe_mode": "セーフモード",
   "infinite.features.local.level.fast_break_feature.interval": "間隔",
   "infinite.features.local.level.fast_break_feature.threshold_percentage": "しきい値パーセンテージ",
   "infinite.features.local.level.fast_break_feature.threshold_tick": "しきい値ティック",
-  "infinite.features.local.level.linear_break_feature": "リニア破壊",
+  "infinite.features.local.level.linear_break_feature": "直線上にあるブロックを一括で破壊します。",
   "infinite.features.local.level.linear_break_feature.break_range": "破壊範囲",
-  "infinite.features.local.level.vein_break_feature": "鉱脈破壊",
+  "infinite.features.local.level.vein_break_feature": "つながっている同じ種類の鉱石を一括で破壊します（連鎖破壊）。",
   "infinite.features.local.level.vein_break_feature.block_list": "対象ブロックリスト",
   "infinite.features.local.level.vein_break_feature.break_range": "破壊範囲",
   "infinite.features.local.level.vein_break_feature.max_blocks": "最大ブロック数",
-  "key.infinite.features.features.local.swap_tool_feature.toggle": "ツールスワップ切り替え",
-  "key.infinite.features.local.level.cave_highlight_feature.toggle": "洞窟ハイライト切り替え",
-  "key.infinite.features.local.level.fast_break_feature.toggle": "高速破壊切り替え",
-  "key.infinite.features.local.level.linear_break_feature.toggle": "リニア破壊切り替え",
-  "key.infinite.features.local.level.vein_break_feature.toggle": "鉱脈破壊切り替え"
-}
\ No newline at end of file
+  "key.infinite.features.features.local.swap_tool_feature.toggle": "ツールスワップを切り替え",
+  "key.infinite.features.local.level.cave_highlight_feature.toggle": "洞窟ハイライトを切り替え",
+  "key.infinite.features.local.level.fast_break_feature.toggle": "高速破壊を切り替え",
+  "key.infinite.features.local.level.linear_break_feature.toggle": "リニア破壊を切り替え",
+  "key.infinite.features.local.level.vein_break_feature.toggle": "鉱脈破壊を切り替え"
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8906bc57..4dfe547d 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -4,10 +4,7 @@
   "version": "${version}",
   "name": "Infinite Client",
   "description": "An Utility mod made for Anarchy Servers",
-  "authors": [
-    "The Infinitys",
-    "noobyetpro"
-  ],
+  "authors": ["The Infinitys", "noobyetpro"],
   "contact": {
     "homepage": "https://fabricmc.net/",
     "sources": "https://github.com/FabricMC/fabric-example-mod"
@@ -36,9 +33,9 @@
     }
   ],
   "depends": {
-    "fabricloader": ">=0.18.2",
-    "minecraft": "~1.21.11",
-    "java": ">=21",
+    "fabricloader": ">=0.19.1",
+    "minecraft": "~26.1",
+    "java": ">=25",
     "fabric-api": "*",
     "fabric-language-kotlin": "*"
   },
@@ -46,4 +43,4 @@
   "suggests": {
     "another-mod": "*"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/infinite.accesswidener b/src/main/resources/infinite.accesswidener
index b5e9878d..ab4c4052 100644
--- a/src/main/resources/infinite.accesswidener
+++ b/src/main/resources/infinite.accesswidener
@@ -1,6 +1,5 @@
-accessWidener v2 named
+accessWidener v2 official
 accessible field net/minecraft/server/MinecraftServer storageSource Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;
-accessible method net/minecraft/client/gui/render/state/GuiRenderState findAppropriateNode (Lnet/minecraft/client/gui/render/state/ScreenArea;)Z
 accessible class net/minecraft/client/gui/components/ScrollableLayout
 accessible class net/minecraft/client/gui/components/ScrollableLayout$Container
 accessible class net/minecraft/client/gui/font/FontManager$CachedFontProvider
@@ -40,24 +39,27 @@ accessible field net/minecraft/world/level/block/entity/BrewingStandBlockEntity
 accessible field net/minecraft/world/level/block/entity/HopperBlockEntity cooldownTime I
 accessible field net/minecraft/world/level/block/state/BlockBehaviour$BlockStateBase mapColor Lnet/minecraft/world/level/material/MapColor;
 accessible method net/minecraft/client/gui/components/AbstractScrollArea isOverScrollbar (DD)Z
-accessible method net/minecraft/client/gui/components/AbstractScrollArea renderScrollbar (Lnet/minecraft/client/gui/GuiGraphics;II)V
 accessible method net/minecraft/client/gui/components/AbstractScrollArea scrollBarX ()I
 accessible method net/minecraft/client/gui/components/AbstractScrollArea scrollBarY ()I
-accessible method net/minecraft/client/gui/components/AbstractScrollArea scrollbarVisible ()Z
 accessible method net/minecraft/client/gui/components/AbstractScrollArea scrollerHeight ()I
 accessible method net/minecraft/client/gui/components/ChatComponent refreshTrimmedMessages ()V
 accessible method net/minecraft/client/gui/components/EditBox applyFormat (Ljava/lang/String;I)Lnet/minecraft/util/FormattedCharSequence;
 accessible method net/minecraft/client/gui/components/EditBox isEditable ()Z
 accessible method net/minecraft/client/gui/font/FontManager getFontSetRaw (Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/gui/font/FontSet;
-accessible method net/minecraft/client/gui/render/state/GuiItemRenderState calculateBounds (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/navigation/ScreenRectangle;
-accessible method net/minecraft/client/gui/render/state/GuiItemRenderState calculateOversizedItemBounds ()Lnet/minecraft/client/gui/navigation/ScreenRectangle;
 accessible method net/minecraft/client/multiplayer/MultiPlayerGameMode performUseItemOn (Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult;
 accessible method net/minecraft/world/entity/Mob <init> (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V
-extendable class net/minecraft/client/gui/render/state/GuiItemRenderState
-extendable class net/minecraft/client/gui/render/state/GuiTextRenderState
 extendable method net/minecraft/client/gui/Font getGlyph (ILnet/minecraft/network/chat/Style;)Lnet/minecraft/client/gui/font/glyphs/BakedGlyph;
 extendable method net/minecraft/client/gui/Font getGlyphSource (Lnet/minecraft/network/chat/FontDescription;)Lnet/minecraft/client/gui/GlyphSource;
-extendable method net/minecraft/client/gui/render/state/GuiItemRenderState calculateBounds (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/navigation/ScreenRectangle;
 mutable field net/minecraft/client/gui/Font splitter Lnet/minecraft/client/StringSplitter;
 mutable field net/minecraft/client/gui/components/ChatComponent allMessages Ljava/util/List;
-accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F
+accessible field net/minecraft/client/gui/GuiGraphicsExtractor scissorStack Lnet/minecraft/client/gui/GuiGraphicsExtractor$ScissorStack;
+accessible field net/minecraft/client/gui/GuiGraphicsExtractor guiRenderState Lnet/minecraft/client/renderer/state/gui/GuiRenderState;
+accessible class net/minecraft/client/gui/GuiGraphicsExtractor$ScissorStack
+accessible field net/minecraft/client/Minecraft blockModelResolver Lnet/minecraft/client/renderer/block/BlockModelResolver;
+accessible field net/minecraft/client/renderer/block/BlockModelResolver modelManager Lnet/minecraft/client/resources/model/ModelManager;
+accessible field net/minecraft/client/resources/model/ModelManager blockModelSet Lnet/minecraft/client/renderer/block/BlockModelSet;
+accessible method net/minecraft/client/renderer/rendertype/RenderType create (Ljava/lang/String;Lnet/minecraft/client/renderer/rendertype/RenderSetup;)Lnet/minecraft/client/renderer/rendertype/RenderType;
+accessible field net/minecraft/client/renderer/RenderPipelines GLOBALS_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
+accessible field net/minecraft/client/renderer/RenderPipelines FOG_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
+accessible method net/minecraft/client/renderer/RenderPipelines register (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lcom/mojang/blaze3d/pipeline/RenderPipeline;
+accessible field net/minecraft/client/renderer/RenderPipelines DEBUG_FILLED_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;