一点成就，删除牢成就

src/main/java/org/confluence/mod/advancement/ModAchievements.java

@@ -13,10 +13,10 @@ public static void initialize() {
         offset("new_world", 0, 0);
         // Collector
         offset("timber", 1, 0);
-        /* Benched */
-        offset("hammer_time", 2,0);
-        offset("heavy_metal", 3, 0);
-        offset("star_power", 4, 0);
+        offset("benched", 2, 0);
+        offset("hammer_time", 3,0);
+        offset("heavy_metal", 4, 0);
+        offset("star_power", 5, 0);
         offset("hold_on_tight", 0, 1);
         /* Miner for Fire (1, 1) */
         /* Head in the Clouds (2, 1) */
@@ -68,6 +68,12 @@ public static void initialize() {
         /* Hey Listen (7.5, 5) */
         /* A Rare Realm (8.5, 5) */
         offset("a_shimmer_in_the_dark", 9.5F, 5);
+
+
+        // Explorer
+        offset("slippery_shinobi", 20F, 20);
+        offset("eye_on_you", 21F, 20);
+        offset("pretty_in_pink", 20F, 40);
     }
 
     private static void offset(String path, float x, float y) {

src/main/java/org/confluence/mod/datagen/ModChineseProvider.java

@@ -341,31 +341,15 @@ protected void addTranslations() {
         add("painting.confluence.slime_dragon.author", "BiliBili_小史龙吖Slime_Dragon");
         add("painting.confluence.khaki_coffee_beans.title", "KHAKI_COFFEE_BEANS");
         add("painting.confluence.khaki_coffee_beans.author", "BiliBili_卡其色咖啡豆");
-        // old
-        add("advancements.falling_star.title", "寻觅坠落之光");
-        add("advancements.falling_star.descr", "汇合后的夜空会划落一种特殊的星辰");
-        add("advancements.mana_star.title", "凝聚众星之力");
-        add("advancements.mana_star.descr", "星辰会增长你魔力的造诣");
-        add("advancements.life_crystal.title", "生之希望伴行");
-        add("advancements.life_crystal.descr", "生命给你带来前行的希望");
-        add("advancements.tin_ingot.title", "异口铜声");
-        add("advancements.tin_ingot.descr", "获得锡锭，更多的异界矿物融入于世");
-        add("advancements.meteorite_ingot.title", "天外之物");
-        add("advancements.meteorite_ingot.descr", "获得陨石矿锭");
-        add("advancements.platinum_ingot.title", "尊贵金属");
-        add("advancements.platinum_ingot.descr", "获得铂金锭");
-        add("advancements.ebony_ingot.title", "腐化意志");
-        add("advancements.ebony_ingot.descr", "获得魔矿锭");
-        add("advancements.tr_crimson_ingot.title", "猩红血肉");
-        add("advancements.tr_crimson_ingot.descr", "获得猩红矿锭");
-        add("advancements.pretty_in_pink.title", "粉红佳人");
-        add("advancements.pretty_in_pink.descr", "找到稀有的粉色史莱姆并击败它");
+
         // new
         add("achievements.toast.complete", "成就达成！");
         add("achievements.confluence.new_world.title", "旧的世界，新的旅途！");
         add("achievements.confluence.new_world.description", "汇合交流的来世。");
         add("achievements.confluence.timber.title", "木材！！");
         add("achievements.confluence.timber.description", "砍倒第一棵树。");
+        add("achievements.confluence.benched.title", "准备到位");
+        add("achievements.confluence.benched.description", "制作你的第一个工作台。");
         add("achievements.confluence.star_power.title", "星之力");
         add("achievements.confluence.star_power.description", "使用坠落之星制作魔力水晶并使用它。");
         add("achievements.confluence.ooo_shinny.title", "哦！亮闪闪！");
@@ -389,6 +373,13 @@ protected void addTranslations() {
         add("achievements.confluence.a_shimmer_in_the_dark.title", "暗中微光");
         add("achievements.confluence.a_shimmer_in_the_dark.description", "用微光将一个物品变成另一个物品。你还能找到哪些其他变化？");
 
+        add("achievements.confluence.pretty_in_pink.title", "粉红佳人");
+        add("achievements.confluence.pretty_in_pink.description", "杀死粉史莱姆。");
+        add("achievements.confluence.slippery_shinobi.title", "黏滑忍者");
+        add("achievements.confluence.slippery_shinobi.description", "打败史莱姆王，它是所有黏滑生物的首领。");
+        add("achievements.confluence.eye_on_you.title", "盯着你");
+        add("achievements.confluence.eye_on_you.description", "打败克苏鲁之眼，它是只在夜间出没的危险眼球怪。");
+
         add("prefix.confluence.hard", "坚硬");
         add("prefix.confluence.guarding", "守护");
         add("prefix.confluence.armored", "装甲");

src/main/java/org/confluence/mod/datagen/ModEnglishProvider.java

@@ -293,27 +293,14 @@ protected void addTranslations() {
         add("painting.confluence.khaki_coffee_beans.title", "KHAKI_COFFEE_BEANS");
         add("painting.confluence.khaki_coffee_beans.author", "BiliBili_卡其色咖啡豆");
 
-        // old
-        add("advancements.mana_star.title", "Gather the power of the stars");
-        add("advancements.mana_star.descr", "The stars will increase your magical powers");
-        add("advancements.tin_ingot.title", "resonant harmony, reminiscent of bronze");
-        add("advancements.tin_ingot.descr", "Acquire tin ingot, more exotic minerals blend into the world");
-        add("advancements.meteorite_ingot.title", "Something extraterrestrial");
-        add("advancements.meteorite_ingot.descr", "Acquire meteorite ingot");
-        add("advancements.platinum_ingot.title", "Precious metals");
-        add("advancements.platinum_ingot.descr", "Acquire platinum ingot");
-        add("advancements.ebony_ingot.title", "Corrupt will");
-        add("advancements.ebony_ingot.descr", "Acquire ebony ingot");
-        add("advancements.tr_crimson_ingot.title", "Crimson flesh");
-        add("advancements.tr_crimson_ingot.descr", "Acquire crimson ingot");
-        add("advancements.pretty_in_pink.title", "pretty_in_pink");
-        add("advancements.pretty_in_pink.descr", "Find the rare pink slime and defeat it");
         // new
         add("achievements.toast.complete", "Achievement achieved!");
         add("achievements.confluence.new_world.title", "Old World, New Journey!");
         add("achievements.confluence.new_world.description", "The afterlife of convergence and exchange");
         add("achievements.confluence.timber.title", "Timber!! ");
         add("achievements.confluence.timber.description", "Chop down your first tree.");
+        add("achievements.confluence.benched.title", "Benched");
+        add("achievements.confluence.benched.description", "Craft your first Crafting Table.");
         add("achievements.confluence.star_power.title", "Star Power");
         add("achievements.confluence.star_power.description", "Craft a mana crystal out of fallen stars, and consume it.");
         add("achievements.confluence.ooo_shinny.title", "Ooo! Shiny!");
@@ -337,6 +324,13 @@ protected void addTranslations() {
         add("achievements.confluence.a_shimmer_in_the_dark.title", "A Shimmer In The Dark");
         add("achievements.confluence.a_shimmer_in_the_dark.description", "Shimmer an item into another item. What other transmutations can you find?");
 
+        add("achievements.confluence.pretty_in_pink.title", "Pretty in Pink");
+        add("achievements.confluence.pretty_in_pink.description", "Kill pinky.");
+        add("achievements.confluence.slippery_shinobi.title", "Slippery Shinobi ");
+        add("achievements.confluence.slippery_shinobi.description", "Defeat King Slime, the lord of all things slimy.");
+        add("achievements.confluence.eye_on_you.title", "Eye on You");
+        add("achievements.confluence.eye_on_you.description", "“Defeat the Eye of Cthulhu, an ocular menace who only appears at night.");
+
         add("prefix.confluence.quick", "Quick");
         add("prefix.confluence.hasty", "Hasty");
         add("prefix.confluence.deadly", "Deadly");

src/main/resources/data/confluence/advancements/achievements/benched.json

@@ -0,0 +1,30 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:crafting_table"
+        },
+        "title": {
+            "translate": "achievements.confluence.benched.title"
+        },
+        "description": {
+            "translate": "achievements.confluence.benched.description"
+        },
+        "frame": "challenge",
+        "show_toast": false,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "parent": "confluence:achievements/new_world",
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "item": {
+                    "items": [
+                        "minecraft:crafting_table"
+                    ]
+                }
+            }
+        }
+    }
+}

src/main/resources/data/confluence/advancements/achievements/eye_on_you.json

@@ -0,0 +1,39 @@
+{
+    "display": {
+        "icon": {
+            "item": "confluence:suspicious_looking_eye"
+        },
+        "title": {
+            "translate": "achievements.confluence.eye_on_you.title"
+        },
+        "description": {
+            "translate": "achievements.confluence.eye_on_you.description"
+        },
+        "frame": "challenge",
+        "show_toast": false,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "parent": "confluence:achievements/new_world",
+    "criteria": {
+        "confluence:cthulhu_eye": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": [
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "type": "confluence:cthulhu_eye"
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "requirements": [
+        [
+            "confluence:cthulhu_eye"
+        ]
+    ]
+}

src/main/resources/data/confluence/advancements/achievements/new_world.json

@@ -29,7 +29,7 @@
     },
     "rewards": {
         "loot": [
-            "confluence:gameplay/start_advancements"
+            "confluence:achievements/new_world"
         ]
     }
 }

src/main/resources/data/confluence/advancements/achievements/pretty_in_pink.json

@@ -0,0 +1,39 @@
+{
+    "display": {
+        "icon": {
+            "item": "confluence:pink_gel"
+        },
+        "title": {
+            "translate": "achievements.confluence.pretty_in_pink.title"
+        },
+        "description": {
+            "translate": "achievements.confluence.pretty_in_pink.description"
+        },
+        "frame": "challenge",
+        "show_toast": false,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "parent": "confluence:achievements/new_world",
+    "criteria": {
+        "confluence:pink_slime": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": [
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "type": "confluence:pink_slime"
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "requirements": [
+        [
+            "confluence:pink_slime"
+        ]
+    ]
+}

src/main/resources/data/confluence/advancements/achievements/slippery_shinobi.json

@@ -0,0 +1,39 @@
+{
+    "display": {
+        "icon": {
+            "item": "confluence:slime_crown"
+        },
+        "title": {
+            "translate": "achievements.confluence.slippery_shinobi.title"
+        },
+        "description": {
+            "translate": "achievements.confluence.slippery_shinobi.description"
+        },
+        "frame": "challenge",
+        "show_toast": false,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "parent": "confluence:achievements/new_world",
+    "criteria": {
+        "confluence:king_slime": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": [
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "type": "confluence:king_slime"
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "requirements": [
+        [
+            "confluence:king_slime"
+        ]
+    ]
+}