reider745/ZoteCoreLoader
0
Fork 0
Code Issues Pull Requests Releases Activity

fix: Временное решение для дамага броне

Browse Source
This commit is contained in:
MaXFeeD
2024-02-13 15:24:23 +03:00
parent 368a5ed852
commit 5dd821dce1
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/reider745/hooks/EntityOverrides.java
+9 -1
View File
@@ -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);
// }
// }
}
src/main/java/com/reider745/item/CustomArmorItem.java
+1 -1
View File
@@ -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;
src/main/java/com/zhekasmirnov/innercore/api/NativeItem.java
+1 -2
View File
@@ -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;
}