修正进度，添加各种道具

data/item/loot_tables/gameparty/item/blue.json

@@ -1,8 +1,23 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:item",
+        "weight": 4,
+        "name": "minecraft:iron_ingot",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 4
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁锭 x4\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+            }
+        ]
+    },
 {
         "type": "minecraft:item",
-        "weight": 2,
+        "weight": 4,
         "name": "minecraft:iron_pickaxe",
         "functions": [
             {
@@ -13,7 +28,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:iron_sword",
     "functions": [
         {
@@ -24,7 +39,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:enchanted_golden_apple",
     "functions": [
         {
@@ -35,7 +50,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:shield",
     "functions": [
         {
@@ -46,7 +61,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:elytra",
     "functions": [
         {
@@ -57,7 +72,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 3,
     "name": "minecraft:netherite_chestplate",
     "functions": [
         {
@@ -68,7 +83,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 3,
     "name": "minecraft:netherite_leggings",
     "functions": [
         {

data/item/loot_tables/gameparty/item/green.json

@@ -2,7 +2,7 @@
 
 {
         "type": "minecraft:item",
-        "weight": 2,
+        "weight":3,
         "name": "minecraft:fishing_rod",
         "functions": [
             {
@@ -13,7 +13,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 6,
     "name": "minecraft:iron_axe",
     "functions": [
         {
@@ -24,7 +24,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 3,
     "name": "minecraft:totem_of_undying",
     "functions": [
         {
@@ -35,7 +35,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 3,
     "name": "minecraft:golden_apple",
     "functions": [
         {
@@ -46,7 +46,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 6,
     "name": "minecraft:crossbow",
     "functions": [
         {
@@ -54,6 +54,80 @@
             "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩, 箭 x10\\\",\\\"color\\\":\\\"green\\\"}\",\"Enchantments\":[{\"id\":\"quick_charge\",\"lvl\":3}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":10,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:cobblestone",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 16
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"圆石 x16\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:iron_ore",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 4
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁矿石 x4\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:potion",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"急迫 IV (饮用, 2:00)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":3,\"Amplifier\":3,\"Duration\":2400}],\"CustomPotionColor\":16578599,\"display\":{\"Name\":\"{\\\"text\\\":\\\"速掘药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:potion",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"力量 II (饮用, 1:30)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":5,\"Amplifier\":1,\"Duration\":1800}],\"CustomPotionColor\":9836568,\"display\":{\"Name\":\"{\\\"text\\\":\\\"力量药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:netherite_chestplate",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:netherite_leggings",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
 }
 
 ]}]}

data/item/loot_tables/gameparty/item/white.json

@@ -2,18 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"速度 II (0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":1,\"Amplifier\":1,\"Duration\":400}],\"CustomPotionColor\":8039610,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型速度药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
+    "weight": 6,
     "name": "minecraft:fishing_rod",
     "functions": [
         {
@@ -28,7 +17,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 6,
     "name": "minecraft:stone_pickaxe",
     "functions": [
         {
@@ -39,7 +28,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:stick",
     "functions": [
         {
@@ -50,7 +39,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:wooden_axe",
     "functions": [
         {
@@ -65,7 +54,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:shield",
     "functions": [
         {
@@ -80,29 +69,29 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 2,
     "name": "minecraft:splash_potion",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"神龟 (0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"turtle_master\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型神龟药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"神龟 (喷溅, 0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"turtle_master\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型神龟药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 2,
     "name": "minecraft:splash_potion",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"飘浮 (0:10)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":25,\"Amplifier\":0,\"Duration\":200}],\"CustomPotionColor\":11458519,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型浮空药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"飘浮 (喷溅, 0:10)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":25,\"Amplifier\":0,\"Duration\":200}],\"CustomPotionColor\":11458519,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型浮空药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 2,
     "name": "minecraft:lingering_potion",
     "functions": [
         {
@@ -113,18 +102,18 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:splash_potion",
+    "weight": 2,
+    "name": "minecraft:potion",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"隐身 (3:00)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"invisibility\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"隐身药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"隐身 (饮用, 3:00)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"invisibility\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"隐身药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 6,
     "name": "minecraft:crossbow",
     "functions": [
         {
@@ -135,18 +124,18 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_leggings",
+    "weight": 3,
+    "name": "minecraft:diamond_helmet",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"钻石头盔\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 3,
     "name": "minecraft:netherite_boots",
     "functions": [
         {
@@ -154,6 +143,32 @@
             "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金靴子\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
         }
     ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:oak_log",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 5
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"橡木原木 x5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:furnace",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"熔炉\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+        }
+    ]
 }
 
 ]}]}

data/item/tags/items/bonus.json

@@ -14,7 +14,12 @@
         "minecraft:trident",
         "minecraft:stick",
         "minecraft:heart_of_the_sea",
+        "minecraft:cobblestone",
+        "minecraft:iron_ore",
+        "minecraft:iron_ingot",
         "minecraft:elytra",
+        "minecraft:oak_log",
+        "minecraft:furnace",
         "minecraft:firework_rocket",
         "minecraft:wooden_axe",
         "minecraft:stone_axe",
@@ -22,12 +27,14 @@
         "minecraft:iron_pickaxe",
         "minecraft:fishing_rod",
         "minecraft:shield",
+        "minecraft:potion",
         "minecraft:splash_potion",
         "minecraft:lingering_potion",
         "minecraft:crossbow",
         "minecraft:bow",
         "minecraft:stone_pickaxe",
         "minecraft:arrow",
+        "minecraft:diamond_helmet",
         "minecraft:netherite_helmet",
         "minecraft:netherite_chestplate",
         "minecraft:netherite_leggings",

data/ltw/advancements/vs/emerald2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:vs/emerald2",
+    "parent": "ltw:vs/emerald1",
     "display": {
       "icon": {
         "item": "minecraft:emerald"

data/ltw/advancements/vs/emerald3.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:vs/emerald3",
+    "parent": "ltw:vs/emerald2",
     "display": {
       "icon": {
         "item": "minecraft:emerald_block"

data/minecraft/loot_tables/gameplay/fishing.json

@@ -7,7 +7,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 10,
-          "quality": 5,
+          "quality": 10,
           "name": "item:gameparty/item/green"
         },
         {
@@ -19,7 +19,7 @@
         {
           "type": "minecraft:loot_table",
           "weight": 50,
-          "quality": -15,
+          "quality": -20,
           "name": "minecraft:gameplay/fishing/fish"
         }
       ]