From 5dd821dce1320e395203b5677ee03c3ecf7fdcf6 Mon Sep 17 00:00:00 2001 From: MaXFeeD Date: Tue, 13 Feb 2024 06:40:53 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B0=D0=BC=D0=B0=D0=B3=D0=B0=20?= =?UTF-8?q?=D0=B1=D1=80=D0=BE=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/reider745/hooks/EntityOverrides.java | 10 +++++++++- src/main/java/com/reider745/item/CustomArmorItem.java | 2 +- .../com/zhekasmirnov/innercore/api/NativeItem.java | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) 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; }