瀏覽代碼

交易游戏重做

龙腾猫跃 3 年之前
父節點
當前提交
105db3f81f
共有 35 個文件被更改,包括 528 次插入 和 1320 次删除
  1. 4 4
      data/item/functions/bonus_item/add_score.mcfunction
  2. 1 1
      data/item/functions/bonus_item/call_each.mcfunction
  3. 3 3
      data/item/functions/bonus_item/stole_score.mcfunction
  4. 5 5
      data/item/loot_tables/gameparty/score/blue.json
  5. 9 9
      data/item/loot_tables/gameparty/score/green.json
  6. 3 3
      data/item/loot_tables/gameparty/score/purple.json
  7. 5 5
      data/item/loot_tables/gameparty/score/white.json
  8. 1 1
      data/ltw/advancements/story/score1.json
  9. 1 1
      data/ltw/advancements/story/score2.json
  10. 1 1
      data/ltw/advancements/story/score3.json
  11. 2 2
      data/ltw/functions/init.mcfunction
  12. 2 2
      data/ltw/functions/main/game_end.mcfunction
  13. 1 1
      data/ltw/functions/main/player_enter_watcher.mcfunction
  14. 1 1
      data/ltw/functions/state/0/start_game.mcfunction
  15. 4 4
      data/minecraft/loot_tables/blocks/oak_leaves.json
  16. 1 1
      data/mini/functions/colormatch/game/generate_parts.mcfunction
  17. 1 1
      data/mini/functions/diamond/game_end.mcfunction
  18. 1 1
      data/mini/functions/diamond/game_start.mcfunction
  19. 1 1
      data/mini/functions/main/init.mcfunction
  20. 1 1
      data/mini/functions/parkour/game_end.mcfunction
  21. 1 1
      data/mini/functions/phantom/game_end.mcfunction
  22. 6 6
      data/mini/functions/trade/game/announce_upgrade.mcfunction
  23. 1 1
      data/mini/functions/trade/game/new_trade.mcfunction
  24. 1 1
      data/mini/functions/trade/game/paper_show.mcfunction
  25. 7 4
      data/mini/functions/trade/game/set_trade.mcfunction
  26. 1 1
      data/mini/functions/trade/game/villager_update_trade.mcfunction
  27. 1 1
      data/mini/functions/trade/game_end.mcfunction
  28. 2 2
      data/mini/functions/trade/tick20.mcfunction
  29. 22 7
      data/mini/loot_tables/diamond.json
  30. 73 191
      data/mini/loot_tables/trade_a.json
  31. 73 191
      data/mini/loot_tables/trade_b.json
  32. 73 228
      data/mini/loot_tables/trade_c.json
  33. 73 235
      data/mini/loot_tables/trade_d.json
  34. 73 212
      data/mini/loot_tables/trade_e.json
  35. 73 191
      data/mini/loot_tables/trade_s.json

+ 4 - 4
data/item/functions/bonus_item/add_score.mcfunction

@@ -4,7 +4,7 @@ execute store result score #bonus_add_score mem run data get storage item:bonus
 # 正常的加分
 execute if score #bonus_add_score mem matches ..10 run scoreboard players operation @s total_score += #bonus_add_score mem
 execute if score #bonus_add_score mem matches ..10 run scoreboard players operation @s total_score_disp += #bonus_add_score mem
-execute if score #bonus_add_score mem matches ..10 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"score": {"name":"#bonus_add_score","objective": "mem"},"color":"aqua"},{"text": " 分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+execute if score #bonus_add_score mem matches ..10 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"score": {"name":"#bonus_add_score","objective": "mem"},"color":"aqua"},{"text": " 积分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 积分"]
 
 # 100:普通硬币 / 101:高级硬币
 scoreboard players set $random_max mem 1
@@ -12,11 +12,11 @@ scoreboard players set $random_min mem 0
 function lib:random
 execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run scoreboard players operation @s total_score *= #const_2 mem
 execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run scoreboard players operation @s total_score_disp *= #const_2 mem
-execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 的硬币投出了正面, 得分加倍, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"green"},{"text": " 分", "color":"green"}]
+execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 的硬币投出了正面, 积分加倍, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"green"},{"text": " 积分", "color":"green"}]
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score /= #const_2 mem
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score_disp /= #const_2 mem
-execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 得分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 分", "color":"red"}]
-execute if score #bonus_add_score mem matches 101 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 得分不变, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 分", "color":"red"}]
+execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 积分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
+execute if score #bonus_add_score mem matches 101 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 积分不变, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
 
 # 200:偷分
 execute if score #bonus_add_score mem matches 200 run function item:bonus_item/stole_score

+ 1 - 1
data/item/functions/bonus_item/call_each.mcfunction

@@ -8,7 +8,7 @@ data remove storage item:bonus item_buff[0]
 # 播放音效
 function lib:sounds/hit
 
-# 显示拾取提示(获得得分的提示由 add_score 显示,获得随机物品则该物品不显示)
+# 显示拾取提示(获得积分的提示由 add_score 显示,获得随机物品则该物品不显示)
 execute unless data storage item:bonus item.tag.bonus_add_score unless data storage item:bonus item.tag.bonus_random_bonus[0] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"nbt": "item.tag.item_name","storage":"item:bonus","interpret": true}]
 
 # 如果有 return 标签则退回物品(最先执行)

+ 3 - 3
data/item/functions/bonus_item/stole_score.mcfunction

@@ -10,7 +10,7 @@ tag @s remove may_highest
 execute as @a[tag=may_highest,limit=1,sort=random,team=playing] run tag @s add highest
 execute unless entity @a[tag=highest] run tag @s add highest
 
-# 更改得分
+# 更改积分
 scoreboard players operation @s total_score += #bonus_stole_score mem
 scoreboard players operation @s total_score_disp += #bonus_stole_score mem
 scoreboard players operation @a[tag=highest] total_score -= #bonus_stole_score mem
@@ -18,5 +18,5 @@ scoreboard players operation @a[tag=highest] total_score_disp -= #bonus_stole_sc
 
 # 显示提示
 execute if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 没能偷到任何人的分数……"]
-execute if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest]","color":"red"}," 被偷取了 ",{"score": {"name": "#bonus_stole_score","objective": "mem"},"color":"red"},{"text": " 分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1]","objective": "total_score"}}, " 分"]
-execute if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"score": {"name": "#bonus_stole_score","objective": "mem"},"color":"green"},{"text": " 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+execute if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest]","color":"red"}," 被偷取了 ",{"score": {"name": "#bonus_stole_score","objective": "mem"},"color":"red"},{"text": " 积分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1]","objective": "total_score"}}, " 积分"]
+execute if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"score": {"name": "#bonus_stole_score","objective": "mem"},"color":"green"},{"text": " 积分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 积分"]

+ 5 - 5
data/item/loot_tables/gameparty/score/blue.json

@@ -11,7 +11,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +7\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":7}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +7\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":7}"
         }
     ]
 },
@@ -26,7 +26,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +6\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +6\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
         }
     ]
 },
@@ -41,7 +41,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +5\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +5\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
         }
     ]
 },
@@ -52,7 +52,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 3 分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":3}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 3 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":3}"
         }
     ]
 },
@@ -63,7 +63,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机翻倍或不变\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":101}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或不变\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":101}"
         }
     ]
 }

+ 9 - 9
data/item/loot_tables/gameparty/score/green.json

@@ -11,7 +11,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +4\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +4\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
         }
     ]
 },
@@ -26,7 +26,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +3\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +3\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
         }
     ]
 },
@@ -37,7 +37,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机翻倍或减半\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":100}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或减半\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":100}"
         }
     ]
 },
