From 97520502b7c19055b6c90bc3d1ecd1e33dff9fbc Mon Sep 17 00:00:00 2001
From: wenhe <1046926120@qq.com>
Date: Wed, 30 Sep 2026 15:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=BB=E7=92=83=E7=93=B6,=E6=B2=B9=E7=BD=90,?=
 =?UTF-8?q?=E7=8E=BB=E7=92=83=E7=BD=90,=E7=A2=B0=E6=92=9E=E7=AE=B1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E6=B0=B4=E6=A7=BD=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=A3=B0=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jiaju/service/FurnitureService.py         | 12 ++++++++++
 .../netease_blocks/fruitjuice_0.json          | 20 ++++++++--------
 .../netease_blocks/medicinetank.json          | 23 ++++++++-----------
 .../netease_blocks/oilcan.json                | 23 ++++++++-----------
 4 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/jiaju/service/FurnitureService.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/jiaju/service/FurnitureService.py
index 11c4933..5738497 100644
--- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/jiaju/service/FurnitureService.py
+++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/jiaju/service/FurnitureService.py
@@ -504,6 +504,18 @@ class FurnitureService(BlueFoxServerSystem):
         elif _tgt == "rtdd:storage_buckets" and _src in ("rtdd:rubbish_bin_2", "rtdd:b_160"):
             PlaySoundToAllClient((pos[0], pos[1], pos[2], dim), "block.barrel.close", 1.0)
 
+        # ---- 水槽注水/取水声音(任务五) ----
+        # 空手右键空槽加水 -> 倒水声
+        elif _src == "rtdd:flume_0" and _tgt == "rtdd:flume_1":
+            PlaySoundToAllClient((pos[0], pos[1], pos[2], dim), "bucket.empty_water", 1.0)
+        # 手持空水桶右键满水取水 -> 装水声(必须放在"倒水"判定之前)
+        elif _src == "rtdd:flume_1" and _tgt == "rtdd:flume_0" \
+                and recipe.get("item") == "minecraft:bucket":
+            PlaySoundToAllClient((pos[0], pos[1], pos[2], dim), "bucket.fill_water", 1.0)
+        # 空手右键满水直接倒掉 -> 倒水声
+        elif _src == "rtdd:flume_1" and _tgt == "rtdd:flume_0":
+            PlaySoundToAllClient((pos[0], pos[1], pos[2], dim), "bucket.empty_water", 1.0)
+
         # ---- 替换后把堆栈写回新方块（此时写才不会被清掉） ----
         if bookStack is not None:
             if bookStack:
diff --git a/behavior_pack_v8jz0zSR/netease_blocks/fruitjuice_0.json b/behavior_pack_v8jz0zSR/netease_blocks/fruitjuice_0.json
index d5a37fa..c5d4ad5 100644
--- a/behavior_pack_v8jz0zSR/netease_blocks/fruitjuice_0.json
+++ b/behavior_pack_v8jz0zSR/netease_blocks/fruitjuice_0.json
@@ -10,26 +10,26 @@
       "netease:aabb": {
         "collision": {
           "min": [
+            0.375,
             0,
-            0,
-            0.4
+            0.375
           ],
           "max": [
-            1,
-            0.4,
-            0.7
+            0.6875,
+            0.375,
+            0.6875
           ]
         },
         "clip": {
           "min": [
+            0.375,
             0,
-            0,
-            0.4
+            0.375
           ],
           "max": [
-            1,
-            0.4,
-            0.7
+            0.6875,
+            0.375,
+            0.6875
           ]
         }
       },
diff --git a/behavior_pack_v8jz0zSR/netease_blocks/medicinetank.json b/behavior_pack_v8jz0zSR/netease_blocks/medicinetank.json
index 0d2365a..f0d96cf 100644
--- a/behavior_pack_v8jz0zSR/netease_blocks/medicinetank.json
+++ b/behavior_pack_v8jz0zSR/netease_blocks/medicinetank.json
@@ -10,26 +10,26 @@
       "netease:aabb": {
         "collision": {
           "min": [
+            0.1875,
             0,
-            0,
-            0.2
+            0.1875
           ],
           "max": [
-            1,
-            0.85,
-            0.8
+            0.8125,
+            0.84375,
+            0.8125
           ]
         },
         "clip": {
           "min": [
+            0.1875,
             0,
-            0,
-            0.2
+            0.1875
           ],
           "max": [
-            1,
-            0.85,
-            0.8
+            0.8125,
+            0.84375,
+            0.8125
           ]
         }
       },
@@ -42,9 +42,6 @@
       "netease:solid": {
         "value": false
       },
-      "netease:face_directional": {
-        "type": "direction"
-      },
       "netease:block_entity": {
         "client_tick": false,
         "movable": false,
diff --git a/behavior_pack_v8jz0zSR/netease_blocks/oilcan.json b/behavior_pack_v8jz0zSR/netease_blocks/oilcan.json
index 27f7543..f21142c 100644
--- a/behavior_pack_v8jz0zSR/netease_blocks/oilcan.json
+++ b/behavior_pack_v8jz0zSR/netease_blocks/oilcan.json
@@ -10,26 +10,26 @@
       "netease:aabb": {
         "collision": {
           "min": [
+            0.1875,
             0,
-            0,
-            0.2
+            0.1875
           ],
           "max": [
-            1,
-            0.85,
-            0.8
+            0.8125,
+            0.84375,
+            0.8125
           ]
         },
         "clip": {
           "min": [
+            0.1875,
             0,
-            0,
-            0.2
+            0.1875
           ],
           "max": [
-            1,
-            0.85,
-            0.8
+            0.8125,
+            0.84375,
+            0.8125
           ]
         }
       },
@@ -42,9 +42,6 @@
       "netease:solid": {
         "value": false
       },
-      "netease:face_directional": {
-        "type": "direction"
-      },
       "netease:block_entity": {
         "client_tick": false,
         "movable": false,