finish the amulet of wrath

This commit is contained in:
Ellpeck 2018-11-06 23:08:42 +01:00
parent 7146262381
commit b7f152957d
6 changed files with 85 additions and 1 deletions

View file

@ -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<EntityLiving> 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();

View file

@ -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"
}
]
}
}
}
}

View file

@ -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 <action> <amount> <range>

View file

@ -3,6 +3,7 @@
"icon": "naturesaura:aura_cache",
"category": "items",
"advancement": "naturesaura:infused_materials",
"priority": true,
"pages": [
{
"type": "text",

View file

@ -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"
}
]
}

View file

@ -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"
}
}