From 2274056c0419a8c41c0c6dcbdde3749cb35f338d Mon Sep 17 00:00:00 2001 From: micle Date: Sat, 29 May 2021 19:20:54 +0100 Subject: [PATCH] Started working on two new items: Straw totem and straw charge. Added textures, crafting recipes and lang file entries. Items are basic and don't do anything yet --- src/generated/resources/.cache/cache | 6 ++++ .../models/item/straw_charge.json | 6 ++++ .../models/item/straw_totem.json | 6 ++++ .../recipes/misc/straw_charge.json | 32 ++++++++++++++++++ .../recipes/misc/straw_totem.json | 32 ++++++++++++++++++ .../totemofreviving/recipes/straw_charge.json | 22 ++++++++++++ .../totemofreviving/recipes/straw_totem.json | 25 ++++++++++++++ .../data/ModRecipeProvider.java | 19 +++++++++++ .../data/client/ModItemModelProvider.java | 2 ++ .../items/StrawChargeItem.java | 10 ++++++ .../totemofreviving/items/StrawTotemItem.java | 10 ++++++ .../micle/totemofreviving/setup/ModItems.java | 4 +++ .../assets/totemofreviving/lang/en_us.json | 4 ++- .../textures/item/straw_charge.png | Bin 0 -> 753 bytes .../textures/item/straw_totem.png | Bin 0 -> 5803 bytes 15 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/totemofreviving/models/item/straw_charge.json create mode 100644 src/generated/resources/assets/totemofreviving/models/item/straw_totem.json create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/straw_charge.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/straw_totem.json create mode 100755 src/main/java/com/micle/totemofreviving/items/StrawChargeItem.java create mode 100755 src/main/java/com/micle/totemofreviving/items/StrawTotemItem.java create mode 100644 src/main/resources/assets/totemofreviving/textures/item/straw_charge.png create mode 100644 src/main/resources/assets/totemofreviving/textures/item/straw_totem.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 2acd722..4ece7a7 100755 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,6 +1,12 @@ 8a2b88672a3111967914bf84746ee02770dc8aca assets/totemofreviving/models/item/reviving_charge.json +6dfda0ccc2ea9fde90748a9fac81e6e122375b60 assets/totemofreviving/models/item/straw_charge.json +70680f30f3471070d6d4121f0787eb7e2a9d7318 assets/totemofreviving/models/item/straw_totem.json 9802f8a76c014c4e7d5b093643a0f8f2c75474bc assets/totemofreviving/models/item/totem_of_reviving.json 97e29a14be1fa658d16ee23c9791822f6d49dab7 data/totemofreviving/advancements/recipes/misc/reviving_charge.json +4a76d05fbd6fe375b097c1207f2967fd5fbfef5b data/totemofreviving/advancements/recipes/misc/straw_charge.json +8608de575125d59605ad619c16b826cee70c478e data/totemofreviving/advancements/recipes/misc/straw_totem.json 9be362836ef513789b2c8e3d88d35a6b802b5d27 data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json 0a4143689809621511c8e586e6f030e2dd7a5927 data/totemofreviving/recipes/reviving_charge.json +72f1af6072cd28ad40e07d67256f2611bcb2d924 data/totemofreviving/recipes/straw_charge.json +ffba47b4fb65503d8143a387b05e191301b2b895 data/totemofreviving/recipes/straw_totem.json 8d9f9d28b0748d5dacbf0824b8f6531a6a00bbfa data/totemofreviving/recipes/totem_of_reviving.json diff --git a/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json b/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json new file mode 100644 index 0000000..85c72a4 --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving:item/straw_charge" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/straw_totem.json b/src/generated/resources/assets/totemofreviving/models/item/straw_totem.json new file mode 100644 index 0000000..f8d8ea1 --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/straw_totem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving:item/straw_totem" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json new file mode 100644 index 0000000..0230cb8 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:straw_charge" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:emerald" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:straw_charge" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json new file mode 100644 index 0000000..6a850d6 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:straw_totem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:wheat" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:straw_totem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json b/src/generated/resources/data/totemofreviving/recipes/straw_charge.json new file mode 100644 index 0000000..c9669bb --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/straw_charge.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "IWI", + "WEW", + "IWI" + ], + "key": { + "W": { + "item": "minecraft:wheat" + }, + "E": { + "item": "minecraft:emerald" + }, + "I": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "totemofreviving:straw_charge" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json new file mode 100644 index 0000000..b1fcf7b --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "NSN", + "NWN", + "N/N" + ], + "key": { + "W": { + "item": "minecraft:wheat" + }, + "/": { + "item": "minecraft:stick" + }, + "S": { + "item": "minecraft:string" + }, + "N": { + "item": "minecraft:iron_nugget" + } + }, + "result": { + "item": "totemofreviving:straw_totem" + } +} \ No newline at end of file diff --git a/src/main/java/com/micle/totemofreviving/data/ModRecipeProvider.java b/src/main/java/com/micle/totemofreviving/data/ModRecipeProvider.java index 4658c57..efff174 100755 --- a/src/main/java/com/micle/totemofreviving/data/ModRecipeProvider.java +++ b/src/main/java/com/micle/totemofreviving/data/ModRecipeProvider.java @@ -30,5 +30,24 @@ public class ModRecipeProvider extends RecipeProvider { .pattern("@E@") .unlockedBy("has_item", has(ModItems.TOTEM_OF_REVIVING.get())) .save(consumer); + ShapedRecipeBuilder.shaped(ModItems.STRAW_TOTEM.get()) + .define('W', Items.WHEAT) + .define('/', Items.STICK) + .define('S', Items.STRING) + .define('N', Items.IRON_NUGGET) + .pattern("NSN") + .pattern("NWN") + .pattern("N/N") + .unlockedBy("has_item", has(Items.WHEAT)) + .save(consumer); + ShapedRecipeBuilder.shaped(ModItems.STRAW_CHARGE.get()) + .define('W', Items.WHEAT) + .define('E', Items.EMERALD) + .define('I', Items.IRON_INGOT) + .pattern("IWI") + .pattern("WEW") + .pattern("IWI") + .unlockedBy("has_item", has(Items.EMERALD)) + .save(consumer); } } diff --git a/src/main/java/com/micle/totemofreviving/data/client/ModItemModelProvider.java b/src/main/java/com/micle/totemofreviving/data/client/ModItemModelProvider.java index 6b2b9ad..01cec90 100755 --- a/src/main/java/com/micle/totemofreviving/data/client/ModItemModelProvider.java +++ b/src/main/java/com/micle/totemofreviving/data/client/ModItemModelProvider.java @@ -23,6 +23,8 @@ public class ModItemModelProvider extends ItemModelProvider { builder(item_generated, "totem_of_reviving"); builder(item_generated, "reviving_charge"); + builder(item_generated, "straw_totem"); + builder(item_generated, "straw_charge"); } private ItemModelBuilder builder(ModelFile item_generated, String name) { diff --git a/src/main/java/com/micle/totemofreviving/items/StrawChargeItem.java b/src/main/java/com/micle/totemofreviving/items/StrawChargeItem.java new file mode 100755 index 0000000..4211fe9 --- /dev/null +++ b/src/main/java/com/micle/totemofreviving/items/StrawChargeItem.java @@ -0,0 +1,10 @@ +package com.micle.totemofreviving.items; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; + +public class StrawChargeItem extends Item { + public StrawChargeItem() { + super(new Properties().tab(ItemGroup.TAB_MISC)); + } +} diff --git a/src/main/java/com/micle/totemofreviving/items/StrawTotemItem.java b/src/main/java/com/micle/totemofreviving/items/StrawTotemItem.java new file mode 100755 index 0000000..bae3cf8 --- /dev/null +++ b/src/main/java/com/micle/totemofreviving/items/StrawTotemItem.java @@ -0,0 +1,10 @@ +package com.micle.totemofreviving.items; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; + +public class StrawTotemItem extends Item { + public StrawTotemItem() { + super(new Properties().tab(ItemGroup.TAB_MISC)); + } +} diff --git a/src/main/java/com/micle/totemofreviving/setup/ModItems.java b/src/main/java/com/micle/totemofreviving/setup/ModItems.java index fc53d70..55bcd85 100755 --- a/src/main/java/com/micle/totemofreviving/setup/ModItems.java +++ b/src/main/java/com/micle/totemofreviving/setup/ModItems.java @@ -1,6 +1,8 @@ package com.micle.totemofreviving.setup; import com.micle.totemofreviving.items.RevivingChargeItem; +import com.micle.totemofreviving.items.StrawChargeItem; +import com.micle.totemofreviving.items.StrawTotemItem; import com.micle.totemofreviving.items.TotemOfRevivingItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; @@ -9,6 +11,8 @@ import net.minecraftforge.fml.RegistryObject; public class ModItems { public static final RegistryObject TOTEM_OF_REVIVING = Registration.ITEMS.register("totem_of_reviving", TotemOfRevivingItem::new); public static final RegistryObject REVIVING_CHARGE = Registration.ITEMS.register("reviving_charge", RevivingChargeItem::new); + public static final RegistryObject STRAW_TOTEM = Registration.ITEMS.register("straw_totem", StrawTotemItem::new); + public static final RegistryObject STRAW_CHARGE = Registration.ITEMS.register("straw_charge", StrawChargeItem::new); static void register() { } diff --git a/src/main/resources/assets/totemofreviving/lang/en_us.json b/src/main/resources/assets/totemofreviving/lang/en_us.json index 6669566..11a801d 100755 --- a/src/main/resources/assets/totemofreviving/lang/en_us.json +++ b/src/main/resources/assets/totemofreviving/lang/en_us.json @@ -1,4 +1,6 @@ { "item.totemofreviving.totem_of_reviving": "Totem of Reviving", - "item.totemofreviving.reviving_charge": "Reviving charge" + "item.totemofreviving.reviving_charge": "Reviving charge", + "item.totemofreviving.straw_totem": "Straw Totem of Reviving", + "item.totemofreviving.straw_charge": "Straw reviving charge" } \ No newline at end of file diff --git a/src/main/resources/assets/totemofreviving/textures/item/straw_charge.png b/src/main/resources/assets/totemofreviving/textures/item/straw_charge.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2e23b1637bb574ea12d476b2957013fb798e88 GIT binary patch literal 753 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 q$6e2&rx88x(@w