diff --git a/build.gradle b/build.gradle index 6b8d112eb..9890ff686 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id "dts.typescript-generator" } -version = "1.11-beta12" +version = "1.11-beta13" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 475416f08..c3c6b1646 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -124,7 +124,7 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11-beta12") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11-beta13") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") diff --git a/src/main/java/noppes/npcs/constants/ScriptContext.java b/src/main/java/noppes/npcs/constants/ScriptContext.java index e35a361d7..444006d30 100644 --- a/src/main/java/noppes/npcs/constants/ScriptContext.java +++ b/src/main/java/noppes/npcs/constants/ScriptContext.java @@ -11,12 +11,14 @@ import noppes.npcs.api.event.IEnergyProjectileEvent; import noppes.npcs.api.event.IFactionEvent; import noppes.npcs.api.event.IForgeEvent; import noppes.npcs.api.event.IItemEvent; +import noppes.npcs.api.event.ILinkedItemEvent; import noppes.npcs.api.event.INpcEvent; import noppes.npcs.api.event.IPartyEvent; import noppes.npcs.api.event.IChainEvent; import noppes.npcs.api.event.IPlayerEvent; import noppes.npcs.api.event.IProjectileEvent; import noppes.npcs.api.event.IQuestEvent; +import noppes.npcs.api.event.IRecipeEvent; import java.util.ArrayList; import java.util.Arrays; @@ -93,23 +95,24 @@ public class ScriptContext { ); public static final ScriptContext LINKED_ITEM = register("LINKED_ITEM", "linked_item", + ILinkedItemEvent.class, IItemEvent.class ); public static final ScriptContext RECIPE = register("RECIPE", "recipe", - "Recipe" + IRecipeEvent.class ); public static final ScriptContext EFFECT = register("EFFECT", "effect", - "Effect" + IPlayerEvent.class ); public static final ScriptContext ABILITY = register("ABILITY", "ability", - "Ability" + IAbilityEvent.class ); public static final ScriptContext CHAINED_ABILITY = register("CHAINED_ABILITY", "chained_ability", - "ChainedAbility" + IChainEvent.class ); public static final ScriptContext GLOBAL = register("GLOBAL", "",