From 0f17060b493f237d0d3882c4c24c4f40fb1e8485 Mon Sep 17 00:00:00 2001
From: MineFact <minefact.minecraft@gmail.com>
Date: Fri, 12 Jan 2024 17:53:11 +0100
Subject: [PATCH] the npcToggleValues value in data.json can also be called
 npcFunctions

---
 .../lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java     | 2 +-
 .../lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
index 52ea3c1..d6b039d 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
@@ -132,7 +132,7 @@ public class ZNpcImporter implements DataImporter {
                 npc.setProperty(propertyRegistry.getByName("skin", SkinDescriptor.class), new PrefetchedDescriptor(new SkinImpl(model.getSkin(), model.getSignature())));
             }
 
-            Map<String, Object> toggleValues = model.getNpcToggleValues();
+            Map<String, Object> toggleValues = model.getNpcToggleValues() == null ? model.getNpcFunctions() : model.getNpcToggleValues();
             if (toggleValues != null) {
                 if (toggleValues.containsKey("look")) {
                     npc.setProperty(propertyRegistry.getByName("look", LookType.class), LookType.CLOSEST_PLAYER);
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java
index 60ec99b..b46488b 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java
@@ -20,6 +20,7 @@ public class ZNpcsModel {
     private List<ZNpcsAction> clickActions;
     private Map<String, String> npcEquip;
     private Map<String, Object> npcToggleValues;
+    private Map<String, Object> npcFunctions;
     private Map<String, String[]> customizationMap;
 
     public int getId() {
@@ -62,6 +63,10 @@ public class ZNpcsModel {
         return npcToggleValues;
     }
 
+    public Map<String, Object> getNpcFunctions() {
+        return npcFunctions;
+    }
+
     public Map<String, String[]> getCustomizationMap() {
         return customizationMap;
     }