From 918bd6380d89fed62356483a7701b5a760f28318 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Fri, 12 Sep 2025 22:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BD=8E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/configuration/blocks/sofa.yml     | 24 +++++-----
 .../configuration/fix_client_visual.yml       | 46 +++++++++++++------
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
index d13094095..5a94e2c20 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml
@@ -90,59 +90,59 @@ items:
               type: sofa_shape
           appearances:
             facing=east,shape=straight:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa
                 yaw: 90
             facing=north,shape=straight:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa
             facing=south,shape=straight:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa
                 yaw: 180
             facing=west,shape=straight:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa
                 yaw: 270
             facing=east,shape=inner_left:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
             facing=north,shape=inner_left:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 270
             facing=south,shape=inner_left:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 90
             facing=west,shape=inner_left:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 180
             facing=east,shape=inner_right:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 90
             facing=north,shape=inner_right:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
             facing=south,shape=inner_right:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 180
             facing=west,shape=inner_right:
-              state: barrier[waterlogged=false]
+              state: barrier
               entity-renderer:
                 item: default:sofa_inner
                 yaw: 270
diff --git a/common-files/src/main/resources/resources/internal/configuration/fix_client_visual.yml b/common-files/src/main/resources/resources/internal/configuration/fix_client_visual.yml
index 440e9964b..17def2bac 100644
--- a/common-files/src/main/resources/resources/internal/configuration/fix_client_visual.yml
+++ b/common-files/src/main/resources/resources/internal/configuration/fix_client_visual.yml
@@ -3,22 +3,40 @@
 items:
   minecraft:string:
     client-bound-data:
-      components:
-        minecraft:block_state:
-          attached: 'false'
-          disarmed: 'false'
-          east: 'true'
-          north: 'true'
-          powered: 'true'
-          south: 'true'
-          west: 'true'
+      $$>=1.20.5:
+        components:
+          minecraft:block_state:
+            attached: 'false'
+            disarmed: 'false'
+            east: 'true'
+            north: 'true'
+            powered: 'true'
+            south: 'true'
+            west: 'true'
+      $$fallback:
+        nbt:
+          BlockStateTag:
+            attached: 'false'
+            disarmed: 'false'
+            east: 'true'
+            north: 'true'
+            powered: 'true'
+            south: 'true'
+            west: 'true'
   minecraft:note_block:
     client-bound-data:
-      components:
-        minecraft:block_state:
-          instrument: harp
-          powered: 'false'
-          note: '0'
+      $$>=1.20.5:
+        components:
+          minecraft:block_state:
+            instrument: harp
+            powered: 'false'
+            note: '0'
+      $$fallback:
+        nbt:
+          BlockStateTag:
+            instrument: harp
+            powered: 'false'
+            note: '0'
 # For the client to determine if a beacon can activate, it needs the beacon_base_blocks tag to render the beam.
 # This allows custom blocks (like note blocks) to work as beacon bases.
 # However, whether the beacon actually grants potion effects depends on the block's real tag (server-side check).