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 new file mode 100644 index 0000000..3d3b90d --- /dev/null +++ b/src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:nec/root", + "criteria": { + "got_fletching_stairs": { + "conditions": { + "items": [ + { + "items": "nec:lapis_golden_apple" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "description": { + "translate": "advancements.nec.lapis_golden_apple.description" + }, + "hidden": true, + "icon": { + "count": 1, + "id": "nec:lapis_golden_apple" + }, + "title": { + "translate": "advancements.nec.lapis_golden_apple.title" + } + }, + "requirements": [ + [ + "got_fletching_stairs" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancement/nec/root.json b/src/main/generated/data/minecraft/advancement/nec/root.json index c32809b..877a6a2 100644 --- a/src/main/generated/data/minecraft/advancement/nec/root.json +++ b/src/main/generated/data/minecraft/advancement/nec/root.json @@ -6,12 +6,13 @@ }, "display": { "announce_to_chat": false, + "background": "nec:textures/gui/advancements/backgrounds/nec.png", "description": { "translate": "advancements.nec.root.description" }, "icon": { "count": 1, - "id": "minecraft:dirt" + "id": "nec:dirt_sword" }, "show_toast": false, "title": { diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index dd5907f..829d6db 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -14,10 +14,11 @@ import net.minecraft.advancement.criterion.TickCriterion; import net.minecraft.item.Items; import net.minecraft.registry.RegistryWrapper; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import static me.jonasjones.nec.NotEnoughCursedness.MOD_ID; import static me.jonasjones.nec.block.ModBlocks.*; -import static me.jonasjones.nec.item.ModItems.AK47_ITEM; -import static me.jonasjones.nec.item.ModItems.DIRT_SWORD_ITEM; +import static me.jonasjones.nec.item.ModItems.*; public class NecDataGen implements DataGeneratorEntrypoint { @Override @@ -36,10 +37,10 @@ public class NecDataGen implements DataGeneratorEntrypoint { public void generateAdvancement(RegistryWrapper.WrapperLookup registryLookup, Consumer consumer) { AdvancementEntry rootAdvancement = Advancement.Builder.create() .display( - Items.DIRT, // The display icon + DIRT_SWORD_ITEM, // The display icon Text.translatable("advancements.nec.root.title"), // The title Text.translatable("advancements.nec.root.description"), // The description//new Identifier("textures/gui/advancements/backgrounds/adventure.png","textures/gui/advancements/backgrounds/adventure.png"), // Background image used - null, + Identifier.of(MOD_ID, "textures/gui/advancements/backgrounds/nec.png"), // Background image used AdvancementFrame.TASK, // Options: TASK, CHALLENGE, GOAL false, // Show toast top right false, // Announce to chat @@ -147,6 +148,20 @@ public class NecDataGen implements DataGeneratorEntrypoint { ) .criterion("got_thick_end_rod", InventoryChangedCriterion.Conditions.items(THICK_END_ROD_ITEM)) .build(consumer, "nec" + "/got_thick_end_rod"); + + AdvancementEntry gotLapisGoldenAppleAdvancement = Advancement.Builder.create().parent(rootAdvancement) + .display( + LAPIS_GOLDEN_APPLE_ITEM, + Text.translatable("advancements.nec.lapis_golden_apple.title"), + Text.translatable("advancements.nec.lapis_golden_apple.description"), + null, // children to parent advancements don't need a background set + AdvancementFrame.TASK, + true, + true, + true + ) + .criterion("got_lapis_golden_apple", InventoryChangedCriterion.Conditions.items(LAPIS_GOLDEN_APPLE_ITEM)) + .build(consumer, "nec" + "/got_lapis_golden_apple"); } } } \ No newline at end of file diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index dba5896..a864521 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -1,6 +1,9 @@ package me.jonasjones.nec.item; import me.jonasjones.nec.item.materials.DirtToolMaterial; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.Item; import net.minecraft.item.SwordItem; import net.minecraft.registry.Registry; @@ -17,6 +20,7 @@ public class ModItems { public static Item CHAINMAIL_ITEM; public static Item AK47_ITEM; public static Item HELMET_ON_A_STICK_ITEM; + public static Item LAPIS_GOLDEN_APPLE_ITEM; public static void register() { SwordItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, new Item.Settings()); @@ -39,5 +43,8 @@ public class ModItems { Item HELMET_ON_A_STICK = new Item(new Item.Settings()); HELMET_ON_A_STICK_ITEM = Registry.register(ITEM, Identifier.of(MOD_ID, "helmet_on_a_stick"), HELMET_ON_A_STICK); + + Item LAPIS_GOLDEN_APPLE = new Item(new Item.Settings().food(new FoodComponent.Builder().saturationModifier(0.3f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200, 1), 1.0f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400), 1.0f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 6000), 1.0f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 6000), 1.0f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400), 1.0f).statusEffect(new StatusEffectInstance(StatusEffects.SATURATION, 2400), 1.0f).build())); + LAPIS_GOLDEN_APPLE_ITEM = Registry.register(ITEM, Identifier.of(MOD_ID, "lapis_golden_apple"), LAPIS_GOLDEN_APPLE); } } diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index f369182..0d7f1b5 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -56,6 +56,7 @@ public class ModRegistries { entries.add(new ItemStack(ModItems.DIRT_SWORD_ITEM)); entries.add(new ItemStack(ModItems.AK47_ITEM)); entries.add(new ItemStack(ModItems.HELMET_ON_A_STICK_ITEM)); + entries.add(new ItemStack(ModItems.LAPIS_GOLDEN_APPLE_ITEM)); })) .build(); diff --git a/src/main/resources/assets/nec/lang/de_de.json b/src/main/resources/assets/nec/lang/de_de.json index cf908ee..a34f960 100644 --- a/src/main/resources/assets/nec/lang/de_de.json +++ b/src/main/resources/assets/nec/lang/de_de.json @@ -16,6 +16,8 @@ "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", + "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", "block.nec.blaze_block": "Lohenblock", "block.nec.cursed_dirt_stairs": "Verfluchte Erdtreppe", @@ -36,6 +38,7 @@ "item.nec.letter": "Brief", "item.nec.negative_flint": "Negativer Feuerstein", "item.nec.steel": "Zeug", + "item.nec.lapis_golden_apple": "Wenn du nicht genug Gold hast, also benutzt du Lapis stattdessen Goldener Apfel", "itemGroup.nec.not_enough_cursedness": "Nicht Genug Verfluchtheit", "text.nec.splashscreen": "Not Enough Cursedness" diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 7a05b3a..4ce19f7 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -16,6 +16,8 @@ "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", + "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", "block.nec.blaze_block": "Blaze Block", "block.nec.cursed_dirt_stairs": "Cursed Dirt Stairs", @@ -36,6 +38,7 @@ "item.nec.letter": "Letter", "item.nec.negative_flint": "Negative Flint", "item.nec.steel": "Steel", + "item.nec.lapis_golden_apple": "When You Don't Have Enough Gold So You Use Lapis Instead Golden Apple", "itemGroup.nec.not_enough_cursedness": "Not Enough Cursedness", "text.nec.splashscreen": "Not Enough Cursedness" diff --git a/src/main/resources/assets/nec/models/item/lapis_golden_apple.json b/src/main/resources/assets/nec/models/item/lapis_golden_apple.json new file mode 100644 index 0000000..7679763 --- /dev/null +++ b/src/main/resources/assets/nec/models/item/lapis_golden_apple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "nec:item/lapis_golden_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nec/textures/gui/advancements/backgrounds/nec.png b/src/main/resources/assets/nec/textures/gui/advancements/backgrounds/nec.png new file mode 100644 index 0000000..e8446d6 Binary files /dev/null and b/src/main/resources/assets/nec/textures/gui/advancements/backgrounds/nec.png differ diff --git a/src/main/resources/assets/nec/textures/item/lapis_golden_apple.png b/src/main/resources/assets/nec/textures/item/lapis_golden_apple.png new file mode 100644 index 0000000..8f6456e Binary files /dev/null and b/src/main/resources/assets/nec/textures/item/lapis_golden_apple.png differ diff --git a/src/main/resources/data/nec/recipe/lapis_golden_apple.json b/src/main/resources/data/nec/recipe/lapis_golden_apple.json new file mode 100644 index 0000000..77c1079 --- /dev/null +++ b/src/main/resources/data/nec/recipe/lapis_golden_apple.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "GAL", + "LLL" + ], + "key": { + "G": { + "item": "minecraft:gold_ingot" + }, + "L": { + "item": "minecraft:lapis_lazuli" + }, + "A": { + "item": "minecraft:apple" + } + }, + "result": { + "id": "nec:lapis_golden_apple" + } +} \ No newline at end of file