diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java b/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java index b7fe538b..aa3fbf7b 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java @@ -76,6 +76,12 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { if (living instanceof EntityPlayer && !Helper.extractAuraFromPlayer((EntityPlayer) living, 10, false)) return; + DamageSource source; + if (living instanceof EntityPlayer) + source = DamageSource.causePlayerDamage((EntityPlayer) living); + else + source = DamageSource.MAGIC; + int range = 5; List mobs = worldIn.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB( living.posX - range, living.posY - 0.5, living.posZ - range, @@ -87,7 +93,7 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { continue; if (living instanceof EntityPlayer && !Helper.extractAuraFromPlayer((EntityPlayer) living, 5, false)) break; - mob.attackEntityFrom(DamageSource.MAGIC, 4F); + mob.attackEntityFrom(source, 4F); } BlockPos pos = living.getPosition(); diff --git a/src/main/resources/assets/naturesaura/advancements/infused_tools.json b/src/main/resources/assets/naturesaura/advancements/infused_tools.json new file mode 100644 index 00000000..5cacc660 --- /dev/null +++ b/src/main/resources/assets/naturesaura/advancements/infused_tools.json @@ -0,0 +1,29 @@ +{ + "display": { + "icon": { + "item": "naturesaura:infused_iron_pickaxe" + }, + "title": { + "translate": "advancement.naturesaura.infused_tools" + }, + "description": { + "translate": "advancement.naturesaura.infused_tools.desc" + } + }, + "parent": "naturesaura:infused_materials", + "criteria": { + "materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "naturesaura:infused_iron_pickaxe" + }, + { + "item": "naturesaura:infused_iron_sword" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index badb48be..0c51c95e 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -73,5 +73,7 @@ advancement.naturesaura.placer=Plop Plop Placement advancement.naturesaura.placer.desc=Create an Imperceptible Builder to place blocks for you advancement.naturesaura.conversion_catalyst=Not so Equivalent Exchange advancement.naturesaura.conversion_catalyst.desc=Create a Conversion Catalyst for easy material conversion +advancement.naturesaura.infused_tools=Gear Up Intensifies +advancement.naturesaura.infused_tools.desc=Create an Infused Iron Pickaxe and Blade command.naturesaura.aura.usage=/naaura \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/aura_cache.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/aura_cache.json index 875c3358..a20a9fca 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/aura_cache.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/aura_cache.json @@ -3,6 +3,7 @@ "icon": "naturesaura:aura_cache", "category": "items", "advancement": "naturesaura:infused_materials", + "priority": true, "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json new file mode 100644 index 00000000..2d23eebf --- /dev/null +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json @@ -0,0 +1,17 @@ +{ + "name": "Amulet of Wrath", + "icon": "naturesaura:shockwave_creator", + "category": "items", + "advancement": "naturesaura:infused_tools", + "pages": [ + { + "type": "text", + "text": "The $(item)Amulet of Wrath$(), when held anywhere in the inventory, allows its wearer to focus their power, giving them the ability to, when $(thing)sneaking$() and $(thing)jumping$() in place, stomp down on the ground hard enough to create a $(item)shockwave$() that hurts any other living creatures close by.$(br)This, of course, comes at the cost of some $(aura), stored in the form of, say, an $(l:items/aura_cache)Aura Cache$()." + }, + { + "type": "crafting", + "text": "Creating the $(item)Amulet of Wrath$()", + "recipe": "naturesaura:shockwave_creator" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json b/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json new file mode 100644 index 00000000..1225bcd1 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/shockwave_creator.json @@ -0,0 +1,29 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + " I ", + "RTR", + "SBS" + ], + "key": { + "I": { + "type": "forge:ore_dict", + "ore": "ingotIron" + }, + "B": { + "item": "minecraft:diamond_boots" + }, + "T": { + "item": "minecraft:tnt" + }, + "R": { + "item": "naturesaura:infused_stone" + }, + "S": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "naturesaura:shockwave_creator" + } +} \ No newline at end of file