Merge branch 'dev' into syntax-highlighter-unified

This commit is contained in:
Kam committed 2026-03-03 23:01:37 -05:00
commit 2eecf9c230
3 files changed
+9 -6

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
id "dts.typescript-generator"
}
version = "1.11-beta12"
version = "1.11-beta13"
group= "kamkeel.customnpc-plus"
archivesBaseName = "CustomNPC-Plus"
+1 -1
View File
@@ -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")
@@ -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", "",