@@ -48,7 +48,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
         }
     ]
 },
@@ -59,7 +59,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
         }
     ]
 },
@@ -70,7 +70,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
         }
     ]
 },
@@ -81,7 +81,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
         }
     ]
 },
@@ -92,7 +92,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
         }
     ]
 },
@@ -103,7 +103,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
         }
     ]
 }

+ 3 - 3
data/item/loot_tables/gameparty/score/purple.json

@@ -11,7 +11,7 @@
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +10\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":10}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +10\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":10}"
             }
         ]
     },
@@ -26,7 +26,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +9\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":9}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +9\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":9}"
         }
     ]
 },
@@ -41,7 +41,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +8\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":8}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +8\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":8}"
         }
     ]
 }

+ 5 - 5
data/item/loot_tables/gameparty/score/white.json

@@ -7,7 +7,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
         }
     ]
 },
@@ -22,7 +22,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +2\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
         }
     ]
 },
@@ -33,7 +33,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率得分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率积分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
         }
     ]
 },
@@ -44,7 +44,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率得分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率积分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
         }
     ]
 },
@@ -70,7 +70,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":1}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":1}"
         }
     ]
 }

+ 1 - 1
data/ltw/advancements/story/score1.json

@@ -8,7 +8,7 @@
         "text": "两位数的突破  "
       },
       "description": [
-        {"text": "在单局游戏中达到 10 分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 10 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

+ 1 - 1
data/ltw/advancements/story/score2.json

@@ -8,7 +8,7 @@
         "text": "分数猎手      "
       },
       "description": [
-        {"text": "在单局游戏中达到 18 分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 18 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

+ 1 - 1
data/ltw/advancements/story/score3.json

@@ -8,7 +8,7 @@
         "text": "分数满屋      "
       },
       "description": [
-        {"text": "在单局游戏中达到 26 分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 26 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

+ 2 - 2
data/ltw/functions/init.mcfunction

@@ -47,9 +47,9 @@ scoreboard objectives modify health_disp rendertype hearts
 scoreboard objectives remove mem
 scoreboard objectives add mem dummy "全局变量"
 scoreboard objectives remove total_score
-scoreboard objectives add total_score dummy "得分"
+scoreboard objectives add total_score dummy "积分"
 scoreboard objectives remove total_score_disp
-scoreboard objectives add total_score_disp dummy "得分"
+scoreboard objectives add total_score_disp dummy "积分"
 scoreboard objectives remove leave_game
 scoreboard objectives add leave_game minecraft.custom:leave_game "离开游戏"
 scoreboard objectives remove effect_floating

+ 2 - 2
data/ltw/functions/main/game_end.mcfunction

@@ -58,12 +58,12 @@ execute if entity @a[tag=total_rank2] run tellraw @a [" ",{"text": "第二名 -
 execute if entity @a[tag=total_rank3] run tellraw @a [" ",{"text": "第三名 - ","color":"green"},{"selector": "@a[tag=total_rank3]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"}]
 tellraw @a ""
 
-# 得分金粒奖励
+# 积分金粒奖励
 execute as @a[team=playing] run scoreboard players operation @s temp2 = @s total_score
 execute as @a[team=playing] run scoreboard players operation @s temp2 /= #const_2 mem
 execute as @a[team=playing] run scoreboard players operation @s gold += @s temp2
 execute as @a[team=playing] run scoreboard players operation @s gold_total += @s temp2
-tellraw @a[team=playing] [" ",{"text": "得分奖励: ","color":"gold"},{"score":{"name": "*","objective": "temp2"}}," 金粒"]
+tellraw @a[team=playing] [" ",{"text": "积分奖励: ","color":"gold"},{"score":{"name": "*","objective": "temp2"}}," 金粒"]
 
 # 名次金粒奖励
 scoreboard players set @a temp 0

+ 1 - 1
data/ltw/functions/main/player_enter_watcher.mcfunction

@@ -7,7 +7,7 @@ tag @s remove mini_rank2
 tag @s remove mini_rank3
 tag @s remove mini_rank4
 
-# 清除得分显示(防止中途加入的旁观者依然保留上一局的得分)
+# 清除积分显示(防止中途加入的旁观者依然保留上一局的积分)
 scoreboard players reset @s total_score
 scoreboard players reset @s total_score_disp
 

+ 1 - 1
data/ltw/functions/state/0/start_game.mcfunction

@@ -20,7 +20,7 @@ scoreboard players set $round mem 1
 scoreboard players add $ game_id 1
 scoreboard players operation @a game_id = $ game_id
 
-# 分配玩家id
+# 设置玩家id
 scoreboard players set @a[team=playing] player_id 0
 scoreboard players set $player_id mem 0
 execute if entity @a[team=playing,scores={player_id=0}] run function ltw:state/0/set_player_id

+ 4 - 4
data/minecraft/loot_tables/blocks/oak_leaves.json

@@ -50,10 +50,10 @@
                   "condition": "minecraft:table_bonus",
                   "enchantment": "minecraft:fortune",
                   "chances": [
-                    0.05,
-                    0.0625,
-                    0.083333336,
-                    0.1
+                    0.1,
+                    0.15,
+                    0.2,
+                    0.25
                   ]
                 }
               ],

+ 1 - 1
data/mini/functions/colormatch/game/generate_parts.mcfunction

@@ -1,4 +1,4 @@
-# 分数更改 
+# part 数更改 
 scoreboard players add $floor_generate_part mem 1
 # 随机生成地板
 execute if score $floor_generate_part mem matches 1 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_1",integrity:1.0f}

+ 1 - 1
data/mini/functions/diamond/game_end.mcfunction

@@ -12,7 +12,7 @@ gamerule doMobLoot false
 gamerule fireDamage false
 gamerule drowningDamage false
 
-# 计算得分
+# 计算积分
 execute as @a[team=playing] run scoreboard players operation @s mini_score += @s diamond
 
 # 清理物品栏

+ 1 - 1
data/mini/functions/diamond/game_start.mcfunction

@@ -2,7 +2,7 @@ gamerule doDaylightCycle true
 scoreboard players set $countdown mem 270
 
 # HUD
-scoreboard objectives setdisplay list health_disp
+scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName health_disp
 scoreboard objectives setdisplay sidebar diamond
 scoreboard players set $bossbar_color mem 4

+ 1 - 1
data/mini/functions/main/init.mcfunction

@@ -9,7 +9,7 @@ function mini:trade/init
 
 # 计分板初始化
 scoreboard objectives remove mini_score
-scoreboard objectives add mini_score dummy "小游戏得分"
+scoreboard objectives add mini_score dummy "小游戏积分"
 scoreboard objectives remove mini_heart
 scoreboard objectives add mini_heart dummy "生命"
 scoreboard objectives remove mini_heart_disp

+ 1 - 1
data/mini/functions/parkour/game_end.mcfunction

@@ -4,5 +4,5 @@ forceload remove 1000 1000 1064 1064
 # 关闭节奏块
 scoreboard players set $tempo_enable mem 0
 
-# 计算得分
+# 计算积分
 execute as @a[team=playing] run scoreboard players operation @s mini_score += @s treasure

+ 1 - 1
data/mini/functions/phantom/game_end.mcfunction

@@ -2,5 +2,5 @@
 forceload remove 1000 6000 1064 6064
 gamerule doDaylightCycle false
 
-# 计算得分
+# 计算积分
 execute as @a[team=playing] run scoreboard players operation @s mini_score = @s kill_phantom

+ 6 - 6
data/mini/functions/trade/game/announce_upgrade.mcfunction

@@ -1,13 +1,13 @@
 tag @s add self
 
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"老手级","color":"gold"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"专家级","color":"gold"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"大师级","color":"gold"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"II · 老手级","color":"gold"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"III · 专家级","color":"gold"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"IV · 大师级","color":"gold"}]
 execute as @a[tag=!self] at @s run function lib:sounds/error
 
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"老手级, 重新开启交易页面以查看新的交易!","color":"green"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"专家级, 重新开启交易页面以查看新的交易!","color":"green"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"大师级, 重新开启交易页面以查看新的交易!","color":"green"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"II · 老手级","color":"green"},",重新开启交易页面以查看新的交易!"]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"III · 专家级","color":"green"},",重新开启交易页面以查看新的交易!"]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"IV · 大师级","color":"green"},",重新开启交易页面以查看新的交易!"]
 execute at @s run function lib:sounds/levelup
 
 tag @s remove self

