diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java b/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java index bc382522..49b01a54 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java +++ b/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java @@ -16,6 +16,7 @@ import com.minelittlepony.util.vector.VecHelper; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; import net.minecraft.entity.MoverType; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -152,15 +153,16 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable { IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player); + float attachedTime = iplayer.getInventory().getTicksAttached(this); + if (iplayer.getExertion() < 1) { iplayer.addExertion(2); } - if (iplayer.getEnergy() < 0.005F) { + + if (iplayer.getEnergy() < 0.005F + (attachedTime / 1000000)) { iplayer.addEnergy(2); } - int attachedTime = iplayer.getInventory().getTicksAttached(this); - if (attachedTime == 1) { world.playSound(null, player.getPosition(), SoundEvents.ENTITY_ELDER_GUARDIAN_CURSE, SoundCategory.PLAYERS, 3, 1); } @@ -218,6 +220,11 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable { } } + @Override + public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { + return "unicopia:textures/models/armor/alicorn_amulet.png"; + } + @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { Multimap multimap = HashMultimap.create();; diff --git a/src/main/resources/assets/unicopia/textures/models/armor/alicorn_amulet.png b/src/main/resources/assets/unicopia/textures/models/armor/alicorn_amulet.png new file mode 100644 index 00000000..d79eb548 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/models/armor/alicorn_amulet.png differ