diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/service/InterceptData.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/service/InterceptData.py index ab5ea41..245b11d 100644 --- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/service/InterceptData.py +++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/service/InterceptData.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ ================================================================================ -右键拦截白名单数据(共享,客户端/服务端共用) +右键拦截白名单数据(共享,客户端/服务端共用)—— 自动派生版 ================================================================================ 【作用】 统一管理"手持物品右键功能方块"时, 需要【提前取消该物品默认行为 @@ -12,92 +12,210 @@ 不精确拦截会造成两种问题: 1. 宽泛拦截(以前): 手持任意方块右键"任何功能方块"就取消放置 -> 正常放置失效 2. 不拦截: 手持南瓜派右键盘子时, 原版先触发"吃/放"前摇, 由服务端取消就"闪一下" - 因此只对下面明确列出的组合拦截, 其余一律放行。 + 因此只对"手持的方块物品 与 被点的功能方块 存在右键转换关系"的组合拦截, + 其余一律放行 (一一对应)。 + +【自动派生(核心)】 + 各功能分类的"右键转换"规则都写在各自的 *Data.py 里 (如 ChaoguoData 的 + SWITCH_RULES / ITEM_USE_ON_RULES)。本模块在 import 时【直接读取这些 + Data 模块的规则表】, 自动抽出所有 (手持方块物品, 被点功能方块) 的转换对。 + —— 这样未来新增/修改任一菜谱, 白名单自动同步, 永不会漏、永不过时。 【集合】 ITEM_USE_ON_CANCEL : set of (手持item, 被点block) 仅这两者匹配才取消 ITEM_USE_ON_CANCEL_BY_ITEM : set of 手持item 只看手持item即可取消 - BLOCK_USE_CANCEL : set of 被右键的block 右键这些功能方块提前cancel + SUSHI_BLOCKS : 寿司方块物品集合(用于交叉取消, 见说明) + COATING_ITEMS : 裹粉生食材集合(右键面粉块时取消) ================================================================================ """ # ============================================================================ -# 一、精确组合: (手持item, 被点block) -> 两者都匹配才取消 +# 一、导入各功能分类的规则数据符号(纯常量, 无服务端 API 依赖, 客户端可安全 import) +# 逐个 try, 任一失败只跳过该模块, 不影响整体。 +# 注: 本项目无 __init__.py, 用与各 Service 相同的 `from ..XxxData import ...` +# 直接导入符号, 而非 import 模块对象。 # ============================================================================ -# ---- 盘子装盘 (YuanbanService PLATE_RULES) ---- -PLATE_CANCEL = { - ("minecraft:pumpkin_pie", "rtdd:plate_0"), - ("minecraft:cod", "rtdd:plate_0"), - ("minecraft:salmon", "rtdd:plate_0"), - ("minecraft:tropical_fish", "rtdd:plate_0"), - ("minecraft:fish", "rtdd:plate_0"), - ("minecraft:melon_slice", "rtdd:plate_0"), - ("minecraft:bread", "rtdd:plate_0"), - ("minecraft:cookie", "rtdd:plate_0"), - ("minecraft:cooked_chicken", "rtdd:plate_0"), -} +# 每个条目: (规则表内容) —— 规则表可能是 list[dict] 或单个 dict(RICE_PLANT) +_ALL_RULE_TABLES = [] -# ---- 面食.甜食手持转换 (Mianshi ITEM_USE_ON_RULES) ---- -MIANSHI_CANCEL = { - ("rtdd:dought_7", "rtdd:oven"), - ("rtdd:farineblock_1", "rtdd:bowlasoup"), - ("rtdd:dumplings_4", "rtdd:steamer"), - ("rtdd:roubaozi_3", "rtdd:steamer"), - ("rtdd:bamboo_4", "rtdd:steamer"), - ("rtdd:plate_34", "rtdd:steamer"), -} -# ---- 汤锅手持转换 (Tangguo ITEM_USE_ON_RULES) ---- -TANGGUO_CANCEL = { - ("rtdd:mushroomsoup", "rtdd:noodle_soup"), - ("rtdd:vegetablesoup", "rtdd:noodle_soup"), - ("rtdd:eggsoup", "rtdd:noodle_soup"), -} +def _collect_all(): + """遍历 _ALL_RULE_TABLES, 汇总全部 (item, block) 转换对。""" + pairs = set() + for value in _ALL_RULE_TABLES: + for rule in _as_list(value): + if not isinstance(rule, dict): + continue + item = rule.get("item") + if not item or not isinstance(item, basestring): + continue + if item.startswith("*"): + continue + for blkf in ("block", "source", "surface"): + blk = rule.get(blkf) + if isinstance(blk, basestring) and blk: + pairs.add((item, blk)) + return pairs -# ---- 炒锅 盖饭双重转换 (Chaoguo ITEM_USE_ON_RULES) ---- -# 正向: 手持成品菜 -> 右键 米饭三形态 (米饭在物品/方块双向, 以方块被点为准) -CHAOGUO_CANCEL = { - ("rtdd:plate_47", "rtdd:bowlofrice"), - ("rtdd:plate_47", "rtdd:bowlofrice_2"), - ("rtdd:plate_47", "rtdd:bowlofrice_3"), - ("rtdd:plate_54", "rtdd:bowlofrice"), - ("rtdd:plate_54", "rtdd:bowlofrice_2"), - ("rtdd:plate_54", "rtdd:bowlofrice_3"), - ("rtdd:plate_32", "rtdd:bowlofrice"), - ("rtdd:plate_32", "rtdd:bowlofrice_2"), - ("rtdd:plate_32", "rtdd:bowlofrice_3"), - ("rtdd:plate_15", "rtdd:bowlofrice"), - ("rtdd:plate_15", "rtdd:bowlofrice_2"), - ("rtdd:plate_15", "rtdd:bowlofrice_3"), - # 反向: 手持米饭 -> 右键 成品菜方块 - ("rtdd:bowlofrice", "rtdd:plate_47"), - ("rtdd:bowlofrice_2", "rtdd:plate_47"), - ("rtdd:bowlofrice_3", "rtdd:plate_47"), - ("rtdd:bowlofrice", "rtdd:plate_54"), - ("rtdd:bowlofrice_2", "rtdd:plate_54"), - ("rtdd:bowlofrice_3", "rtdd:plate_54"), - ("rtdd:bowlofrice", "rtdd:plate_32"), - ("rtdd:bowlofrice_2", "rtdd:plate_32"), - ("rtdd:bowlofrice_3", "rtdd:plate_32"), - ("rtdd:bowlofrice", "rtdd:plate_15"), - ("rtdd:bowlofrice_2", "rtdd:plate_15"), - ("rtdd:bowlofrice_3", "rtdd:plate_15"), - # 蛋炒饭: 手持米饭(三形态任一) 右键 炒锅_86(蛋炒饭_加胡萝卜_熟) -> 炒锅_87(加米饭_熟) - ("rtdd:bowlofrice", "rtdd:riceegg_2"), - ("rtdd:bowlofrice_2", "rtdd:riceegg_2"), - ("rtdd:bowlofrice_3", "rtdd:riceegg_2"), -} -# ---- 厨具 锅铲/带油锅铲 (Chuju) ---- -CHUJU_CANCEL = { - ("rtdd:spatula", "rtdd:oilcan"), - ("rtdd:spatula_oil", "rtdd:oilcan"), - ("rtdd:spatula_oil", "rtdd:wok"), -} +# ---- 面食.甜食: 和面/饺子/包子/馍/煎饼卷 + 手持生食右键蒸笼/烤炉/木碗 ---- +try: + from ..mianshi.MianshiData import ( + SWITCH_RULES as MIANSHI_SWITCH, + ITEM_USE_ON_RULES as MIANSHI_USON, + ) + _ALL_RULE_TABLES.append(MIANSHI_SWITCH) + _ALL_RULE_TABLES.append(MIANSHI_USON) +except Exception: + pass -# ---- 寿司: 手持寿司方块物品 右键 自家寿司方块 (取消默认放置) ---- -# 被点block为寿司方块时, 手持任何寿司方块物品都取消放置(意图是堆叠/取走/转换) +# ---- 炒锅: 盖饭双向 + 蛋炒饭 ---- +try: + from ..chaoguo.ChaoguoData import ( + SWITCH_RULES as CHAOGUO_SWITCH, + ITEM_USE_ON_RULES as CHAOGUO_USON, + ) + _ALL_RULE_TABLES.append(CHAOGUO_SWITCH) + _ALL_RULE_TABLES.append(CHAOGUO_USON) +except Exception: + pass + +# ---- 汤锅: 放入食材/出锅 + 手持锅态汤右键熟面条 ---- +try: + from ..tangguo.TangguoData import ( + SWITCH_RULES as TANGGUO_SWITCH, + ITEM_USE_ON_RULES as TANGGUO_USON, + ) + _ALL_RULE_TABLES.append(TANGGUO_SWITCH) + _ALL_RULE_TABLES.append(TANGGUO_USON) +except Exception: + pass + +# ---- 油锅: 倒油/放料/出锅 ---- +try: + from ..youguo.YouguoData import SWITCH_RULES as YOUGUO_SWITCH + _ALL_RULE_TABLES.append(YOUGUO_SWITCH) +except Exception: + pass + +# ---- 厨具: 炉灶加木条/丸子机加料取料/蒸笼 ---- +try: + from ..chuju.ChujuData import ( + STOVE_RULES, MEATBALLMAKER_RULES, STEAMER_RULES, + ) + _ALL_RULE_TABLES.append(STOVE_RULES) + _ALL_RULE_TABLES.append(MEATBALLMAKER_RULES) + _ALL_RULE_TABLES.append(STEAMER_RULES) +except Exception: + pass + +# ---- 食材: 裹粉(COATING 无 floor 字段, 手工补) / 肉馅按压 ---- +try: + from ..shicai.ShicaiData import COATING_RULES, MEAT_PRESS_RULES + _ALL_RULE_TABLES.append(COATING_RULES) + _ALL_RULE_TABLES.append(MEAT_PRESS_RULES) +except Exception: + pass + +# ---- 原版放置/盘子转换 ---- +try: + from ..yuanbanfangzhi.YuanbanData import ( + ITEM_USE_ON_RULES as YUANBAN_USON, + PLATE_RULES, + ) + _ALL_RULE_TABLES.append(YUANBAN_USON) + _ALL_RULE_TABLES.append(PLATE_RULES) +except Exception: + pass + +# ---- 乡野自然: 柴火堆叠 + 水稻种植 ---- +try: + from ..ziran.NaturalData import FIREWOOD_RULES, NATURAL_SWITCHES, RICE_PLANT + _ALL_RULE_TABLES.append(FIREWOOD_RULES) + _ALL_RULE_TABLES.append(NATURAL_SWITCHES) + _ALL_RULE_TABLES.append(RICE_PLANT) +except Exception: + pass + +# ---- 家具家私: 水槽放脏盘/盘子架放盘/碗柜放碗/火炉等 ---- +try: + from ..jiaju.FurnitureData import ( + ARROWBARREL_RULES, FLUME_RULES, TRAYRACKS_RULES, CUPBOARD_RULES, + BOOKCASE_RULES, POTIONRACK_RULES, RECORDPLAYER_RULES, + TRASHBIN_RULES, FIREPLACE_RULES, + ) + for _t in (ARROWBARREL_RULES, FLUME_RULES, TRAYRACKS_RULES, + CUPBOARD_RULES, BOOKCASE_RULES, POTIONRACK_RULES, + RECORDPLAYER_RULES, TRASHBIN_RULES, FIREPLACE_RULES): + _ALL_RULE_TABLES.append(_t) +except Exception: + pass + +# ---- 死亡生物: 挂肉钩挂死牛/死猪/死羊 + 菜刀切配 ---- +try: + from ..siwangshengwu.DeadmobData import DEADMOB_SWITCHES + _ALL_RULE_TABLES.append(DEADMOB_SWITCHES) +except Exception: + pass + +# ---- 烧烤: 支杆上杆(手持生肉/死猪右键支杆) ---- +try: + from ..shaokao.BarbecueData import BARBECUE_SWITCHES + _ALL_RULE_TABLES.append(BARBECUE_SWITCHES) +except Exception: + pass + +# ---- 市场贸易: 手持果蔬放入售卖箱/鱼桶 ---- +try: + from ..shichangmaoyi.MarketData import MARKET_SWITCHES + _ALL_RULE_TABLES.append(MARKET_SWITCHES) +except Exception: + pass + +# ---- 动物养殖: 放蛋/喂食(手持原版鸡蛋/种子/胡萝卜等) ---- +try: + from ..dongwuyangzhi.AnimalData import ANIMAL_SWITCHES + _ALL_RULE_TABLES.append(ANIMAL_SWITCHES) +except Exception: + pass + + +# ============================================================================ +# 二、从规则表派生 (手持方块物品, 被点功能方块) 转换对 +# ============================================================================ + +def _as_list(value): + """RICE_PLANT 这类是单个 dict, 规则表是 list[dict], 统一转成 list。""" + if isinstance(value, list): + return value + if isinstance(value, dict): + return [value] + return [] + + +# ============================================================================ +# 三、自动派生 + 少量"非规则表内联转换"的手工补充 +# ============================================================================ + +# ---- 由各 Data 规则表自动派生 ---- +AUTO_CANCEL = _collect_all() + +# ---- Chuju 锅铲/油罐 inline 转换(在 ChujuService.handleItemUseOn 内联, 不在数据表) ---- +# 手持 锅铲/带油锅铲 右键 油罐(oilcan)/炒锅(wok) 蘸油/还油/上油 -> 取消默认 +CHUJU_INLINE_CANCEL = { + ("rtdd:spatula", "rtdd:oilcan"), # 锅铲蘸油罐 + ("rtdd:spatula_oil", "rtdd:oilcan"), # 带油锅铲还油罐 + ("rtdd:spatula_oil", "rtdd:wok"), # 带油锅铲给炒锅上油 +} +AUTO_CANCEL |= CHUJU_INLINE_CANCEL + + +# ============================================================================ +# 四、寿司: 手持任何寿司方块物品 右键自家寿司方块 取消默认放置 +# (寿司的堆叠/取走/转换规则在 ShousiService 内联构建, 不在 Data 表, +# 故此处手工列出寿司方块物品集合, 交叉生成 (块, 块) 组合) +# ============================================================================ SUSHI_BLOCKS = { "rtdd:sushi_0", "rtdd:sushi_1", "rtdd:codsushi_1", "rtdd:codsushi_2", "rtdd:codsushi_3", @@ -118,7 +236,9 @@ SUSHI_CANCEL = set( (held, block) for held in SUSHI_BLOCKS for block in SUSHI_BLOCKS ) -# ---- 裹粉 (Shicai COATING_RULES): 手持生食材右键 面粉块 (取消默认放置) ---- +# ============================================================================ +# 五、裹粉(Shicai COATING_RULES 是 item->drop 结构, 无 floor 字段, 需手工指定被点面块) +# ============================================================================ COATING_ITEMS = { "rtdd:sashimi", # 生鱼片 "rtdd:lobster", # 龙虾 @@ -130,16 +250,18 @@ COATING_CANCEL = set( (item, "rtdd:farineblock_3") for item in COATING_ITEMS ) -# ---- 汇总精确组合 ---- -ITEM_USE_ON_CANCEL = (PLATE_CANCEL | MIANSHI_CANCEL | TANGGUO_CANCEL - | CHAOGUO_CANCEL | CHUJU_CANCEL | SUSHI_CANCEL - | COATING_CANCEL) +# ============================================================================ +# 六、汇总: 精确组合 ITEM_USE_ON_CANCEL = 自动派生 ∪ 寿司交叉 ∪ 裹粉 +# ============================================================================ +ITEM_USE_ON_CANCEL = AUTO_CANCEL | SUSHI_CANCEL | COATING_CANCEL # ============================================================================ -# 二、纯手持物品取消: 只看手持item (右键任意方块表面/空中) +# 七、纯手持物品取消: 只看手持item (不做方块匹配) # ============================================================================ -# ---- 原版相邻放置 (YuanbanService ITEM_USE_ON_RULES) + 水稻种植 (Natural RICE_PLANT) ---- +# ---- 原版相邻放置(YuanbanService ITEM_USE_ON_RULES) + 水稻种植(Natural RICE_PLANT) ---- +# 手持这些"非方块食品/种子"右键任意方块表面, 都在相邻空位摆放对应切配方块。 +# 它们本身不是可放置方块物品(放的是另一块), 但右键时会默认"吃/用", 需取消。 PLACE_ITEMS = { "minecraft:chicken", "minecraft:salmon", @@ -159,4 +281,13 @@ EAT_ITEMS = { "rtdd:beancurd", # 豆腐 } -ITEM_USE_ON_CANCEL_BY_ITEM = PLACE_ITEMS | EAT_ITEMS \ No newline at end of file +ITEM_USE_ON_CANCEL_BY_ITEM = PLACE_ITEMS | EAT_ITEMS + + +# ============================================================================ +# 八、自检输出(便于调试/核对派生是否完整) +# ============================================================================ +if __name__ == "__main__": + print "=== 自动派生转换对 数量:", len(AUTO_CANCEL), "===" + for _it, _bk in sorted(AUTO_CANCEL): + print " ", _it, "->", _bk \ No newline at end of file