From f91f9b43ba47a6bc1f6970537792b3b8ce49f4b8 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 10 Feb 2025 02:44:13 -0500 Subject: [PATCH 1/5] Anvil Recipes --- .../npcs/api/handler/IRecipeHandler.java | 43 +++++++++++-------- .../npcs/api/handler/data/IAnvilRecipe.java | 37 ++++++++++++++++ 2 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 java/noppes/npcs/api/handler/data/IAnvilRecipe.java diff --git a/java/noppes/npcs/api/handler/IRecipeHandler.java b/java/noppes/npcs/api/handler/IRecipeHandler.java index 9955f20..5791feb 100644 --- a/java/noppes/npcs/api/handler/IRecipeHandler.java +++ b/java/noppes/npcs/api/handler/IRecipeHandler.java @@ -1,18 +1,25 @@ -package noppes.npcs.api.handler; - -import net.minecraft.item.ItemStack; -import noppes.npcs.api.handler.data.IRecipe; - -import java.util.List; - -public interface IRecipeHandler { - List getGlobalList(); - - List getCarpentryList(); - - void addRecipe(String var1, boolean var2, ItemStack var3, Object... var4); - - void addRecipe(String var1, boolean var2, ItemStack var3, int var4, int var5, ItemStack... var6); - - IRecipe delete(int var1); -} +package noppes.npcs.api.handler; + +import net.minecraft.item.ItemStack; +import noppes.npcs.api.handler.data.IAnvilRecipe; +import noppes.npcs.api.handler.data.IRecipe; + +import java.util.List; + +public interface IRecipeHandler { + List getGlobalList(); + + List getCarpentryList(); + + List getAnvilList(); + + void addRecipe(String var1, boolean var2, ItemStack var3, Object... var4); + + void addRecipe(String var1, boolean var2, ItemStack var3, int var4, int var5, ItemStack... var6); + + IRecipe delete(int var1); + + IAnvilRecipe deleteAnvil(int var1); + + void addAnvilRecipe(String name, boolean global, ItemStack itemToRepair, ItemStack repairMaterial, int xpCost, float repairPercentage); +} diff --git a/java/noppes/npcs/api/handler/data/IAnvilRecipe.java b/java/noppes/npcs/api/handler/data/IAnvilRecipe.java new file mode 100644 index 0000000..6fcda5b --- /dev/null +++ b/java/noppes/npcs/api/handler/data/IAnvilRecipe.java @@ -0,0 +1,37 @@ +package noppes.npcs.api.handler.data; + +import net.minecraft.item.ItemStack; + +public interface IAnvilRecipe { + /** + * Returns the unique name of this anvil recipe. + */ + String getName(); + + /** + * The XP cost per repair tick (e.g., 10 levels per tick). + */ + int getXpCost(); + + /** + * The repair percentage (e.g., 0.1f repairs 10% of max damage per tick). + */ + float getRepairPercentage(); + + /** + * Checks whether the provided item and repair material match this recipe. + * @param itemToRepair the damaged item + * @param repairMaterial the material used to repair + * @return true if the items match the recipe requirements + */ + boolean matches(ItemStack itemToRepair, ItemStack repairMaterial); + + /** + * Returns the repaired item based on the input damaged item. + * @param itemToRepair the input damaged item + * @return a copy with reduced damage + */ + ItemStack getResult(ItemStack itemToRepair); + + int getID(); +} From 5a8246f728f7c258efd41d3ecf2b69edf83b5f3d Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 10 Feb 2025 14:26:22 -0500 Subject: [PATCH 2/5] Custom Effects and Player Events API --- java/noppes/npcs/api/event/IPlayerEvent.java | 26 +++++++++ .../api/handler/IStatusEffectHandler.java | 58 +++++++++++++++++++ .../npcs/api/handler/data/ICustomEffect.java | 58 +++++++++++++++++++ .../npcs/api/handler/data/IPlayerEffect.java | 26 +++++++++ 4 files changed, 168 insertions(+) create mode 100644 java/noppes/npcs/api/handler/IStatusEffectHandler.java create mode 100644 java/noppes/npcs/api/handler/data/ICustomEffect.java create mode 100644 java/noppes/npcs/api/handler/data/IPlayerEffect.java diff --git a/java/noppes/npcs/api/event/IPlayerEvent.java b/java/noppes/npcs/api/event/IPlayerEvent.java index 7127c73..7ec624b 100644 --- a/java/noppes/npcs/api/event/IPlayerEvent.java +++ b/java/noppes/npcs/api/event/IPlayerEvent.java @@ -7,6 +7,7 @@ import noppes.npcs.api.IDamageSource; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.IPlayerEffect; import noppes.npcs.api.item.IItemStack; public interface IPlayerEvent extends ICustomNPCsEvent { @@ -268,4 +269,29 @@ public interface IPlayerEvent extends ICustomNPCsEvent { interface RangedChargeEvent extends IPlayerEvent { } + + interface EffectEvent extends IPlayerEvent { + + IPlayerEffect getEffect(); + + interface Added extends EffectEvent { + + } + interface Ticked extends EffectEvent { + + } + interface Removed extends EffectEvent { + + /** + * @return If the effect timer has ticked down to 0. + */ + boolean hasTimerRunOut(); + + /** + * @return If the effect was removed on death. + */ + boolean causedByDeath(); + } + + } } diff --git a/java/noppes/npcs/api/handler/IStatusEffectHandler.java b/java/noppes/npcs/api/handler/IStatusEffectHandler.java new file mode 100644 index 0000000..df8bdb4 --- /dev/null +++ b/java/noppes/npcs/api/handler/IStatusEffectHandler.java @@ -0,0 +1,58 @@ +package noppes.npcs.api.handler; + +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.ICustomEffect; + +public interface IStatusEffectHandler { + + ICustomEffect createEffect(String name); + + ICustomEffect getEffect(String name); + + void deleteEffect(String name); + + /** + * + * @param player Player + * @param id ID of Status Effect -- Only DBC Addon + * @return True if Player has Effect + */ + boolean hasEffect(IPlayer player, int id); + + boolean hasEffect(IPlayer player, ICustomEffect effect); + + /** + * + * -1 : Does not have effect + * -100 : Has infinite effect + * + * @param player Player + * @param id ID of Status Effect -- Only DBC Addon + * @return Effect Time + */ + int getEffectDuration(IPlayer player, int id); + + int getEffectDuration(IPlayer player, ICustomEffect effect); + + /** + * @param player Player + * @param id ID of Status Effect + * @param duration Duration of Effect in Seconds | -100 : Has infinite effect + * @param level Level of Effect [Some effects not affected by level] + */ + void applyEffect(IPlayer player, int id, int duration, byte level); + + void applyEffect(IPlayer player, ICustomEffect effect, int duration, byte level); + + /** + * @param player Player + * @param id ID of Status Effect + */ + void removeEffect(IPlayer player, int id); + + void removeEffect(IPlayer player, ICustomEffect effect); + + void clearEffects(IPlayer player); + + ICustomEffect saveEffect(ICustomEffect customEffect); +} diff --git a/java/noppes/npcs/api/handler/data/ICustomEffect.java b/java/noppes/npcs/api/handler/data/ICustomEffect.java new file mode 100644 index 0000000..ff7a134 --- /dev/null +++ b/java/noppes/npcs/api/handler/data/ICustomEffect.java @@ -0,0 +1,58 @@ +package noppes.npcs.api.handler.data; + +public interface ICustomEffect { + + int getID(); + + String getName(); + + boolean isCustom(); + + void setMenuName(String name); + + String getMenuName(); + + void setName(String name); + + String getIcon(); + + void setIcon(String icon); + + int getEveryXTick(); + + void setEveryXTick(int everyXTick); + + int getIconX(); + + void setIconX(int iconX); + + int getIconY(); + + void setIconY(int iconY); + + int getWidth(); + + void setWidth(int width); + + int getHeight(); + + void setHeight(int height); + + boolean isLossOnDeath(); + + void setLossOnDeath(boolean lossOnDeath); + + ICustomEffect save(); + + void setID(int id); + + /** + * Utilized by DBC Addon or other Addons to tell + * which map of Effects to Match to. + * Index: 0 - CNPC+ + * Index: 1 - DBC Addon + */ + int getIndex(); +} + + diff --git a/java/noppes/npcs/api/handler/data/IPlayerEffect.java b/java/noppes/npcs/api/handler/data/IPlayerEffect.java new file mode 100644 index 0000000..2ea44a2 --- /dev/null +++ b/java/noppes/npcs/api/handler/data/IPlayerEffect.java @@ -0,0 +1,26 @@ +package noppes.npcs.api.handler.data; + +import noppes.npcs.api.entity.IPlayer; + +public interface IPlayerEffect { + + void kill(); + + int getId(); + + int getDuration(); + + void setDuration(int duration); + + byte getLevel(); + + void setLevel(byte level); + + String getName(); + + void performEffect(IPlayer player); + + int getIndex(); + + void setIndex(); +} From 3f40e94beaf4e8310fab8fa3376a069c9751efdd Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 10 Feb 2025 14:58:25 -0500 Subject: [PATCH 3/5] Modify some API for Custom Effects --- java/noppes/npcs/api/handler/data/ICustomEffect.java | 2 -- java/noppes/npcs/api/handler/data/IPlayerEffect.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/java/noppes/npcs/api/handler/data/ICustomEffect.java b/java/noppes/npcs/api/handler/data/ICustomEffect.java index ff7a134..6b0b6fd 100644 --- a/java/noppes/npcs/api/handler/data/ICustomEffect.java +++ b/java/noppes/npcs/api/handler/data/ICustomEffect.java @@ -6,8 +6,6 @@ public interface ICustomEffect { String getName(); - boolean isCustom(); - void setMenuName(String name); String getMenuName(); diff --git a/java/noppes/npcs/api/handler/data/IPlayerEffect.java b/java/noppes/npcs/api/handler/data/IPlayerEffect.java index 2ea44a2..c59bd12 100644 --- a/java/noppes/npcs/api/handler/data/IPlayerEffect.java +++ b/java/noppes/npcs/api/handler/data/IPlayerEffect.java @@ -22,5 +22,5 @@ public interface IPlayerEffect { int getIndex(); - void setIndex(); + void setIndex(int index); } From 21d491cca8fb7454a54d367463f191d5868ded20 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 10 Feb 2025 17:24:15 -0500 Subject: [PATCH 4/5] Update ICustomEffectHandler.java --- .../{IStatusEffectHandler.java => ICustomEffectHandler.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename java/noppes/npcs/api/handler/{IStatusEffectHandler.java => ICustomEffectHandler.java} (97%) diff --git a/java/noppes/npcs/api/handler/IStatusEffectHandler.java b/java/noppes/npcs/api/handler/ICustomEffectHandler.java similarity index 97% rename from java/noppes/npcs/api/handler/IStatusEffectHandler.java rename to java/noppes/npcs/api/handler/ICustomEffectHandler.java index df8bdb4..0a376e6 100644 --- a/java/noppes/npcs/api/handler/IStatusEffectHandler.java +++ b/java/noppes/npcs/api/handler/ICustomEffectHandler.java @@ -3,7 +3,7 @@ package noppes.npcs.api.handler; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ICustomEffect; -public interface IStatusEffectHandler { +public interface ICustomEffectHandler { ICustomEffect createEffect(String name); From 16867087899cdabbaf55506727ce19130b994dee Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 11 Feb 2025 14:11:25 -0500 Subject: [PATCH 5/5] Item Linked --- java/noppes/npcs/api/event/ILinkedItemEvent.java | 10 ++++++++++ java/noppes/npcs/api/item/IItemLinked.java | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 java/noppes/npcs/api/event/ILinkedItemEvent.java create mode 100644 java/noppes/npcs/api/item/IItemLinked.java diff --git a/java/noppes/npcs/api/event/ILinkedItemEvent.java b/java/noppes/npcs/api/event/ILinkedItemEvent.java new file mode 100644 index 0000000..3596991 --- /dev/null +++ b/java/noppes/npcs/api/event/ILinkedItemEvent.java @@ -0,0 +1,10 @@ +package noppes.npcs.api.event; + +public interface ILinkedItemEvent extends IItemEvent { + + // Version Change Event + + // onBreakEvent if Durability Expires or Consumed + + // onRepairEvent +} diff --git a/java/noppes/npcs/api/item/IItemLinked.java b/java/noppes/npcs/api/item/IItemLinked.java new file mode 100644 index 0000000..60f4f3c --- /dev/null +++ b/java/noppes/npcs/api/item/IItemLinked.java @@ -0,0 +1,5 @@ +package noppes.npcs.api.item; + +public interface IItemLinked extends IItemCustom { + +}