diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index e4fce751..2d9150a2 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -46,4 +46,13 @@ public final class ModItems { public static final Item MOVER_MINECART = new ItemMoverMinecart(); public static final Item RANGE_VISUALIZER = new ItemRangeVisualizer(); public static final Item CLOCK_HAND = new ItemImpl("clock_hand"); + public static final Item TOKEN_JOY = new ItemImpl("token_joy"); + public static final Item TOKEN_FEAR = new ItemImpl("token_fear"); + public static final Item TOKEN_ANGER = new ItemImpl("token_anger"); + public static final Item TOKEN_SORROW = new ItemImpl("token_sorrow"); + public static final Item TOKEN_EUPHORIA = new ItemImpl("token_euphoria"); + public static final Item TOKEN_TERROR = new ItemImpl("token_terror"); + public static final Item TOKEN_RAGE = new ItemImpl("token_rage"); + public static final Item TOKEN_GRIEF = new ItemImpl("token_grief"); + } diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index 34bef5e6..7c67c7dd 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java @@ -56,7 +56,7 @@ public final class ModRecipes { Helper.blockIng(Blocks.STONE), Ingredient.fromItem(ModItems.GOLD_LEAF), Ingredient.fromItem(Items.GOLD_INGOT), - new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD))).register(); + Ingredient.fromItem(ModItems.TOKEN_JOY)).register(); new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "ancient_sapling"), Helper.blockIng(Blocks.SAPLING), new ItemStack(ModBlocks.ANCIENT_SAPLING), 200, Helper.blockIng(Blocks.SAPLING), @@ -74,7 +74,7 @@ public final class ModRecipes { Ingredient.fromItem(Items.FIRE_CHARGE), Ingredient.fromItem(Items.FLINT), Helper.blockIng(Blocks.MAGMA), - new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER))).register(); + Ingredient.fromItem(ModItems.TOKEN_FEAR)).register(); new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "conversion_catalyst"), Ingredient.fromStacks(new ItemStack(Blocks.SAPLING, 1, 3)), new ItemStack(ModBlocks.CONVERSION_CATALYST), 600, Helper.blockIng(ModBlocks.GOLD_BRICK), @@ -88,7 +88,8 @@ public final class ModRecipes { Helper.blockIng(ModBlocks.GOLD_BRICK), Helper.blockIng(ModBlocks.INFUSED_STONE), Helper.blockIng(Blocks.PISTON), - Ingredient.fromItem(Items.FLINT)).register(); + Ingredient.fromItem(Items.FLINT), + Ingredient.fromItem(ModItems.TOKEN_ANGER)).register(); new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "plant_powder"), Ingredient.fromStacks(new ItemStack(Blocks.SAPLING)), ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), PlantBoostEffect.NAME), 400, @@ -110,6 +111,34 @@ public final class ModRecipes { Helper.blockIng(ModBlocks.GOLD_POWDER), Ingredient.fromItem(ModItems.SKY_INGOT), Ingredient.fromItem(Items.EGG)).register(); + new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_joy"), + Helper.blockIng(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_JOY, 2), 200, + new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)), + Ingredient.fromItem(ModItems.GOLD_LEAF), + Ingredient.fromStacks(new ItemStack(Blocks.RED_FLOWER, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Blocks.YELLOW_FLOWER)), + Ingredient.fromItem(Items.APPLE), + Helper.blockIng(Blocks.TORCH)).register(); + new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_anger"), + Helper.blockIng(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_ANGER, 2), 200, + new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)), + Ingredient.fromItem(ModItems.GOLD_LEAF), + Helper.blockIng(Blocks.MAGMA), + Ingredient.fromItem(Items.BLAZE_POWDER), + Ingredient.fromItem(Items.GUNPOWDER)).register(); + new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_sorrow"), + Helper.blockIng(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_SORROW, 2), 200, + new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)), + Ingredient.fromItem(ModItems.GOLD_LEAF), + Ingredient.fromItem(Items.GHAST_TEAR), + Ingredient.fromItems(Items.BEEF, Items.MUTTON, Items.CHICKEN, Items.PORKCHOP), + Helper.blockIng(Blocks.GLASS)).register(); + new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_fear"), + Helper.blockIng(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_FEAR, 2), 200, + new NBTIngredient(ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)), + Ingredient.fromItem(ModItems.GOLD_LEAF), + Ingredient.fromItem(Items.ROTTEN_FLESH), + Ingredient.fromItem(Items.FEATHER), + Ingredient.fromItem(Items.BONE)).register(); new AltarRecipe(new ResourceLocation(NaturesAura.MOD_ID, "infused_iron"), Ingredient.fromItem(Items.IRON_INGOT), new ItemStack(ModItems.INFUSED_IRON), @@ -164,6 +193,22 @@ public final class ModRecipes { Ingredient.fromItem(Items.NETHER_STAR), Ingredient.fromItem(ModItems.CALLING_SPIRIT), new ItemStack(ModItems.CLOCK_HAND)).register(); + new OfferingRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_euphoria"), + Ingredient.fromItem(ModItems.TOKEN_JOY), + Ingredient.fromItem(ModItems.CALLING_SPIRIT), + new ItemStack(ModItems.TOKEN_EUPHORIA)).register(); + new OfferingRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_rage"), + Ingredient.fromItem(ModItems.TOKEN_ANGER), + Ingredient.fromItem(ModItems.CALLING_SPIRIT), + new ItemStack(ModItems.TOKEN_RAGE)).register(); + new OfferingRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_grief"), + Ingredient.fromItem(ModItems.TOKEN_SORROW), + Ingredient.fromItem(ModItems.CALLING_SPIRIT), + new ItemStack(ModItems.TOKEN_GRIEF)).register(); + new OfferingRecipe(new ResourceLocation(NaturesAura.MOD_ID, "token_terror"), + Ingredient.fromItem(ModItems.TOKEN_FEAR), + Ingredient.fromItem(ModItems.CALLING_SPIRIT), + new ItemStack(ModItems.TOKEN_TERROR)).register(); NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put( Blocks.COBBLESTONE.getDefaultState(), diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index c3dd43b1..c1ae8609 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -80,6 +80,14 @@ item.naturesaura.effect_powder.naturesaura:animal.name=Powder of Fertility item.naturesaura.mover_cart.name=Aura Attraction Cart item.naturesaura.range_visualizer.name=Mystical Magnifier item.naturesaura.clock_hand.name=Hand of Time +item.naturesaura.token_anger.name=Token of Anger +item.naturesaura.token_euphoria.name=Token of Euphoria +item.naturesaura.token_fear.name=Token of Fear +item.naturesaura.token_grief.name=Token of Grief +item.naturesaura.token_joy.name=Token of Joy +item.naturesaura.token_rage.name=Token of Rage +item.naturesaura.token_sorrow.name=Token of Sorrow +item.naturesaura.token_terror.name=Token of Terror container.naturesaura.tree_ritual.name=Ritual of the Forest container.naturesaura.altar.name=Natural Altar Infusion diff --git a/src/main/resources/assets/naturesaura/models/item/token_anger.json b/src/main/resources/assets/naturesaura/models/item/token_anger.json new file mode 100644 index 00000000..07cf1c02 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_anger.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_anger" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_euphoria.json b/src/main/resources/assets/naturesaura/models/item/token_euphoria.json new file mode 100644 index 00000000..118d793c --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_euphoria.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_euphoria" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_fear.json b/src/main/resources/assets/naturesaura/models/item/token_fear.json new file mode 100644 index 00000000..a6bed50d --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_fear.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_fear" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_grief.json b/src/main/resources/assets/naturesaura/models/item/token_grief.json new file mode 100644 index 00000000..548acd02 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_grief.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_grief" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_joy.json b/src/main/resources/assets/naturesaura/models/item/token_joy.json new file mode 100644 index 00000000..7031a7c9 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_joy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_joy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_rage.json b/src/main/resources/assets/naturesaura/models/item/token_rage.json new file mode 100644 index 00000000..55b1ccb8 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_rage.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_rage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_sorrow.json b/src/main/resources/assets/naturesaura/models/item/token_sorrow.json new file mode 100644 index 00000000..d7d92611 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_sorrow.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_sorrow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/token_terror.json b/src/main/resources/assets/naturesaura/models/item/token_terror.json new file mode 100644 index 00000000..6d30b5c3 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/token_terror.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "naturesaura:items/token_terror" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json index 5e630134..d7f9acf6 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json @@ -28,9 +28,29 @@ "recipe": "naturesaura:calling_spirit" }, { - "type":"naturesaura:offering", - "text":"Asking for $(item)Ingots of the Sky$(), a powerful metal infused with divine energy.", - "recipe":"naturesaura:sky_ingot" + "type": "naturesaura:offering", + "text": "Asking for $(item)Ingots of the Sky$(), a powerful metal infused with divine energy.", + "recipe": "naturesaura:sky_ingot" + }, + { + "type": "naturesaura:offering", + "text": "Exchanging the $(item)Token of Joy$() for a much stronger version, the $(item)Token of Euphoria$()", + "recipe": "naturesaura:token_euphoria" + }, + { + "type": "naturesaura:offering", + "text": "Exchanging the $(item)Token of Fear$() for a much stronger version, the $(item)Token of Terror$()", + "recipe": "naturesaura:token_terror" + }, + { + "type": "naturesaura:offering", + "text": "Exchanging the $(item)Token of Anger$() for a much stronger version, the $(item)Token of Rage$()", + "recipe": "naturesaura:token_rage" + }, + { + "type": "naturesaura:offering", + "text": "Exchanging the $(item)Token of Sorrow$() for a much stronger version, the $(item)Token of Grief$()", + "recipe": "naturesaura:token_grief" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/tree_ritual.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/tree_ritual.json index 312c213e..4e505d77 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/tree_ritual.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/tree_ritual.json @@ -23,6 +23,30 @@ "type": "crafting", "text": "Creating $(item)Wooden Stands$()", "recipe": "naturesaura:wood_stand" + }, + { + "type": "text", + "text": "Together with the ritual, knowledge of $(item)Tokens$() can be gained: Wooden figurines, depicting key emotions - created from trees infused with their respective symbols. These figurines contain a combination of the vast power of $(aura) itself and the power of the emotions they represent.$(p)Going forward, these $(item)Tokens$() will be a key construction ingredient." + }, + { + "type": "naturesaura:tree_ritual", + "recipe": "naturesaura:token_joy", + "text": "Creating the $(item)Token of Joy$(), infused with items that spark joy, found in nature, exploration and beauty" + }, + { + "type": "naturesaura:tree_ritual", + "recipe": "naturesaura:token_fear", + "text": "Creating the $(item)Token of Fear$(), infused with items representing transience, falling" + }, + { + "type": "naturesaura:tree_ritual", + "recipe": "naturesaura:token_anger", + "text": "Creating the $(item)Token of Anger$(), infused with dark components - explosiveness, fire, darkness" + }, + { + "type": "naturesaura:tree_ritual", + "recipe": "naturesaura:token_sorrow", + "text": "Creating the $(item)Token of Sorrow$(), infused with tears, fragility and death" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/animal_generator.json b/src/main/resources/assets/naturesaura/recipes/animal_generator.json index c3a33ed4..4f4d122b 100644 --- a/src/main/resources/assets/naturesaura/recipes/animal_generator.json +++ b/src/main/resources/assets/naturesaura/recipes/animal_generator.json @@ -19,11 +19,7 @@ "item": "minecraft:soul_sand" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "item": "naturesaura:token_grief" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/animal_spawner.json b/src/main/resources/assets/naturesaura/recipes/animal_spawner.json index d22bc923..19d4471b 100644 --- a/src/main/resources/assets/naturesaura/recipes/animal_spawner.json +++ b/src/main/resources/assets/naturesaura/recipes/animal_spawner.json @@ -16,11 +16,7 @@ "item": "naturesaura:sky_ingot" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "item": "naturesaura:token_euphoria" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/auto_crafter.json b/src/main/resources/assets/naturesaura/recipes/auto_crafter.json index b59cd692..810478fd 100644 --- a/src/main/resources/assets/naturesaura/recipes/auto_crafter.json +++ b/src/main/resources/assets/naturesaura/recipes/auto_crafter.json @@ -16,11 +16,7 @@ "item": "naturesaura:ancient_planks" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "item": "naturesaura:token_joy" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/color_changer.json b/src/main/resources/assets/naturesaura/recipes/color_changer.json index 8b8b6b3a..8ad328b5 100644 --- a/src/main/resources/assets/naturesaura/recipes/color_changer.json +++ b/src/main/resources/assets/naturesaura/recipes/color_changer.json @@ -2,7 +2,7 @@ "type": "forge:ore_shaped", "pattern": [ "RYB", - "I I", + "ITI", " I " ], "key": { @@ -20,6 +20,9 @@ "B": { "type": "forge:ore_dict", "ore": "dyeBlue" + }, + "T": { + "item": "naturesaura:token_euphoria" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/field_creator.json b/src/main/resources/assets/naturesaura/recipes/field_creator.json index 447161ec..2bb8d64f 100644 --- a/src/main/resources/assets/naturesaura/recipes/field_creator.json +++ b/src/main/resources/assets/naturesaura/recipes/field_creator.json @@ -16,11 +16,7 @@ "item": "minecraft:piston" }, "E": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "item": "naturesaura:token_rage" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/flower_generator.json b/src/main/resources/assets/naturesaura/recipes/flower_generator.json index e850d3cc..140608b4 100644 --- a/src/main/resources/assets/naturesaura/recipes/flower_generator.json +++ b/src/main/resources/assets/naturesaura/recipes/flower_generator.json @@ -18,11 +18,7 @@ "data": 5 }, "B": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "item": "naturesaura:token_joy" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/moss_generator.json b/src/main/resources/assets/naturesaura/recipes/moss_generator.json index 26af5c1b..6931737e 100644 --- a/src/main/resources/assets/naturesaura/recipes/moss_generator.json +++ b/src/main/resources/assets/naturesaura/recipes/moss_generator.json @@ -13,11 +13,7 @@ "item": "naturesaura:infused_iron" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "item": "naturesaura:token_joy" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/oak_generator.json b/src/main/resources/assets/naturesaura/recipes/oak_generator.json index ed2beb09..f22c4ce6 100644 --- a/src/main/resources/assets/naturesaura/recipes/oak_generator.json +++ b/src/main/resources/assets/naturesaura/recipes/oak_generator.json @@ -1,7 +1,7 @@ { "type": "forge:ore_shaped", "pattern": [ - "MBI", + "MTI", "SOS", "IBM" ], @@ -27,6 +27,9 @@ }, "I": { "item": "naturesaura:infused_iron" + }, + "T": { + "item": "naturesaura:token_fear" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/offering_table.json b/src/main/resources/assets/naturesaura/recipes/offering_table.json index 84c0f962..04ffc65f 100644 --- a/src/main/resources/assets/naturesaura/recipes/offering_table.json +++ b/src/main/resources/assets/naturesaura/recipes/offering_table.json @@ -2,7 +2,7 @@ "type": "forge:ore_shaped", "pattern": [ "SIS", - " S ", + "FST", "WWW" ], "key": { @@ -16,6 +16,12 @@ }, "I": { "item": "naturesaura:infused_iron" + }, + "F": { + "item": "naturesaura:token_fear" + }, + "T": { + "item": "naturesaura:token_sorrow" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/potion_generator.json b/src/main/resources/assets/naturesaura/recipes/potion_generator.json index 65fd6ab3..211ebe22 100644 --- a/src/main/resources/assets/naturesaura/recipes/potion_generator.json +++ b/src/main/resources/assets/naturesaura/recipes/potion_generator.json @@ -16,11 +16,7 @@ "item": "naturesaura:sky_ingot" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "item": "naturesaura:token_fear" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/rf_converter.json b/src/main/resources/assets/naturesaura/recipes/rf_converter.json index 086d30e0..d8859d8f 100644 --- a/src/main/resources/assets/naturesaura/recipes/rf_converter.json +++ b/src/main/resources/assets/naturesaura/recipes/rf_converter.json @@ -16,18 +16,10 @@ "item": "naturesaura:sky_ingot" }, "W": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "item": "naturesaura:token_fear" }, "O": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "item": "naturesaura:token_anger" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json b/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json index 1225bcd1..d1821d13 100644 --- a/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json +++ b/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json @@ -7,8 +7,7 @@ ], "key": { "I": { - "type": "forge:ore_dict", - "ore": "ingotIron" + "item": "naturesaura:token_rage" }, "B": { "item": "minecraft:diamond_boots" diff --git a/src/main/resources/assets/naturesaura/recipes/spawn_lamp.json b/src/main/resources/assets/naturesaura/recipes/spawn_lamp.json index ad5c05a4..ba974380 100644 --- a/src/main/resources/assets/naturesaura/recipes/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/recipes/spawn_lamp.json @@ -14,7 +14,7 @@ "item": "minecraft:glass" }, "S": { - "item": "naturesaura:sky_ingot" + "item": "naturesaura:token_terror" }, "G": { "item": "minecraft:glowstone" diff --git a/src/main/resources/assets/naturesaura/recipes/time_changer.json b/src/main/resources/assets/naturesaura/recipes/time_changer.json index b822d6fe..0b2fd5b8 100644 --- a/src/main/resources/assets/naturesaura/recipes/time_changer.json +++ b/src/main/resources/assets/naturesaura/recipes/time_changer.json @@ -13,18 +13,10 @@ "item": "naturesaura:infused_brick" }, "N": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "item": "naturesaura:token_terror" }, "O": { - "type": "minecraft:item_nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "item": "naturesaura:token_euphoria" } }, "result": { diff --git a/src/main/resources/assets/naturesaura/textures/items/token_anger.png b/src/main/resources/assets/naturesaura/textures/items/token_anger.png new file mode 100644 index 00000000..fd9670ce Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_anger.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_euphoria.png b/src/main/resources/assets/naturesaura/textures/items/token_euphoria.png new file mode 100644 index 00000000..a1037784 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_euphoria.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_fear.png b/src/main/resources/assets/naturesaura/textures/items/token_fear.png new file mode 100644 index 00000000..363c93df Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_fear.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_grief.png b/src/main/resources/assets/naturesaura/textures/items/token_grief.png new file mode 100644 index 00000000..1373d504 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_grief.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_joy.png b/src/main/resources/assets/naturesaura/textures/items/token_joy.png new file mode 100644 index 00000000..6a4ac1c0 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_joy.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_rage.png b/src/main/resources/assets/naturesaura/textures/items/token_rage.png new file mode 100644 index 00000000..92ddcf81 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_rage.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_sorrow.png b/src/main/resources/assets/naturesaura/textures/items/token_sorrow.png new file mode 100644 index 00000000..b56db912 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_sorrow.png differ diff --git a/src/main/resources/assets/naturesaura/textures/items/token_terror.png b/src/main/resources/assets/naturesaura/textures/items/token_terror.png new file mode 100644 index 00000000..5236fb05 Binary files /dev/null and b/src/main/resources/assets/naturesaura/textures/items/token_terror.png differ