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

@@ -53,7 +53,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:barbecuegrill_1",
"consume": 0,
"type": "switch",
"tip": "§a烧烤炉已点燃!",
"tip": None,
"giveItem": None,
},
# 【点火-烈焰弹】烧烤架_1(无火) → 烧烤架_2(点燃),烈焰弹消耗1个
@@ -63,7 +63,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:barbecuegrill_1",
"consume": 1,
"type": "switch",
"tip": "§a烧烤炉已点燃!",
"tip": None,
"giveItem": None,
},
# 【灭火】烧烤架_2(点燃) → 烧烤架_1(无火),消耗水桶,获得空桶
@@ -75,7 +75,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"giveItem": "minecraft:bucket",
"giveCount": 1,
"tip": "§a已用水扑灭烧烤炉",
"tip": None,
},
# ============================================================
@@ -92,7 +92,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§a牛肉串正在翻烤…",
"tip": None,
"giveItem": None,
},
{
@@ -103,7 +103,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§e牛肉串烤熟了!",
"tip": None,
"giveItem": None,
},
# 羊肉串: 生(_1) → 半熟(_0) → 熟(_3)
@@ -115,7 +115,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§a羊肉串正在翻烤…",
"tip": None,
"giveItem": None,
},
{
@@ -126,7 +126,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§e羊肉串烤熟了!",
"tip": None,
"giveItem": None,
},
# 烤蔬菜串: 生(_0) → 半熟(_1) → 熟(_3)
@@ -138,7 +138,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§a烤蔬菜串正在翻烤…",
"tip": None,
"giveItem": None,
},
{
@@ -149,7 +149,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§e烤蔬菜串烤熟了!",
"tip": None,
"giveItem": None,
},
# 烤香菇串: 生(_0) → 半熟(_1) → 熟(_3)
@@ -161,7 +161,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§a烤香菇串正在翻烤…",
"tip": None,
"giveItem": None,
},
{
@@ -172,7 +172,7 @@ BARBECUE_SWITCHES = [
"type": "switch",
"switchCd": 0.5,
"below": ["rtdd:barbecuegrill_1"],
"tip": "§e烤香菇串烤熟了!",
"tip": None,
"giveItem": None,
},
@@ -187,7 +187,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:roastchicken_0",
"consume": 1,
"type": "switch",
"tip": "§a烤鸡已上杆",
"tip": None,
"giveItem": None,
},
# 【上烤乳猪】支杆 + 死猪 → 烤乳猪(生)
@@ -197,7 +197,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:roastpig_0",
"consume": 1,
"type": "switch",
"tip": "§a烤乳猪已上杆",
"tip": None,
"giveItem": None,
},
# 【上烤鳕鱼】支杆 + 鳕鱼 → 烤鳕鱼(生)
@@ -207,7 +207,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:grilledcod_0",
"consume": 1,
"type": "switch",
"tip": "§a烤鳕鱼已上杆",
"tip": None,
"giveItem": None,
},
# 【上烤鲑鱼】支杆 + 鲑鱼 → 烤鲑鱼(生)
@@ -217,7 +217,7 @@ BARBECUE_SWITCHES = [
"target": "rtdd:grilled_fish",
"consume": 1,
"type": "switch",
"tip": "§a烤鲑鱼已上杆",
"tip": None,
"giveItem": None,
},
@@ -236,8 +236,8 @@ BARBECUE_SWITCHES = [
"time": 60,
"below": ["minecraft:campfire"],
"autoStart": True,
"startTip": "§a下方是营火,烤鸡开始烤制",
"doneTip": "§e烤鸡烤熟了!",
"startTip": None,
"doneTip": None,
"giveItem": None,
},
# 【烤熟】烤乳猪(生) → 烤乳猪(熟),下方需篝火
@@ -250,8 +250,8 @@ BARBECUE_SWITCHES = [
"time": 60,
"below": ["minecraft:campfire"],
"autoStart": True,
"startTip": "§a下方是营火,烤乳猪开始烤制",
"doneTip": "§e烤乳猪烤熟了!",
"startTip": None,
"doneTip": None,
"giveItem": None,
},
# 【烤熟】烤鳕鱼(生) → 烤鳕鱼(熟),下方需篝火
@@ -264,8 +264,8 @@ BARBECUE_SWITCHES = [
"time": 60,
"below": ["minecraft:campfire"],
"autoStart": True,
"startTip": "§a下方是营火,烤鳕鱼开始烤制",
"doneTip": "§e烤鳕鱼烤熟了!",
"startTip": None,
"doneTip": None,
"giveItem": None,
},
# 【烤熟】烤鲑鱼(生) → 烤鲑鱼(熟),下方需篝火
@@ -278,8 +278,8 @@ BARBECUE_SWITCHES = [
"time": 60,
"below": ["minecraft:campfire"],
"autoStart": True,
"startTip": "§a下方是营火,烤鲑鱼开始烤制",
"doneTip": "§e烤鲑鱼烤熟了!",
"startTip": None,
"doneTip": None,
"giveItem": None,
},
@@ -294,7 +294,7 @@ BARBECUE_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:roast_chickenplace_1", "count": 1}],
"tip": "§a取下了烤鸡(整只)",
"tip": None,
"giveItem": None,
},
# 【取下烤乳猪】烤乳猪(熟) → 支杆 + 掉落 烤乳猪(整只)
@@ -305,7 +305,7 @@ BARBECUE_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:roastpignew_1", "count": 1}],
"tip": "§a取下了烤乳猪(整只)",
"tip": None,
"giveItem": None,
},
]
@@ -213,10 +213,6 @@ class BarbecueService(BlueFoxServerSystem):
if recipe.get("giveItem"):
self.giveItem(playerId, recipe["giveItem"], recipe.get("giveCount", 1))
# 转换成功提示(点火/上杆等)
if recipe.get("tip"):
comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
# 【自动烤制】:若上杆/放置成的方块是计时源(烤乳猪生态/烤鸡/烤鱼),
# 立即判定下方是否营火:是→开始计时;否→提示需要营火。
# (不再需要玩家右键启动,避免与"放方块"互斥。)
@@ -237,10 +233,6 @@ class BarbecueService(BlueFoxServerSystem):
if recipe.get("target"):
self.replaceBlock(pos, dim, recipe["target"], playerId)
# 转换成功提示(烤串翻烤/取下等)
if recipe.get("tip"):
comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
# ============================================================================
# 五、下方方块检查(切换型规则专用,如烤串要求下方是点燃的烧烤炉)
# ============================================================================