From 7be2d613ab41e504bba3e9de9a0e8a39644d7b1c Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:03:05 +0200 Subject: [PATCH] Advancement tweaks - Change lava diving advancement from hidden to challenge, as it is an actual intended player ability since 0.5.1 - Changed title of speed controller advancement --- src/generated/resources/.cache/cache | 6 +++--- .../resources/assets/create/lang/en_ud.json | 4 ++-- .../resources/assets/create/lang/en_us.json | 4 ++-- .../data/create/advancements/diving_suit_lava.json | 6 +++--- .../foundation/advancement/AllAdvancements.java | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4da18fff6..26f86bc80 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -582,8 +582,8 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -685e03217b2cb5ad93540a6a091c7e327275b560 assets/create/lang/en_ud.json -60f35caa911c99db04d33db70e62d19d2bdd9ccb assets/create/lang/en_us.json +fb5edeb33c43fb1aa36cfe84e376da287ae23b51 assets/create/lang/en_ud.json +eac32f8a9ed3c1b652916191c96c0ee446fd97ca assets/create/lang/en_us.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -2325,7 +2325,7 @@ d53e397aef8dc2fc674f6f1c7a059a17678ec56c data/create/advancements/cuckoo_clock.j b30ed29c6e69d0964e810a470a8725bf9496e9b5 data/create/advancements/display_board_0.json 92fdb65633cf93b7aca5f359abeb5a9ec715ae40 data/create/advancements/display_link.json 0c6d98542523d90ff3848c07ee6fd4963c85ed2c data/create/advancements/diving_suit.json -50d2f42e9d63b5dff964c60800997ebd26a736f6 data/create/advancements/diving_suit_lava.json +42ef626c83ed8dc74a4d59a46d8ff1e212835432 data/create/advancements/diving_suit_lava.json ebf21bebdeb29fc7f1ffa078123256241921681f data/create/advancements/drain.json f87f17fb29afda4fc46a81b5c3967bd21c068e36 data/create/advancements/ejector_maxed.json 0c19f535f04e653e0263ab9c3e9f04a203fa6765 data/create/advancements/encased_fan.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 1ecee4c8b..03f2201c0 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -60,7 +60,7 @@ "advancement.create.diving_suit": "s\u0265\u0287d\u01DD\u15E1 \u01DD\u0265\u0287 \u0279o\u025F \u028Ep\u0250\u01DD\u1D1A", "advancement.create.diving_suit.desc": "\u0279\u01DD\u0287\u0250\u028D o\u0287u\u0131 d\u026Fn\u0638 u\u01DD\u0265\u0287 '\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186 \u0250 pu\u0250 \u0287\u01DD\u026F\u05DF\u01DDH bu\u0131\u028C\u0131\u15E1 \u0250 d\u0131nb\u018E", "advancement.create.diving_suit_lava": "s\u0279\u01DDp\u0131\u0279\u0287S \u01DD\u0265\u0287 \u0265\u0287\u0131\u028D bu\u0131\u026F\u026F\u0131\u028DS", - "advancement.create.diving_suit_lava.desc": ")\u0287u\u01DD\u026F\u01DD\u0254u\u0250\u028Cp\u2C6F u\u01DDpp\u0131H(\u3125\u00A7\n\u0279\u0250\u01DDb bu\u0131\u028C\u0131p \u0279no\u028E \u0265\u0287\u0131\u028D \u0250\u028C\u0250\u05DF u\u0131 \u01DD\u028C\u0131p \u0250 \u01DD\u029E\u0250\u0287 o\u0287 \u0287d\u026F\u01DD\u0287\u0287\u2C6F", + "advancement.create.diving_suit_lava.desc": "\u0279\u0250\u01DDb bu\u0131\u028C\u0131p \u01DD\u0287\u0131\u0279\u01DD\u0265\u0287\u01DDu \u0279no\u028E \u0265\u0287\u0131\u028D \u0250\u028C\u0250\u05DF u\u0131 \u01DD\u028C\u0131p \u0250 \u01DD\u029E\u0250\u0287 o\u0287 \u0287d\u026F\u01DD\u0287\u0287\u2C6F", "advancement.create.drain": "bu\u0131u\u0131\u0250\u0279\u15E1 \u01DD\u05DFq\u026Fn\u27D8", "advancement.create.drain.desc": "u\u0131\u0250\u0279\u15E1 \u026F\u01DD\u0287I u\u0250 \u028Eq p\u01DD\u0131\u0287d\u026F\u01DD \u01DDq \u026F\u01DD\u0287\u0131 bu\u0131u\u0131\u0250\u0287uo\u0254-p\u0131n\u05DF\u025F \u0250 \u0265\u0254\u0287\u0250M", "advancement.create.ejector_maxed": "uo\u0131d\u026F\u0250\u0265\u0186 p\u0279\u0250oqbu\u0131\u0279dS", @@ -137,7 +137,7 @@ "advancement.create.self_deploying.desc": "\u025F\u05DF\u01DDs\u0287\u0131 \u025Fo \u0287uo\u0279\u025F u\u0131 s\u029E\u0254\u0250\u0279\u0287 s\u01DD\u0254\u0250\u05DFd \u0287\u0250\u0265\u0287 uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u0250 \u01DD\u0287\u0250\u01DD\u0279\u0186", "advancement.create.shifting_gears": "s\u0279\u0250\u01DD\u2141 bu\u0131\u0287\u025F\u0131\u0265S", "advancement.create.shifting_gears.desc": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0279no\u028E \u025Fo p\u01DD\u01DDds \u01DD\u0265\u0287 \u01DDbu\u0250\u0265\u0254 o\u0287 no\u028E bu\u0131\u028Do\u05DF\u05DF\u0250 '\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u05DF\u05DF\u0250\u026FS \u0250 o\u0287 \u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 \u0250 \u0287\u0254\u01DDuuo\u0186", - "advancement.create.speed_controller": "\u00A1\u026F\u0131H \u01DD\u0287\u0250H s\u0279\u01DD\u01DDu\u0131bu\u018E", + "advancement.create.speed_controller": "\u00A1\u029E\u0254\u0131\u0279\u0287 \u01DD\u05DFd\u026F\u0131s s\u0131\u0265\u0287 \u01DD\u0287\u0250\u0265 s\u0279\u01DD\u01DDu\u0131bu\u018E", "advancement.create.speed_controller.desc": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u01DDdS uo\u0131\u0287\u0250\u0287o\u1D1A \u0250 \u0265\u0287\u0131\u028D uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0279no\u028E \u01DDun\u0287-\u01DDu\u0131\u2132", "advancement.create.spout": "\u0265soo\u05DFdS", "advancement.create.spout.desc": "\u0287nodS \u0250 \u028Eq p\u01DD\u05DF\u05DF\u0131\u025F \u01DDq \u026F\u01DD\u0287\u0131 bu\u0131u\u0131\u0250\u0287uo\u0254-p\u0131n\u05DF\u025F \u0250 \u0265\u0254\u0287\u0250M", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 60b491e30..1564913b5 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -60,7 +60,7 @@ "advancement.create.diving_suit": "Ready for the Depths", "advancement.create.diving_suit.desc": "Equip a Diving Helmet and a Copper Backtank, then jump into water", "advancement.create.diving_suit_lava": "Swimming with the Striders", - "advancement.create.diving_suit_lava.desc": "Attempt to take a dive in lava with your diving gear\n\u00A77(Hidden Advancement)", + "advancement.create.diving_suit_lava.desc": "Attempt to take a dive in lava with your netherite diving gear", "advancement.create.drain": "Tumble Draining", "advancement.create.drain.desc": "Watch a fluid-containing item be emptied by an Item Drain", "advancement.create.ejector_maxed": "Springboard Champion", @@ -137,7 +137,7 @@ "advancement.create.self_deploying.desc": "Create a Minecart Contraption that places tracks in front of itself", "advancement.create.shifting_gears": "Shifting Gears", "advancement.create.shifting_gears.desc": "Connect a Large Cogwheel to a Small Cogwheel, allowing you to change the speed of your Contraption", - "advancement.create.speed_controller": "Engineers Hate Him!", + "advancement.create.speed_controller": "Engineers hate this simple trick!", "advancement.create.speed_controller.desc": "Fine-tune your Contraption with a Rotation Speed Controller", "advancement.create.spout": "Sploosh", "advancement.create.spout.desc": "Watch a fluid-containing item be filled by a Spout", diff --git a/src/generated/resources/data/create/advancements/diving_suit_lava.json b/src/generated/resources/data/create/advancements/diving_suit_lava.json index 0c888be2c..69dfcc5ce 100644 --- a/src/generated/resources/data/create/advancements/diving_suit_lava.json +++ b/src/generated/resources/data/create/advancements/diving_suit_lava.json @@ -1,8 +1,8 @@ { - "parent": "create:backtank", + "parent": "create:foods", "display": { "icon": { - "item": "create:copper_diving_helmet", + "item": "create:netherite_diving_helmet", "nbt": "{Damage:0}" }, "title": { @@ -15,7 +15,7 @@ "frame": "goal", "show_toast": true, "announce_to_chat": true, - "hidden": true + "hidden": false }, "criteria": { "0": { diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index 7a7126898..bef957bf2 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -328,15 +328,15 @@ public class AllAdvancements implements DataProvider { .description("Create Chocolate Glazed Berries, a Honeyed Apple, and a Sweet Roll all from the same Spout") .after(STEAM_ENGINE_MAXED) .special(EXPERT)), + + DIVING_SUIT_LAVA = create("diving_suit_lava", b -> b.icon(AllItems.NETHERITE_DIVING_HELMET) + .title("Swimming with the Striders") + .description("Attempt to take a dive in lava with your netherite diving gear") + .after(FOODS) + .special(EXPERT)), // Copper - Hidden - DIVING_SUIT_LAVA = create("diving_suit_lava", b -> b.icon(AllItems.COPPER_DIVING_HELMET) - .title("Swimming with the Striders") - .description("Attempt to take a dive in lava with your diving gear") - .after(BACKTANK) - .special(SECRET)), - CHAINED_DRAIN = create("chained_drain", b -> b.icon(AllBlocks.ITEM_DRAIN) .title("On a Roll") .description("Watch an item move across a row of Item Drains") @@ -388,7 +388,7 @@ public class AllAdvancements implements DataProvider { .special(NOISY)), SPEED_CONTROLLER = create("speed_controller", b -> b.icon(AllBlocks.ROTATION_SPEED_CONTROLLER) - .title("Engineers Hate Him!") + .title("Engineers hate this simple trick!") .description("Fine-tune your Contraption with a Rotation Speed Controller") .after(MECHANISM)),