+ 1 - 1
data/mini/functions/trade/game/new_trade.mcfunction

@@ -4,7 +4,7 @@ execute if score @s temp matches 3 run loot spawn ~ ~ ~ loot mini:trade_b
 execute if score @s temp matches 4 run loot spawn ~ ~ ~ loot mini:trade_c
 execute if score @s temp matches 5 run loot spawn ~ ~ ~ loot mini:trade_d
 execute if score @s temp matches 6 run loot spawn ~ ~ ~ loot mini:trade_e
-data modify entity @s Offers.Recipes append value {rewardExp:false,xp:20}
+data modify entity @s Offers.Recipes append value {rewardExp:false,xp:40}
 data modify entity @s Offers.Recipes[-1].buy set from entity @e[type=item,nbt={Item:{tag:{TradeItem:1b}}},limit=1] Item.tag.buy
 data modify entity @s Offers.Recipes[-1].buyB set from entity @e[type=item,nbt={Item:{tag:{TradeItem:1b}}},limit=1] Item.tag.buyB
 data modify entity @s Offers.Recipes[-1].maxUses set from entity @e[type=item,nbt={Item:{tag:{TradeItem:1b}}},limit=1] Item.tag.maxUses

+ 1 - 1
data/mini/functions/trade/game/paper_show.mcfunction

