This commit is contained in:
wenhe committed 2026-09-23 14:27:13 +08:00
1 parent 9eb9edbb8a
commit b768ff1555
10 files changed
+618 -15

No files matched your search

@@ -108,6 +108,12 @@ class ChaoguoService(BlueFoxServerSystem):
"""手持物品右键方块表面路由: 盖饭成品菜 + 米饭三形态(盖饭/蛋炒饭)"""
return {r["item"]: True for r in ITEM_USE_ON_RULES}
def ownsItemUseOn(self, itemName, clickedName):
"""声明该(手持物品,被点方块)组合由本服务 itemUseOn 规则处理(盖饭/蛋炒饭)。
被点方块(米饭/成品菜)虽也被"总食用"登记为右键方块(吃), 但盖饭转换应仍走
itemUseOn, 故 dispatcher 据此对盖饭组合放行(不因被点方块归属别的服务而跳过)。"""
return (itemName, clickedName) in self.itemUseOnRecipes
def handleBlockUse(self, args):
"""由 FeatureDispatcher 转发的右键方块入口"""
blockName = args.get("blockName")
@@ -204,6 +210,33 @@ class ChaoguoService(BlueFoxServerSystem):
# 二、通用转换执行
# ============================================================================
def handleTakeoutRequest(self, playerId, blockName, itemName, dim, pos):
"""客户端显式触发的出锅请求(消闪方案, 同汤锅).
客户端已把 (盘子, 炒锅成品) 的放置预览拦掉(见 ClientFeatureDispatcher),
本方法在服务端补齐出锅逻辑: 校验落点仍是该成品 + 精确定位 take_out 规则
-> 复用 handleSwitch(含 needBelow/needFlag 门控), 交给它执行出锅"""
# 守卫1: 防空手
if not itemName or itemName in ("minecraft:air",):
return
try:
b = comp.CreateBlockInfo(LevelId).GetBlockNew(pos, dim)
cur = b.get("name") if b else None
except Exception:
cur = None
# 守卫2: 落点已不是该成品 -> 跳过, 防双份
if cur != blockName:
print "[TakeoutRequest-SKIP-ALREADY]", "want:", blockName, "cur:", cur, "pos:", pos
return
recipe = self.recipes.get((blockName, itemName))
if not recipe or recipe.get("action") != "take_out":
return
# 守卫3: 冷却, 防连点双发
if not self.checkCooldown((dim, pos[0], pos[1], pos[2]), 0.4):
return
itemDict = self.getCarriedItem(playerId)
self.handleSwitch(recipe, playerId, pos, dim, itemDict)
print "[TakeoutRequest-DONE]", "player:", playerId, "item:", itemName, "block:", blockName
def handleSwitch(self, recipe, playerId, pos, dim, itemDict):
# 需要下方方块(翻炒: 炒锅下须是点燃的炉灶): 不满足则提示并拦截
needBelow = recipe.get("needBelow")