diff --git a/src/main/java/com/reider745/hooks/EntityOverrides.java b/src/main/java/com/reider745/hooks/EntityOverrides.java index ef5844dd..95f90b8a 100644 --- a/src/main/java/com/reider745/hooks/EntityOverrides.java +++ b/src/main/java/com/reider745/hooks/EntityOverrides.java @@ -2,7 +2,6 @@ package com.reider745.hooks; import com.reider745.api.hooks.HookClass; import com.reider745.api.hooks.annotation.Hooks; - import javassist.CannotCompileException; import javassist.CtClass; import javassist.CtMethod; @@ -24,4 +23,13 @@ public class EntityOverrides implements HookClass { System.out.println("Nukkit-MOT has been updated and overrides for `EntityArmorStand.onInteract` method are no longer available."); } } + + // @Inject(className = "cn.nukkit.entity.EntityHumanType", type = TypeHook.BEFORE, signature = "(Lcn/nukkit/item/Item;Lcn/nukkit/entity/Entity;FZLcn/nukkit/event/entity/EntityDamageEvent$DamageCause;)Lcn/nukkit/item/Item;") + // public static void damageArmor(HookController controller, EntityHumanType human, Item armor, Entity damager, + // float damage, boolean shield, DamageCause cause) { + // if (armor instanceof CustomArmorItem && armor.getDamage() >= armor.getMaxDurability()) { + // controller.setReplace(true); + // controller.setResult(armor); + // } + // } } diff --git a/src/main/java/com/reider745/item/CustomArmorItem.java b/src/main/java/com/reider745/item/CustomArmorItem.java index 972f9fcd..96dad1dc 100644 --- a/src/main/java/com/reider745/item/CustomArmorItem.java +++ b/src/main/java/com/reider745/item/CustomArmorItem.java @@ -1,8 +1,8 @@ package com.reider745.item; import com.reider745.api.CustomManager; - import com.reider745.item.ItemMethod.PropertiesNames; + import cn.nukkit.Player; import cn.nukkit.item.Item; import cn.nukkit.math.Vector3; diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeItem.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeItem.java index 6549fbd9..5650a84d 100644 --- a/src/main/java/com/zhekasmirnov/innercore/api/NativeItem.java +++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeItem.java @@ -14,7 +14,6 @@ import com.zhekasmirnov.apparatus.ecs.types.item.ArmorItemComponent; import com.zhekasmirnov.apparatus.ecs.types.item.ItemComponent; import com.zhekasmirnov.innercore.api.commontypes.ItemInstance; import com.zhekasmirnov.innercore.api.runtime.Callback; -import com.zhekasmirnov.innercore.api.runtime.other.ArmorRegistry; import com.zhekasmirnov.innercore.api.runtime.other.NameTranslation; import com.zhekasmirnov.innercore.mod.resource.ResourcePackManager; @@ -179,7 +178,7 @@ public class NativeItem { CustomItem.registerArmorItem(nameId, id, NameTranslation.fixUnicodeIfRequired("item_" + nameId, name), slot, defense, durability, (float) knockbackResist), nameId, name); - ArmorRegistry.registerArmor(id, component); + // TODO: ArmorRegistry.registerArmor(id, component); ECS.getEntityManager().extend(item.entity, armorCC.setValues(component)); return item; }