@@ -6,4 +6,4 @@ execute if data entity @s Inventory[{Slot:8b}] run scoreboard players set @s ite
 execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/return_item
 
 # 设置最后一格的物品
-item replace entity @s hotbar.8 with paper{game_item:1b,display:{Name:'[{"text":"交易契约","color":"aqua","italic":false}]',Lore:['[{"text":"奇物, 珍稀","italic":true,"color":"gray"}]','[{"color":"white","italic":false,"text":"在你握持该纸时, 一位村民"},{"text":" villager ","italic":true},{"color":"white","italic":false,"text":"将会出现在你周围 10 尺内"}]','[{"color":"white","italic":false,"text":"的一处尚未被占据的区域, 直到你不握持该纸时, 它会使用以"}]','[{"color":"white","italic":false,"text":"太化"},{"text":" etherealness ","color":"white","italic":true},{"color":"white","italic":false,"text":"进入以太位面并消失。"}]','[{"color":"white","italic":false,"text":"该村民被永久的浮空术"},{"text":" levitate ","color":"white","italic":true},{"color":"white","italic":false,"text":"影响, 且持续保持在与你相同"}]','[{"color":"white","italic":false,"text":"的高度。你可以穿过它所占据的空间, 且可以与它进行交易, 不"}]','[{"color":"white","italic":false,"text":"过对它的攻击会自动失手。它会通过所有豁免检定, 并且免疫所"}]','[{"color":"white","italic":false,"text":"有的伤害和异常状态。"}]']}}
+item replace entity @s hotbar.8 with paper{game_item:1b,display:{Name:'[{"text":"交易契约","color":"white","italic":false}]',Lore:['[{"text":"当你手持该契约时,村民将会出现在你的面前","italic":false,"color":"gray"}]']}}

+ 7 - 4
data/mini/functions/trade/game/set_trade.mcfunction

