diff --git a/src/main/java/ru/betterend/item/ArmoredElytra.java b/src/main/java/ru/betterend/item/ArmoredElytra.java index 8797b6fa..3fe282ff 100644 --- a/src/main/java/ru/betterend/item/ArmoredElytra.java +++ b/src/main/java/ru/betterend/item/ArmoredElytra.java @@ -19,7 +19,6 @@ import ru.betterend.interfaces.MultiModelItem; import ru.betterend.registry.EndItems; public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, FallFlyingItem { - private final ResourceLocation wingTexture; private final Item repairItem; private final double movementFactor; @@ -30,12 +29,11 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Fall super( material, EquipmentSlot.CHEST, - fireproof ? EndItems.makeEndItemSettings() - .durability(durability) - .rarity(Rarity.EPIC) - .fireResistant() : EndItems.makeEndItemSettings() - .durability(durability) - .rarity(Rarity.EPIC) + fireproof ? EndItems + .makeEndItemSettings() + .durability(durability) + .rarity(Rarity.EPIC) + .fireResistant() : EndItems.makeEndItemSettings().durability(durability).rarity(Rarity.EPIC) ); this.wingTexture = BetterEnd.makeID("textures/entity/" + name + ".png"); this.repairItem = repairItem; diff --git a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java index c929ef04..44d83418 100644 --- a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java @@ -20,6 +20,9 @@ import net.minecraft.world.entity.animal.FlyingAnimal; import net.minecraft.world.item.ElytraItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -145,7 +148,8 @@ public abstract class LivingEntityMixin extends Entity { boolean isFlying = getSharedFlag(7); if (isFlying && !onGround && !isPassenger() && !hasEffect(MobEffects.LEVITATION)) { if (ElytraItem.isFlyEnabled(itemStack)) { - if ((fallFlyTicks + 1) % 20 == 0) { + int level = 20 + EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, itemStack) * 5; + if ((fallFlyTicks + 1) % level == 0) { itemStack.hurtAndBreak( 1, LivingEntity.class.cast(this),