From 65782201ca010071d672d10c9a7d5efff6e2a538 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 17:58:53 +0200 Subject: [PATCH 1/7] added lapis golden apple --- .../java/me/jonasjones/nec/item/ModItems.java | 7 +++++++ .../me/jonasjones/nec/util/ModRegistries.java | 2 ++ src/main/resources/assets/nec/lang/de_de.json | 3 +++ src/main/resources/assets/nec/lang/en_us.json | 3 +++ .../nec/models/item/lapis_golden_apple.json | 6 ++++++ .../nec/textures/item/lapis_golden_apple.png | Bin 0 -> 402 bytes 6 files changed, 21 insertions(+) create mode 100644 src/main/resources/assets/nec/models/item/lapis_golden_apple.json create mode 100644 src/main/resources/assets/nec/textures/item/lapis_golden_apple.png 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 fd1fc0c..0d7f1b5 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -46,6 +46,7 @@ public class ModRegistries { entries.add(new ItemStack(ModBlocks.JAVA_BLOCK)); entries.add(new ItemStack(ModBlocks.POCKET_BLOCK)); entries.add(new ItemStack(ModBlocks.FLETCHING_STAIRS_BLOCK)); + entries.add(new ItemStack(ModBlocks.THICK_END_ROD)); entries.add(new ItemStack(ModItems.STEEL_ITEM)); entries.add(new ItemStack(ModItems.NEGATIVE_FLINT_ITEM)); @@ -55,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 7aaf8a9..77c69c1 100644 --- a/src/main/resources/assets/nec/lang/de_de.json +++ b/src/main/resources/assets/nec/lang/de_de.json @@ -14,6 +14,8 @@ "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.title": "Not Enough Cursedness", + "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", @@ -33,6 +35,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 f90a099..ad1c8f7 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -14,6 +14,8 @@ "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.title": "Not Enough Cursedness", + "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", @@ -33,6 +35,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/item/lapis_golden_apple.png b/src/main/resources/assets/nec/textures/item/lapis_golden_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..8f6456e13f2f3d7e6ba7deb95dd3aac813c5c280 GIT binary patch literal 402 zcmV;D0d4+?P)B-o zR*FtAjA9X=NJSTjKC_q3V^l& zftrdu!>v0Hfd;5!I2gqRjvJ?f6-exnhAV_=h6#WSLIx<&B4ykEUrNyg#a5VNm_ZkT z{{MYvE?gf*7`*uUltF@98ti14^FcI-fA7%=3@>0L3{Vt_>$`#t0T~AN5|9nj{Q1cZ w6x%^^SW_0rE67&8etreaMRq!dQ^*wn0L{drgK?PewEzGB07*qoM6N<$g0rfin*aa+ literal 0 HcmV?d00001 From 3cd36101d30a6aaf0d9bc79560740f9b69243f60 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 17:59:04 +0200 Subject: [PATCH 2/7] added recipe for lapis golden apple --- .../data/nec/recipe/lapis_golden_apple.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/resources/data/nec/recipe/lapis_golden_apple.json 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 From bc147f372e02927ceb054fe673922f22a3d32b4f Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 18:00:16 +0200 Subject: [PATCH 3/7] added lapis golden apple achievement --- .../nec/got_lapis_golden_apple.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/generated/data/minecraft/advancement/nec/got_lapis_golden_apple.json 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 From dc4ad260eebe813ec97e420db81ff32c1538c265 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 18:13:22 +0200 Subject: [PATCH 4/7] added lapis golden apple advancement --- .../me/jonasjones/nec/datagen/NecDataGen.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index da725c1..871c6ed 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -16,8 +16,7 @@ import net.minecraft.registry.RegistryWrapper; import net.minecraft.text.Text; 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 @@ -133,6 +132,20 @@ public class NecDataGen implements DataGeneratorEntrypoint { ) .criterion("got_fletching_stairs", InventoryChangedCriterion.Conditions.items(FLETCHING_STAIRS_TIEM)) .build(consumer, "nec" + "/got_fletching_stairs"); + + 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_fletching_stairs", InventoryChangedCriterion.Conditions.items(LAPIS_GOLDEN_APPLE_ITEM)) + .build(consumer, "nec" + "/got_lapis_golden_apple"); } } } \ No newline at end of file From 8d9a7bd3f1eb7f22cf3ff5f28310a24126d68457 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 18:13:53 +0200 Subject: [PATCH 5/7] fixed and added advancement background --- .../me/jonasjones/nec/datagen/NecDataGen.java | 4 +++- .../gui/advancements/backgrounds/nec.png | Bin 0 -> 3605 bytes 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/nec/textures/gui/advancements/backgrounds/nec.png diff --git a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java index 871c6ed..e4469c8 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -14,7 +14,9 @@ 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.*; @@ -38,7 +40,7 @@ public class NecDataGen implements DataGeneratorEntrypoint { Items.DIRT, // 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 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 0000000000000000000000000000000000000000..e8446d69b88e56aad391ba022141411cc6ff4789 GIT binary patch literal 3605 zcmbtXc~BE~6kfy$41yG=dDO7TE27=mDe202SP0t8g9LV!vI zsz6#}g;wqq31>jZfC8Z?1S9uVgaj4{5Yi2#2~Hj9)Ru1l*x8w#x9|6k@B7~SrF?P1 zQB4J@0sw&8F(>$JB`rJuV#*5Al|tBn)wfZGwxc*El_*xVD(lBxbV)>l5=cUukplUw$C z+E>v|ZryS2ymk|n9j9_1o~|*AHX;r}mM$?hLms|hW5I8t7u&+U)-Ee;^DOXcx3YcO z$r3_)z?fCWWKz9Wx{C_|rJxCM1&RPrY={Tq^b{0sc z0t>uy%JKS>9K5c3?JDv&WR`v0Am8&mp|x>@e@MioAX#KG4f z0d@!+An>4Edax~?FGp8<>QHoGJK6gh?0^`4)Rzwz1Hz-D4noRJtkq?DjTBtU0#`$) zK}C7(cK-)0TF*I^t>@9QVpuGC3R)G!Tz`y1L7$UUeFzI8KcyN?RnI9`uD!A+2ojdwWl#a~u&3Cn9kuds>dCg7} zYc+7hMmzNS2b^6NdJBUtfnHdNAeoP2KYy?AgEbVsN*;Ok+x|qlRZPEeHU}R zqgL3RlS*5CRL!!U+bbQQtx0CPhYBZG7JX%s)dG8Jq;iYAtLu=YU(5Suz5*MiBLaiC zgsCU6qE0gp$n0`>Fw5=GJw=h86~!`EczvB#hvxPMF=08BPjw$^)WNo{zNMEutyEeA z8G6~2W%9g;HRe`o{v~V?tH3m5_Pm;@oc_EkIq(K++qbYZUN+O{@tD%DdpV8n62U-U zFQUM=fSkdNPPg)ujF;Rt)3g-LLTy7eXXuS7*qtf$7A)(mpH4{ zM3i^ zOHkzHXhE8qv=`kZ0dP9Ez5}__5pjw^k+Bskyw@O@1nb~5M<#FkhO;Qql`A~Hizg~# zM;uy_3a!P!4$K)#w<6C4aa|Ofn$4{&JtP8w>9ip%%HE@z+je2g8b5)Q>v9H}*0Slz z?${OUxd6c?t9;4lbO{ujlmi=n9~Bs=3fpL_ejpeFjf)9h)&Q9LunH*GJch{hGB6w@%gb4O i9(GsXa9F;!iM3RDUi|hEv`}`>1CBYIurIa6U;P7LJE$E1 literal 0 HcmV?d00001 From cdd8d1ab1be8deac006d2846f84947a1dd771bc8 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 18:19:33 +0200 Subject: [PATCH 6/7] fixed mod advancement group display icon --- src/main/generated/data/minecraft/advancement/nec/root.json | 3 ++- src/main/java/me/jonasjones/nec/datagen/NecDataGen.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 e4469c8..0f07193 100644 --- a/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java +++ b/src/main/java/me/jonasjones/nec/datagen/NecDataGen.java @@ -37,7 +37,7 @@ 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 Identifier.of(MOD_ID, "textures/gui/advancements/backgrounds/nec.png"), // Background image used From 22c91007db8e82d89e28b5e12f6fa274861c3fdd Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sat, 5 Oct 2024 18:24:24 +0200 Subject: [PATCH 7/7] removed forgotten line --- src/main/java/me/jonasjones/nec/util/ModRegistries.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/me/jonasjones/nec/util/ModRegistries.java b/src/main/java/me/jonasjones/nec/util/ModRegistries.java index 0d7f1b5..02a0526 100644 --- a/src/main/java/me/jonasjones/nec/util/ModRegistries.java +++ b/src/main/java/me/jonasjones/nec/util/ModRegistries.java @@ -46,7 +46,6 @@ public class ModRegistries { entries.add(new ItemStack(ModBlocks.JAVA_BLOCK)); entries.add(new ItemStack(ModBlocks.POCKET_BLOCK)); entries.add(new ItemStack(ModBlocks.FLETCHING_STAIRS_BLOCK)); - entries.add(new ItemStack(ModBlocks.THICK_END_ROD)); entries.add(new ItemStack(ModItems.STEEL_ITEM)); entries.add(new ItemStack(ModItems.NEGATIVE_FLINT_ITEM));