@@ -1,5 +1,3 @@
-scoreboard players set @s temp 1
-function mini:trade/game/new_trade
 scoreboard players set @s temp 2
 function mini:trade/game/new_trade
 scoreboard players set @s temp 2
@@ -8,6 +6,7 @@ scoreboard players set @s temp 3
 function mini:trade/game/new_trade
 scoreboard players set @s temp 1
 function mini:trade/game/new_trade
+
 scoreboard players set @s temp 3
 function mini:trade/game/new_trade
 scoreboard players set @s temp 3
@@ -16,17 +15,21 @@ scoreboard players set @s temp 4
 function mini:trade/game/new_trade
 scoreboard players set @s temp 1
 function mini:trade/game/new_trade
-scoreboard players set @s temp 4
-function mini:trade/game/new_trade
+
 scoreboard players set @s temp 4
 function mini:trade/game/new_trade
 scoreboard players set @s temp 5
 function mini:trade/game/new_trade
 scoreboard players set @s temp 5
 function mini:trade/game/new_trade
+scoreboard players set @s temp 1
+function mini:trade/game/new_trade
+
 scoreboard players set @s temp 5
 function mini:trade/game/new_trade
 scoreboard players set @s temp 6
 function mini:trade/game/new_trade
 scoreboard players set @s temp 6
+function mini:trade/game/new_trade
+scoreboard players set @s temp 6
 function mini:trade/game/new_trade

+ 1 - 1
data/mini/functions/trade/game/villager_update_trade.mcfunction

@@ -1,5 +1,5 @@
 # 判断空交易
-execute if entity @s[nbt={Offers:{Recipes:[{uses:2,maxUses:2}]}}] run function mini:trade/game/remove_trade
+execute if entity @s[nbt={Offers:{Recipes:[{uses:1,maxUses:1}]}}] run function mini:trade/game/remove_trade
 
 # 判断村民是否升级
 function mini:trade/game/villager_level_up

+ 1 - 1
data/mini/functions/trade/game_end.mcfunction

@@ -11,7 +11,7 @@ gamerule doMobLoot false
 gamerule fireDamage false
 gamerule drowningDamage false
 
-# 计算得分
+# 计算积分
 execute as @a[team=playing] run scoreboard players operation @s mini_score += @s emerald
 
 # 清理物品栏

+ 2 - 2
data/mini/functions/trade/tick20.mcfunction

@@ -18,12 +18,12 @@ execute if score $countdown mem matches 0 run function mini:main/game_end
 execute if score $foursec mem matches 1 run effect give @a[team=playing] regeneration 1 10 true
 execute if score $foursec mem matches 1 run schedule function mini:trade/game/clear_effect 1t replace
 
-# 更新下界之星,转换为得分
+# 更新下界之星,转换为积分
 scoreboard players reset * temp2
 execute as @a[team=playing] store result score @s temp2 run clear @s nether_star 0
 execute as @a[scores={temp2=1..}] run scoreboard players operation @s total_score += @s temp2
 execute as @a[scores={temp2=1..}] run scoreboard players operation @s total_score_disp += @s temp2
-execute as @a[scores={temp2=1..}] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 从交易中获得了 ",{"score": {"name":"@s","objective": "temp2"},"color":"aqua"},{"text": " 分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+execute as @a[scores={temp2=1..}] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 从交易中获得了 ",{"score": {"name":"@s","objective": "temp2"},"color":"aqua"},{"text": " 积分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 积分"]
 clear @a[team=playing] nether_star
 
 # 60s 提示

+ 22 - 7
data/mini/loot_tables/diamond.json

