Merge branch 'dev' into syntax-highlighter-unified

This commit is contained in:
Kam committed 2026-03-06 22:03:52 -05:00
commit 5669fe2fda
19 files changed
+529 -16

No files matched your search

@@ -9,8 +9,11 @@ import noppes.npcs.api.entity.IPlayer;
import noppes.npcs.api.handler.data.ICustomEffect;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.controllers.CustomEffectController;
import noppes.npcs.controllers.TagController;
import noppes.npcs.scripted.event.player.PlayerEvent;
import java.util.HashSet;
import java.util.UUID;
import java.util.function.Consumer;
public class CustomEffect implements ICustomEffect {
@@ -36,6 +39,8 @@ public class CustomEffect implements ICustomEffect {
public int index = 0;
public HashSet<UUID> tagUUIDs = new HashSet<>();
public CustomEffect() {
}
@@ -261,6 +266,8 @@ public class CustomEffect implements ICustomEffect {
compound.setInteger("iconFrameCount", frameCount);
compound.setInteger("iconFrameTime", frametime);
TagController.writeTagUUIDs(compound, "TagUUIDs", tagUUIDs);
if (saveScripts) {
NBTTagCompound scriptData = new NBTTagCompound();
EffectScript handler = getScriptHandler();
@@ -309,6 +316,8 @@ public class CustomEffect implements ICustomEffect {
if (compound.hasKey("iconFrameTime"))
frametime = Math.max(1, compound.getInteger("iconFrameTime"));
tagUUIDs = TagController.readTagUUIDs(compound, "TagUUIDs");
if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) {
EffectScript handler = new EffectScript();
handler.readFromNBT(compound.getCompoundTag("ScriptData"));
@@ -8,9 +8,13 @@ import noppes.npcs.EventHooks;
import noppes.npcs.api.handler.data.ILinkedItem;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.controllers.LinkedItemController;
import noppes.npcs.controllers.TagController;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.item.ScriptLinkedItem;
import java.util.HashSet;
import java.util.UUID;
public class LinkedItem implements ILinkedItem {
public static final String LINKED_VERSION_VERSION_TAG = "LinkedVersion";
public static final String LINKED_DATA_NBT_TAG = "LinkedData";
@@ -33,6 +37,8 @@ public class LinkedItem implements ILinkedItem {
public int armorType = -2; //-2: Fits in no armor slot, -1: Fits in all slots, 0 - 3: Fits in Head -> Boots slot respectively
public int enchantability;
public HashSet<UUID> tagUUIDs = new HashSet<>();
public LinkedItem() {
this("New");
}
@@ -67,6 +73,8 @@ public class LinkedItem implements ILinkedItem {
compound.setInteger("MaxItemUseDuration", this.maxItemUseDuration);
compound.setInteger("ItemUseAction", this.itemUseAction);
TagController.writeTagUUIDs(compound, "TagUUIDs", tagUUIDs);
if (saveScripts) {
NBTTagCompound scriptData = new NBTTagCompound();
LinkedItemScript handler = getScriptHandler();
@@ -97,6 +105,8 @@ public class LinkedItem implements ILinkedItem {
this.maxItemUseDuration = compound.getInteger("MaxItemUseDuration");
this.itemUseAction = compound.getInteger("ItemUseAction");
tagUUIDs = TagController.readTagUUIDs(compound, "TagUUIDs");
if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) {
LinkedItemScript handler = new LinkedItemScript();
handler.readFromNBT(compound.getCompoundTag("ScriptData"));