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

@@ -36,7 +36,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_1",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个苹果",
"tip": None,
"giveItem": None,
},
{
@@ -45,7 +45,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_2",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -54,7 +54,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_3",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个土豆",
"tip": None,
"giveItem": None,
},
{
@@ -63,7 +63,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_4",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -72,7 +72,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_5",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -81,7 +81,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_6",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -90,7 +90,7 @@ MARKET_SWITCHES = [
"target": "rtdd:woodenbox_7",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鲑鱼",
"tip": None,
"giveItem": None,
},
# ---- 取出 (空手右键 装满的条箱) ----
@@ -101,7 +101,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:apple", "count": 32}],
"tip": "§a取出了32个苹果",
"tip": None,
"giveItem": None,
},
{
@@ -111,7 +111,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:carrot", "count": 32}],
"tip": "§a取出了32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -121,7 +121,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:potato", "count": 32}],
"tip": "§a取出了32个土豆",
"tip": None,
"giveItem": None,
},
{
@@ -131,7 +131,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:peach", "count": 32}],
"tip": "§a取出了32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -141,7 +141,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:orange", "count": 32}],
"tip": "§a取出了32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -151,7 +151,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:cod", "count": 32}],
"tip": "§a取出了32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -161,7 +161,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:salmon", "count": 32}],
"tip": "§a取出了32条鲑鱼",
"tip": None,
"giveItem": None,
},
@@ -175,7 +175,7 @@ MARKET_SWITCHES = [
"target": "rtdd:fishbucket_1",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -184,7 +184,7 @@ MARKET_SWITCHES = [
"target": "rtdd:fishbucket_2",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鲑鱼",
"tip": None,
"giveItem": None,
},
{
@@ -193,7 +193,7 @@ MARKET_SWITCHES = [
"target": "rtdd:carrotbarrel",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -202,7 +202,7 @@ MARKET_SWITCHES = [
"target": "rtdd:potatobarrel",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个土豆",
"tip": None,
"giveItem": None,
},
{
@@ -211,7 +211,7 @@ MARKET_SWITCHES = [
"target": "rtdd:peachbarrel",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -220,7 +220,7 @@ MARKET_SWITCHES = [
"target": "rtdd:orangebarrel",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -229,7 +229,7 @@ MARKET_SWITCHES = [
"target": "rtdd:applebox",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个苹果",
"tip": None,
"giveItem": None,
},
# ---- 取出 ----
@@ -240,7 +240,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:cod", "count": 32}],
"tip": "§a取出了32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -250,7 +250,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:salmon", "count": 32}],
"tip": "§a取出了32条鲑鱼",
"tip": None,
"giveItem": None,
},
{
@@ -260,7 +260,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:carrot", "count": 32}],
"tip": "§a取出了32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -270,7 +270,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:potato", "count": 32}],
"tip": "§a取出了32个土豆",
"tip": None,
"giveItem": None,
},
{
@@ -280,7 +280,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:peach", "count": 32}],
"tip": "§a取出了32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -290,7 +290,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:orange", "count": 32}],
"tip": "§a取出了32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -300,7 +300,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:apple", "count": 32}],
"tip": "§a取出了32个苹果",
"tip": None,
"giveItem": None,
},
@@ -315,7 +315,7 @@ MARKET_SWITCHES = [
"target": "rtdd:orangebox",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -324,7 +324,7 @@ MARKET_SWITCHES = [
"target": "rtdd:peachbox",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -333,7 +333,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_cod",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -342,7 +342,7 @@ MARKET_SWITCHES = [
"target": "rtdd:b_30",
"consume": 32,
"type": "switch",
"tip": "§a已放入32条鲑鱼",
"tip": None,
"giveItem": None,
},
{
@@ -351,7 +351,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_carrot",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -360,7 +360,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_bread",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个面包",
"tip": None,
"giveItem": None,
},
{
@@ -369,7 +369,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_apple",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个苹果",
"tip": None,
"giveItem": None,
},
{
@@ -378,7 +378,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_pumpkin",
"consume": 1,
"type": "switch",
"tip": "§a已放入1个原版南瓜",
"tip": None,
"giveItem": None,
},
{
@@ -387,7 +387,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_watermelon",
"consume": 1,
"type": "switch",
"tip": "§a已放入1个原版西瓜",
"tip": None,
"giveItem": None,
},
{
@@ -396,7 +396,7 @@ MARKET_SWITCHES = [
"target": "rtdd:sales_box_potato",
"consume": 32,
"type": "switch",
"tip": "§a已放入32个土豆",
"tip": None,
"giveItem": None,
},
# ---- 取出 ----
@@ -407,7 +407,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:orange", "count": 32}],
"tip": "§a取出了32个橘子",
"tip": None,
"giveItem": None,
},
{
@@ -417,7 +417,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "rtdd:peach", "count": 32}],
"tip": "§a取出了32个桃子",
"tip": None,
"giveItem": None,
},
{
@@ -427,7 +427,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:cod", "count": 32}],
"tip": "§a取出了32条鳕鱼",
"tip": None,
"giveItem": None,
},
{
@@ -437,7 +437,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:salmon", "count": 32}],
"tip": "§a取出了32条鲑鱼",
"tip": None,
"giveItem": None,
},
{
@@ -447,7 +447,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:carrot", "count": 32}],
"tip": "§a取出了32个胡萝卜",
"tip": None,
"giveItem": None,
},
{
@@ -457,7 +457,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:bread", "count": 32}],
"tip": "§a取出了32个面包",
"tip": None,
"giveItem": None,
},
{
@@ -467,7 +467,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:apple", "count": 32}],
"tip": "§a取出了32个苹果",
"tip": None,
"giveItem": None,
},
{
@@ -477,7 +477,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:pumpkin", "count": 1}],
"tip": "§a取出了1个原版南瓜",
"tip": None,
"giveItem": None,
},
{
@@ -487,7 +487,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:melon_block", "count": 1}],
"tip": "§a取出了1个原版西瓜",
"tip": None,
"giveItem": None,
},
{
@@ -497,7 +497,7 @@ MARKET_SWITCHES = [
"consume": 0,
"type": "switch",
"dropItem": [{"name": "minecraft:potato", "count": 32}],
"tip": "§a取出了32个土豆",
"tip": None,
"giveItem": None,
},
@@ -510,7 +510,7 @@ MARKET_SWITCHES = [
"target": "rtdd:bountypaper_1",
"consume": 0,
"type": "switch",
"tip": "§a切换到悬赏纸_1",
"tip": None,
"giveItem": None,
},
{
@@ -519,7 +519,7 @@ MARKET_SWITCHES = [
"target": "rtdd:bountypaper_2",
"consume": 0,
"type": "switch",
"tip": "§a切换到悬赏纸_2",
"tip": None,
"giveItem": None,
},
{
@@ -528,7 +528,7 @@ MARKET_SWITCHES = [
"target": "rtdd:bountypaper",
"consume": 0,
"type": "switch",
"tip": "§a切回农贸清单",
"tip": None,
"giveItem": None,
},
]
@@ -162,10 +162,6 @@ class MarketService(BlueFoxServerSystem):
if recipe.get("target"):
self.replaceBlock(pos, dim, recipe["target"], playerId)
# ---- 转换成功提示 ----
if recipe.get("tip"):
comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
# ============================================================================
# 四、工具方法:放入数量检查
# ============================================================================