@@ -1,26 +1,26 @@
-{"pools": [{"rolls": {"max": 4,"min": 2},"entries": [
+{"pools": [{"rolls": 5,"entries": [
 
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:nether_star",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"得分 +1\",\"italic\":false,\"color\":\"white\"}'}}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"积分 +1\",\"italic\":false,\"color\":\"white\"}'}}"
             }
         ]
     },
     {
         "type": "minecraft:item",
         "weight": 1,
-        "name": "minecraft:diamond",
+        "name": "minecraft:coal",
         "functions": [
           {
             "function": "minecraft:set_count",
             "count": {
               "min": 1.0,
-              "max": 2.0,
+              "max": 3.0,
               "type": "minecraft:uniform"
             }
           }
@@ -28,18 +28,33 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 2,
         "name": "minecraft:iron_ingot",
         "functions": [
           {
             "function": "minecraft:set_count",
             "count": {
-              "min": 2.0,
+              "min": 1.0,
               "max": 3.0,
               "type": "minecraft:uniform"
             }
           }
         ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 1,
+        "name": "minecraft:diamond",
+        "functions": [
+          {
+            "function": "minecraft:set_count",
+            "count": {
+              "min": 1.0,
+              "max": 2.0,
+              "type": "minecraft:uniform"
+            }
+          }
+        ]
     }
     
 ]}]}

+ 73 - 191
data/mini/loot_tables/trade_a.json

@@ -3,199 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"bowl\",Count:2}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:bowl\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"wheat_seeds\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:wheat_seeds\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"light_gray_dye\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:light_gray_dye\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"oak_boat\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:3}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_boat\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"oak_sapling\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:2}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_sapling\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"stripped_oak_log\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:2}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stripped_oak_log\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"bowl\",Count:4}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:bowl\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"wheat_seeds\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:wheat_seeds\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"light_gray_dye\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:light_gray_dye\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"oak_boat\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_boat\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"oak_fence\",Count:3}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_fence\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"dirt\",Count:6}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:dirt\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"flint\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:flint\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"gravel\",Count:6}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:gravel\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }

+ 73 - 191
data/mini/loot_tables/trade_b.json

@@ -3,199 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"stone_pickaxe\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:4}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone_pickaxe\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"torch\",Count:2}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:2}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:torch\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"stone_bricks\",Count:2}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:4}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone_bricks\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"grindstone\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:4}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:grindstone\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"yellow_stained_glass\",Count:2}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:9}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:yellow_stained_glass\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"coarse_dirt\",Count:2}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:4}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:coarse_dirt\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"stone_pickaxe\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone_pickaxe\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"torch\",Count:4}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:torch\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"stone\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"furnace\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:furnace\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"coal\",Count:3}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:coal\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"oak_stairs\",Count:8}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_stairs\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"oak_sapling\",Count:3}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_sapling\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"mossy_cobblestone\",Count:8}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_cobblestone\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }

+ 73 - 228
data/mini/loot_tables/trade_c.json

@@ -3,236 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"oak_leaves\",Count:6}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_leaves\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"armor_stand\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:4}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:armor_stand\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"minecraft:potion\",Count:1,tag:{Potion:\"minecraft:water\"}}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:4}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:potion\",tag:{Potion:\"minecraft:water\"}}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"yellow_concrete\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:10}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:yellow_concrete\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"stonecutter\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:8}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stonecutter\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"chest_minecart\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:10}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:chest_minecart\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"tripwire_hook\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:4}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:tripwire_hook\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:spider_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"glass\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:glass\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"iron_nugget\",Count:18}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:iron_nugget\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"shield\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:shield\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"vine\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:vine\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"minecraft:potion\",Count:1,tag:{Potion:\"minecraft:water\"}}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:potion\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"grass\",Count:8}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:grass\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"flint_and_steel\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:flint_and_steel\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"dirt\",Count:32}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:dirt\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }

+ 73 - 235
data/mini/loot_tables/trade_d.json

