稻谷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

@@ -175,7 +175,6 @@ class YinliaoService(BlueFoxServerSystem):
self.replaceBlock(pos, dim, "rtdd:juicer_0", playerId)
# 替换后写水果类型(block entity 可能未初始化, 带延迟兜底)
self._writeFruit(dim, pos, itemName)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a已放入水果,右键开始榨汁")
return True
# ---- 榨汁中逐级推进(juicer_0→1→2→3→4): 任意右键, 换态并保留水果类型 ----
@@ -207,7 +206,6 @@ class YinliaoService(BlueFoxServerSystem):
self.consumeItem(playerId, itemDict, 1) # 消耗玻璃杯(果汁成品自带杯)
self.dropItems(dim, pos, [{"name": juiceBlock, "count": 1}])
self.replaceBlock(pos, dim, "rtdd:juicer", playerId) # 还原空, 记录随方块清除
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取出了" + juiceName)
return True
return False
@@ -228,8 +226,6 @@ class YinliaoService(BlueFoxServerSystem):
if not started:
return True # 已在定型中, 拦截但不消耗
self.consumeItem(playerId, itemDict, 1)
if ICE_LOLLY_TIMER.get("startTip"):
comp.CreateMsg(playerId).NotifyOneMessage(playerId, ICE_LOLLY_TIMER["startTip"])
return True
# ---- 定型 + 水果x2 → 各水果冰棍盒 ----
@@ -247,7 +243,6 @@ class YinliaoService(BlueFoxServerSystem):
boxBlock, _popsicle, flavor = info
self.consumeItem(playerId, itemDict, 2)
self.replaceBlock(pos, dim, boxBlock, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a" + flavor + "冰棍做好了!")
return True
# ---- 各水果冰棍盒 空手右键 → 取出2根冰棍, 还原未定型 ----
@@ -261,7 +256,6 @@ class YinliaoService(BlueFoxServerSystem):
_fruit, popsicle, flavor = info
self.dropItems(dim, pos, [{"name": popsicle, "count": 2}])
self.replaceBlock(pos, dim, "rtdd:icelollybox_1", playerId) # 还原未定型
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取出了2根" + flavor + "冰棍")
return True
# ============================================================================
@@ -277,7 +271,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.consumeItem(playerId, itemDict, 1)
self.replaceBlock(pos, dim, "rtdd:frytheicebox_1", playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a已放入冰块,右键放入水果炒冰")
return True
# ---- 放冰 + 水果 → 各水果炒冰盒 ----
@@ -290,7 +283,6 @@ class YinliaoService(BlueFoxServerSystem):
iceBox, _icecream, flavor = info
self.consumeItem(playerId, itemDict, 1)
self.replaceBlock(pos, dim, iceBox, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a" + flavor + "炒冰做好了!")
return True
# ---- 各水果炒冰盒 空手右键 → 取出1个冰沙, 还原空 ----
@@ -306,7 +298,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.dropItems(dim, pos, [{"name": icecream, "count": 1}])
self.replaceBlock(pos, dim, "rtdd:frytheicebox", playerId) # 还原空
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取出了" + flavor + "冰沙")
return True
# ============================================================================
@@ -320,7 +311,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.consumeItem(playerId, itemDict, 1)
self.replaceBlock(pos, dim, POPSICLE_PILE_2, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a把西瓜冰棍叠到橙子冰棍上,变成冰棍堆")
return True
# ---- 单根西瓜冰棍(地上) + 手持橙子冰棍 → 冰棍堆(橙子+西瓜), 顺序无关 ----
if blockName == POPSICLE_SINGLE_MELON and itemName == POPSICLE_SINGLE_ORANGE:
@@ -328,7 +318,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.consumeItem(playerId, itemDict, 1)
self.replaceBlock(pos, dim, POPSICLE_PILE_2, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a把橙子冰棍叠到西瓜冰棍上,变成冰棍堆")
return True
# ---- 冰棍堆(橙子+西瓜) ----
@@ -339,7 +328,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.consumeItem(playerId, itemDict, 1)
self.replaceBlock(pos, dim, POPSICLE_PILE_3, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a把苹果冰棍插到冰棍堆上,叠成三层")
return True
# 空手右键 → 取出西瓜冰棍(按方块状态固定), 变回 单根橙子冰棍
if not itemName or itemName == "minecraft:air":
@@ -347,7 +335,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.dropItems(dim, pos, [{"name": POPSICLE_SINGLE_MELON, "count": 1}])
self.replaceBlock(pos, dim, POPSICLE_SINGLE_ORANGE, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取走了西瓜冰棍,剩下一根橙子冰棍")
return True
return False
@@ -359,7 +346,6 @@ class YinliaoService(BlueFoxServerSystem):
return True
self.dropItems(dim, pos, [{"name": POPSICLE_PILE_ADD, "count": 1}])
self.replaceBlock(pos, dim, POPSICLE_PILE_2, playerId)
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取走了苹果冰棍")
return True
return False
@@ -163,8 +163,6 @@ class YinliaoTimerService(BlueFoxServerSystem):
# 替换方块为定型
self.replaceBlock(pos, dim, recipe["target"], None)
self._clearTimerData(dim, pos)
if recipe.get("doneTip"):
self._notifyIfOnline(data["rtdd_tp"], recipe["doneTip"])
except Exception:
pass