From 1ba1aa3cb599928978e82de63b87617d07cf141d Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sun, 6 Oct 2024 18:08:40 +0200 Subject: [PATCH] made all advancements visible from the start This makes it easier to discover all anomalies and additions of the mod --- .../minecraft/advancement/nec/got_ak47.json | 1 - .../advancement/nec/got_dirt_sword.json | 1 - .../nec/got_even_thicker_end_rod.json | 1 - .../advancement/nec/got_fletching_stairs.json | 1 - .../advancement/nec/got_java_block.json | 1 - .../nec/got_lapis_golden_apple.json | 1 - .../advancement/nec/got_pocket_block.json | 1 - .../advancement/nec/got_thick_end_rod.json | 1 - .../advancement/nec/got_thicker_end_rod.json | 1 - .../advancement/nec/use_campfire_as_fuel.json | 2 +- .../me/jonasjones/nec/datagen/NecDataGen.java | 22 +++++++++---------- src/main/resources/assets/nec/lang/de_de.json | 2 +- src/main/resources/assets/nec/lang/en_us.json | 2 +- 13 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/main/generated/data/minecraft/advancement/nec/got_ak47.json b/src/main/generated/data/minecraft/advancement/nec/got_ak47.json index a7ead47..c5e6d88 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_ak47.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_ak47.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.ak_47.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:ak_47" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_dirt_sword.json b/src/main/generated/data/minecraft/advancement/nec/got_dirt_sword.json index b4fe970..076991e 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_dirt_sword.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_dirt_sword.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.dirt_sword.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:dirt_sword" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_even_thicker_end_rod.json b/src/main/generated/data/minecraft/advancement/nec/got_even_thicker_end_rod.json index bdd86bf..276c32c 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_even_thicker_end_rod.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_even_thicker_end_rod.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.even_thicker_end_rod.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:even_thicker_end_rod" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_fletching_stairs.json b/src/main/generated/data/minecraft/advancement/nec/got_fletching_stairs.json index 1c8b7ee..765881e 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_fletching_stairs.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_fletching_stairs.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.fletching_stairs.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:fletching_stairs" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_java_block.json b/src/main/generated/data/minecraft/advancement/nec/got_java_block.json index 5652213..c6c5b51 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_java_block.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_java_block.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.java_block.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:java_block" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json b/src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json index c519311..980680a 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.lapis_golden_apple.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:lapis_golden_apple" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_pocket_block.json b/src/main/generated/data/minecraft/advancement/nec/got_pocket_block.json index ec280a3..7902961 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_pocket_block.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_pocket_block.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.pocket_block.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:pocket_block" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_thick_end_rod.json b/src/main/generated/data/minecraft/advancement/nec/got_thick_end_rod.json index 3369756..6ad3b1b 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_thick_end_rod.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_thick_end_rod.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.thick_end_rod.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:thick_end_rod" diff --git a/src/main/generated/data/minecraft/advancement/nec/got_thicker_end_rod.json b/src/main/generated/data/minecraft/advancement/nec/got_thicker_end_rod.json index 77afd97..d4122ba 100644 --- a/src/main/generated/data/minecraft/advancement/nec/got_thicker_end_rod.json +++ b/src/main/generated/data/minecraft/advancement/nec/got_thicker_end_rod.json @@ -16,7 +16,6 @@ "description": { "translate": "advancements.nec.thicker_end_rod.description" }, - "hidden": true, "icon": { "count": 1, "id": "nec:thicker_end_rod" diff --git a/src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json b/src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json index b03f999..26479b0 100644 --- a/src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json +++ b/src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json @@ -16,7 +16,7 @@ "description": { "translate": "advancements.nec.use_campfire_as_fuel.description" }, - "hidden": true, + "frame": "challenge", "icon": { "count": 1, "id": "minecraft:campfire" diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index db60f67..842ed9a 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -61,7 +61,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .rewards(AdvancementRewards.Builder.experience(1000)) .criterion("got_dirt_sword", InventoryChangedCriterion.Conditions.items(DIRT_SWORD_ITEM)) @@ -76,7 +76,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_ak47", InventoryChangedCriterion.Conditions.items(AK47_ITEM)) .build(consumer, "nec" + "/got_ak47"); @@ -90,7 +90,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_pocket_block", InventoryChangedCriterion.Conditions.items(POCKET_BLOCK_ITEM)) .build(consumer, "nec" + "/got_pocket_block"); @@ -104,7 +104,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_java_block", InventoryChangedCriterion.Conditions.items(JAVA_BLOCK)) .build(consumer, "nec" + "/got_java_block"); @@ -132,7 +132,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_fletching_stairs", InventoryChangedCriterion.Conditions.items(FLETCHING_STAIRS_TIEM)) .build(consumer, "nec" + "/got_fletching_stairs"); @@ -146,7 +146,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_thick_end_rod", InventoryChangedCriterion.Conditions.items(THICK_END_ROD_ITEM)) .build(consumer, "nec" + "/got_thick_end_rod"); @@ -160,7 +160,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_thicker_end_rod", InventoryChangedCriterion.Conditions.items(THICKER_END_ROD_ITEM)) .build(consumer, "nec" + "/got_thicker_end_rod"); @@ -174,7 +174,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_even_thicker_end_rod", InventoryChangedCriterion.Conditions.items(EVEN_THICKER_END_ROD_ITEM)) .build(consumer, "nec" + "/got_even_thicker_end_rod"); @@ -188,7 +188,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { AdvancementFrame.TASK, true, true, - true + false ) .criterion("got_lapis_golden_apple", InventoryChangedCriterion.Conditions.items(LAPIS_GOLDEN_APPLE_ITEM)) .build(consumer, "nec" + "/got_lapis_golden_apple"); @@ -199,10 +199,10 @@ public class NecDataGen implements DataGeneratorEntrypoint { Text.translatable("advancements.nec.use_campfire_as_fuel.title"), Text.translatable("advancements.nec.use_campfire_as_fuel.description"), null, // children to parent advancements don't need a background set - AdvancementFrame.TASK, + AdvancementFrame.CHALLENGE, true, true, - true + false ) .criterion("use_campfire_as_fuel", InventoryChangedCriterion.Conditions.items(Items.CAMPFIRE)) .build(consumer, "nec" + "/use_campfire_as_fuel"); diff --git a/src/main/resources/assets/nec/lang/de_de.json b/src/main/resources/assets/nec/lang/de_de.json index 5e79022..ea292b9 100644 --- a/src/main/resources/assets/nec/lang/de_de.json +++ b/src/main/resources/assets/nec/lang/de_de.json @@ -12,7 +12,7 @@ "advancements.nec.pocket_block.title": "Es ist einfach Grundgestein", "advancements.nec.java_block.description": "Crafte einen Java Block", "advancements.nec.java_block.title": "Du Depp, das ist falsch!", - "advancements.nec.root.description": "Was? Du dachtest, dass ich dir einen Blick auf die Fortschritte geben würde?", + "advancements.nec.root.description": "Schau dir diese nicht an, wenn du nicht gespoilert werden willst", "advancements.nec.root.title": "Not Enough Cursedness", "advancements.nec.thick_end_rod.title": "Du bist dicker als sonst!", "advancements.nec.thick_end_rod.description": "Bekomme einen dicken Endstab", diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index bc4179c..bcf38d6 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -12,7 +12,7 @@ "advancements.nec.pocket_block.title": "It's basically Bedrock", "advancements.nec.java_block.description": "Craft a Java Block", "advancements.nec.java_block.title": "You Idiot, this is wrong!", - "advancements.nec.root.description": "What? You thought that I would give you a look at the achievements?", + "advancements.nec.root.description": "Don't look at these if You don't want to get spoiled", "advancements.nec.root.title": "Not Enough Cursedness", "advancements.nec.thick_end_rod.title": "You're thicker than usual!", "advancements.nec.thick_end_rod.description": "Obtain a Thick End Rod",