From 7b54f22926d633fa15f96ff8a97928f7193ce399 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sun, 6 Oct 2024 17:58:17 +0200 Subject: [PATCH] added campfire as infinite fuel --- .../advancement/nec/use_campfire_as_fuel.json | 34 +++++++++++++++++++ .../me/jonasjones/nec/datagen/NecDataGen.java | 16 +++++++++ src/main/resources/assets/nec/lang/de_de.json | 4 +++ src/main/resources/assets/nec/lang/en_us.json | 2 ++ 4 files changed, 56 insertions(+) create mode 100644 src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json 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 new file mode 100644 index 0000000..b03f999 --- /dev/null +++ b/src/main/generated/data/minecraft/advancement/nec/use_campfire_as_fuel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:nec/root", + "criteria": { + "use_campfire_as_fuel": { + "conditions": { + "items": [ + { + "items": "minecraft:campfire" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "description": { + "translate": "advancements.nec.use_campfire_as_fuel.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "minecraft:campfire" + }, + "title": { + "translate": "advancements.nec.use_campfire_as_fuel.title" + } + }, + "requirements": [ + [ + "use_campfire_as_fuel" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index cd262c8..db60f67 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -10,6 +10,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import net.minecraft.advancement.criterion.InventoryChangedCriterion; +import net.minecraft.advancement.criterion.RecipeCraftedCriterion; +import net.minecraft.advancement.criterion.RecipeUnlockedCriterion; import net.minecraft.advancement.criterion.TickCriterion; import net.minecraft.item.Items; import net.minecraft.registry.RegistryWrapper; @@ -190,6 +192,20 @@ public class NecDataGen implements DataGeneratorEntrypoint { ) .criterion("got_lapis_golden_apple", InventoryChangedCriterion.Conditions.items(LAPIS_GOLDEN_APPLE_ITEM)) .build(consumer, "nec" + "/got_lapis_golden_apple"); + + AdvancementEntry useCampfireAsFuelAdvancement = Advancement.Builder.create().parent(rootAdvancement) + .display( + Items.CAMPFIRE, + 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, + true, + true, + true + ) + .criterion("use_campfire_as_fuel", InventoryChangedCriterion.Conditions.items(Items.CAMPFIRE)) + .build(consumer, "nec" + "/use_campfire_as_fuel"); } } } \ No newline at end of file diff --git a/src/main/resources/assets/nec/lang/de_de.json b/src/main/resources/assets/nec/lang/de_de.json index e6f451e..fe45333 100644 --- a/src/main/resources/assets/nec/lang/de_de.json +++ b/src/main/resources/assets/nec/lang/de_de.json @@ -22,6 +22,8 @@ "advancements.nec.even_thicker_end_rod.description": "Bekomme einen Noch Dickeren Endstab", "advancements.nec.lapis_golden_apple.title": "Verdammt, du bist geizig!", "advancements.nec.lapis_golden_apple.description": "Crafte einen Wenn du nicht genug Gold hast, also benutzt du Lapis stattdessen Goldener Apfel", + "advancements.nec.use_campfire_as_fuel.title": "Die Lösung für alle Energieprobleme gefunden!", + "advancements.nec.use_campfire_as_fuel.description": "Benutze ein Lagerfeuer als Brennstoff", "block.nec.blaze_block": "Lohenblock", "block.nec.cursed_dirt_stairs": "Verfluchte Erdtreppe", @@ -35,6 +37,8 @@ "block.nec.java_block": "Javablock", "block.nec.pocket_block": "Pocketblock", "block.nec.thick_end_rod": "Dicker Endstab", + "block.nec.thicker_end_rod": "Dickerer Endstab", + "block.nec.even_thicker_end_rod": "Noch Dickerer Endstab", "item.nec.ak_47": "AK-47", "item.nec.chainmail": "Kettenbrief", "item.nec.dirt_sword": "Erdschwert", diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index e208ad3..0ec99d6 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -22,6 +22,8 @@ "advancements.nec.even_thicker_end_rod.description": "Obtain an Even Thicker End Rod", "advancements.nec.lapis_golden_apple.title": "Damn You're cheap!", "advancements.nec.lapis_golden_apple.description": "Craft a When You Don't Have Enough Gold So You Use Lapis Instead Golden Apple", + "advancements.nec.use_campfire_as_fuel.title": "Found the solution to all energy problems!", + "advancements.nec.use_campfire_as_fuel.description": "Use a Campfire as fuel", "block.nec.blaze_block": "Blaze Block", "block.nec.cursed_dirt_stairs": "Cursed Dirt Stairs",