@@ -3,243 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"lava_bucket\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:9}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:lava_bucket\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"jukebox\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:11}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:jukebox\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"flint_and_steel\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:9}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:flint_and_steel\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"lantern\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:4}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:lantern\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"mossy_stone_bricks\",Count:2}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:6}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_stone_bricks\"}}]}}"
-                                }
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"light_blue_dye\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:6}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:light_blue_dye\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:skeleton_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"white_concrete_powder\",Count:4}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:10}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:white_concrete_powder\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:skeleton_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"blue_dye\",Count:4}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:blue_dye\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"iron_pickaxe\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:iron_pickaxe\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"lava_bucket\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:lava_bucket\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"oak_leaves\",Count:64}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:oak_leaves\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"chest_minecart\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:chest_minecart\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"stripped_oak_log\",Count:16}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stripped_oak_log\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"jukebox\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:jukebox\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"yellow_stained_glass\",Count:8}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:yellow_stained_glass\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }

+ 73 - 212
data/mini/loot_tables/trade_e.json

@@ -3,220 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"diamond_hoe\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:14}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_hoe\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"blast_furnace\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:blast_furnace\"},sell:{id:\"minecraft:nether_star\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"furnace_minecart\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:14}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:furnace_minecart\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"wheat\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:13}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:wheat\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:skeleton_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"pufferfish\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"得分 +2\",\"color\":\"white\",\"italic\":false}'}}}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:pufferfish\"},sell:{id:\"minecraft:nether_star\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:spider_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"loom\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:15}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:loom\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:spider_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"iron_chestplate\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:iron_chestplate\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"vine\",Count:12}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:vine\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"furnace_minecart\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:furnace_minecart\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"diamond_boots\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_boots\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"stone\",Count:64}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"diamond_leggings\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_leggings\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"mossy_cobblestone\",Count:32}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_cobblestone\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"obsidian\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:obsidian\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }

+ 73 - 191
data/mini/loot_tables/trade_s.json

@@ -3,199 +3,81 @@
     "functions": [
         {
             "function": "set_nbt",
-            "tag": "{TradeItem:1b}"
+            "tag": "{TradeItem:1b,maxUses:1}"
         }
     ],
-    "pools": [
+    "pools": [{"rolls": 1,"entries": [
         {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "group",
-                    "children": [
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"spider_spawn_egg\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:spider_spawn_egg\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"skeleton_spawn_egg\",Count:1}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:skeleton_spawn_egg\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:4}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"iron_ingot\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:iron_ingot\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"stone\",Count:5}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:stone\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"oak_log\",Count:5}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:oak_log\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "type": "item",
-                            "name": "stone",
-                            "functions": [
-                                {
-                                    "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{sell:{id:\"cobblestone\",Count:10}}"
-                                },
-                                {
-                                    "function": "set_nbt",
-                                    "tag":"{maxUses:2}"
-                                }
-                            ],
-                            "conditions": [
-                                {
-                                    "condition": "inverted",
-                                    "term": {
-                                        "condition": "minecraft:entity_properties",
-                                        "entity": "this",
-                                        "predicate": {
-                                            "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:cobblestone\"}}]}}"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"coal_block\",Count:3}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:coal_block\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"oak_log\",Count:16}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:oak_log\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"cobblestone\",Count:32}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:cobblestone\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"raw_iron\",Count:8}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:raw_iron\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"iron_ingot\",Count:4}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:iron_ingot\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:1}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"diamond_ore\",Count:4}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:diamond_ore\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:2}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:emerald\"},sell:{id:\"minecraft:nether_star\"}}]}}"
+            }}}]
+        },
+        {
+            "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
+                "tag": "{buy:{id:\"emerald\",Count:3}}"
+            }, { "function": "set_nbt",
+                "tag":"{sell:{id:\"chest\",Count:1,tag:{BlockEntityTag:{LootTable:\"mini:diamond\",id:\"minecraft:chest\"},display:{Name:'{\"text\":\"地牢箱子\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+            }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
+                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:chest\"}}]}}"
+            }}}]
         }
-    ]
+    ]}]
 }