稻谷bug修复 提示删除

This commit is contained in:
wenhe committed 2026-09-29 16:25:50 +08:00
1 parent 344fad19ac
commit bd2ebfb154
43 files changed
+700 -846

No files matched your search

@@ -73,7 +73,7 @@ class MianshiService(BlueFoxServerSystem):
# 竹筒饭加肉: (bamboo_2 + 任一肉类) -> bamboo_4
for meat in MEAT_ITEMS:
add({"block": "rtdd:bamboo_2", "item": meat,
"target": "rtdd:bamboo_4", "consume": 1, "tip": "§a竹筒加了肉"})
"target": "rtdd:bamboo_4", "consume": 1})
# 揉面/和面连点方块也要注册(空手右键路由)
for b in KNEAD_COUNTERS:
@@ -104,9 +104,6 @@ class MianshiService(BlueFoxServerSystem):
src = r["source"]
self.timerSources.add(src)
self.featureBlocks.add(src)
if src not in self.startTimerTips:
self.startTimerTips[src] = "§a开始蒸制, 计时出锅"
self.timingTips[src] = "§e正在蒸制中, 计时出锅"
# ---- 结果方块/物品 -> "下一步"可读提示(供转换/入笼提示追加) ----
# 例子: 饺子皮 -> "加入 猪肉馅、青菜碎"; 可颂面胚 -> "放在烤炉上等计时(60秒)结束变成 可颂"
@@ -200,8 +197,6 @@ class MianshiService(BlueFoxServerSystem):
return True
self.clearBlock(pos, dim)
self.dropItem(dim, pos, blockName)
comp.CreateMsg(playerId).NotifyOneMessage(
playerId, "§a取走" + self._nameOf(blockName))
return True
# ---- 空手右键"蒸笼计时源"(蒸X_生): 计时已改自动(tick 判定下方点燃炉灶),
@@ -279,13 +274,6 @@ class MianshiService(BlueFoxServerSystem):
if rule.get("startTimer"):
FeatureDispatcher.startTimerFor(
rule["startTimer"], dim, (x, y, z), playerId)
if rule.get("tip"):
tip = rule["tip"]
nxt = self._nextStepTip(rule.get("replace") or rule.get("above"))
if nxt:
tip += "," + nxt
comp.CreateMsg(playerId).NotifyOneMessage(playerId, tip)
return True
def _handleStartTimer(self, blockName, playerId, pos, dim):
@@ -294,16 +282,11 @@ class MianshiService(BlueFoxServerSystem):
try:
data = blockEntityDataComp.GetBlockEntityData(dim, pos)
if data and data["rtdd_tid"] == blockName:
comp.CreateMsg(playerId).NotifyOneMessage(
playerId, self.timingTips.get(blockName, "§e已经在计时中"))
return
except Exception:
pass
started = FeatureDispatcher.startTimerFor(blockName, dim, pos, playerId)
if started:
comp.CreateMsg(playerId).NotifyOneMessage(
playerId, self.startTimerTips.get(blockName, "§a已启动计时"))
else:
if not started:
comp.CreateMsg(playerId).NotifyOneMessage(
playerId, "§c蒸笼需要放在点燃的炉灶上才能开始蒸制")
@@ -332,7 +315,6 @@ class MianshiService(BlueFoxServerSystem):
if n >= cfg["times"]:
self.kneadCount.pop(key, None)
self.replaceBlock(pos, dim, cfg["target"], playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, cfg.get("doneTip", "§a完成"))
else:
self.kneadCount[key] = n
return True
@@ -395,13 +377,6 @@ class MianshiService(BlueFoxServerSystem):
# 转换后启动计时(发酵等, 记录玩家以便完成提示送达)
if recipe.get("startTimer"):
FeatureDispatcher.startTimerFor(recipe["startTimer"], dim, pos, playerId)
# 提示(追加"下一步操作"指引)
if recipe.get("tip"):
tip = recipe["tip"]
nxt = self._nextStepTip(recipe.get("target") or recipe.get("dropItem"))
if nxt:
tip += "," + nxt
comp.CreateMsg(playerId).NotifyOneMessage(playerId, tip)
# ============================================================================
# 五、工具方法,判断正下方是否指定方块(烤炉/点燃炉灶)
@@ -236,6 +236,7 @@ class MianshiTimerService(BlueFoxServerSystem):
ids = comp.CreateGame(LevelId).GetAllPlayerIds()
if playerId in ids:
comp.CreateMsg(playerId).NotifyOneMessage(playerId, tip)
except Exception:
pass