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 276c32c..ae4eeec 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 @@ -13,13 +13,16 @@ } }, "display": { + "announce_to_chat": false, "description": { "translate": "advancements.nec.even_thicker_end_rod.description" }, + "frame": "goal", "icon": { "count": 1, "id": "nec:even_thicker_end_rod" }, + "show_toast": false, "title": { "translate": "advancements.nec.even_thicker_end_rod.title" } 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 6ad3b1b..147c641 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 @@ -13,6 +13,7 @@ } }, "display": { + "announce_to_chat": false, "description": { "translate": "advancements.nec.thick_end_rod.description" }, @@ -20,6 +21,7 @@ "count": 1, "id": "nec:thick_end_rod" }, + "show_toast": false, "title": { "translate": "advancements.nec.thick_end_rod.title" } 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 d4122ba..cfec4b3 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 @@ -13,6 +13,7 @@ } }, "display": { + "announce_to_chat": false, "description": { "translate": "advancements.nec.thicker_end_rod.description" }, @@ -20,6 +21,7 @@ "count": 1, "id": "nec:thicker_end_rod" }, + "show_toast": false, "title": { "translate": "advancements.nec.thicker_end_rod.title" } diff --git a/src/main/generated/data/minecraft/advancement/nec/polish_deepslate_beacon_base.json b/src/main/generated/data/minecraft/advancement/nec/polish_deepslate_beacon_base.json new file mode 100644 index 0000000..2032a1b --- /dev/null +++ b/src/main/generated/data/minecraft/advancement/nec/polish_deepslate_beacon_base.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:nec/tnt_beacon_base", + "criteria": { + "polish_deepslate_beacon_base": { + "conditions": { + "items": [ + { + "items": "minecraft:polished_deepslate" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.nec.polish_deepslate_beacon_base.description" + }, + "frame": "goal", + "icon": { + "count": 1, + "id": "minecraft:beacon" + }, + "title": { + "translate": "advancements.nec.polish_deepslate_beacon_base.title" + } + }, + "requirements": [ + [ + "polish_deepslate_beacon_base" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancement/nec/tnt_beacon_base.json b/src/main/generated/data/minecraft/advancement/nec/tnt_beacon_base.json new file mode 100644 index 0000000..d5d0e72 --- /dev/null +++ b/src/main/generated/data/minecraft/advancement/nec/tnt_beacon_base.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:nec/root", + "criteria": { + "tnt_beacon_base": { + "conditions": { + "items": [ + { + "items": "minecraft:tnt" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.nec.tnt_beacon_base.description" + }, + "icon": { + "count": 1, + "id": "minecraft:beacon" + }, + "title": { + "translate": "advancements.nec.tnt_beacon_base.title" + } + }, + "requirements": [ + [ + "tnt_beacon_base" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file 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 26479b0..311c06d 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 @@ -13,6 +13,7 @@ } }, "display": { + "announce_to_chat": false, "description": { "translate": "advancements.nec.use_campfire_as_fuel.description" }, diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index 842ed9a..a865aa0 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -144,8 +144,8 @@ public class NecDataGen implements DataGeneratorEntrypoint { Text.translatable("advancements.nec.thick_end_rod.description"), null, // children to parent advancements don't need a background set AdvancementFrame.TASK, - true, - true, + false, + false, false ) .criterion("got_thick_end_rod", InventoryChangedCriterion.Conditions.items(THICK_END_ROD_ITEM)) @@ -158,8 +158,8 @@ public class NecDataGen implements DataGeneratorEntrypoint { Text.translatable("advancements.nec.thicker_end_rod.description"), null, // children to parent advancements don't need a background set AdvancementFrame.TASK, - true, - true, + false, + false, false ) .criterion("got_thicker_end_rod", InventoryChangedCriterion.Conditions.items(THICKER_END_ROD_ITEM)) @@ -171,9 +171,9 @@ public class NecDataGen implements DataGeneratorEntrypoint { Text.translatable("advancements.nec.even_thicker_end_rod.title"), Text.translatable("advancements.nec.even_thicker_end_rod.description"), null, // children to parent advancements don't need a background set - AdvancementFrame.TASK, - true, - true, + AdvancementFrame.GOAL, + false, + false, false ) .criterion("got_even_thicker_end_rod", InventoryChangedCriterion.Conditions.items(EVEN_THICKER_END_ROD_ITEM)) @@ -201,11 +201,39 @@ public class NecDataGen implements DataGeneratorEntrypoint { null, // children to parent advancements don't need a background set AdvancementFrame.CHALLENGE, true, - true, + false, false ) .criterion("use_campfire_as_fuel", InventoryChangedCriterion.Conditions.items(Items.CAMPFIRE)) .build(consumer, "nec" + "/use_campfire_as_fuel"); + + AdvancementEntry tntBeaconBaseAdvancement = Advancement.Builder.create().parent(rootAdvancement) + .display( + Items.BEACON, + Text.translatable("advancements.nec.tnt_beacon_base.title"), + Text.translatable("advancements.nec.tnt_beacon_base.description"), + null, // children to parent advancements don't need a background set + AdvancementFrame.TASK, + true, + false, + false + ) + .criterion("tnt_beacon_base", InventoryChangedCriterion.Conditions.items(Items.TNT)) + .build(consumer, "nec" + "/tnt_beacon_base"); + + AdvancementEntry polishDeepslateBeaconBaseAdvancement = Advancement.Builder.create().parent(tntBeaconBaseAdvancement) + .display( + Items.BEACON, + Text.translatable("advancements.nec.polish_deepslate_beacon_base.title"), + Text.translatable("advancements.nec.polish_deepslate_beacon_base.description"), + null, // children to parent advancements don't need a background set + AdvancementFrame.GOAL, + true, + false, + false + ) + .criterion("polish_deepslate_beacon_base", InventoryChangedCriterion.Conditions.items(Items.POLISHED_DEEPSLATE)) + .build(consumer, "nec" + "/polish_deepslate_beacon_base"); } } } \ No newline at end of file diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 3ee0622..a62162f 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -3,7 +3,7 @@ "advancements.nec.ak_47.title": "Congrats, You're f*cking useless!", "advancements.nec.dirt_sword.description": "You are now dirty", "advancements.nec.dirt_sword.title": "A Floppy Sword", - "advancements.nec.even_thicker_end_rod.title": "This one is the thickest!", + "advancements.nec.even_thicker_end_rod.title": "The Endest Rod!", "advancements.nec.even_thicker_end_rod.description": "Obtain an Even Thicker End Rod", "advancements.nec.fletching_stairs.description": "Craft some Fletching Stairs", "advancements.nec.fletching_stairs.title": "Finally useful!",