Added get_npc_variable and set_npc_variable to player functions for convenience, updated molang for flexibility with query struct nested assignments

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -314,6 +314,30 @@ object MoLangFunctions {
                         return@put vars
                     }
                 }
+                map.put("get_npc_variable") { params ->
+                    val npcId = (params.get<MoValue>(0) as? ObjectValue<NPCEntity>)?.obj?.stringUUID ?: params.getString(0)
+                    val variable = params.getString(1)
+                    val data = Cobblemon.molangData.load(player.uuid)
+                    if (data.map.containsKey(npcId)) {
+                        return@put (data.map[npcId] as VariableStruct).map[variable] ?: DoubleValue.ZERO
+                    }
+                }
+                map.put("set_npc_variable") { params ->
+                    val npcId = (params.get<MoValue>(0) as? ObjectValue<NPCEntity>)?.obj?.stringUUID ?: params.getString(0)
+                    val variable = params.getString(1)
+                    val value = params.get<MoValue>(2)
+                    val saveAfterwards = params.getBooleanOrNull(3) != false
+                    val data = Cobblemon.molangData.load(player.uuid)
+                    if (data.map.containsKey(npcId)) {
+                        (data.map[npcId] as VariableStruct).map[variable] = value
+                        if (saveAfterwards) {
+                            Cobblemon.molangData.save(player.uuid)
+                        }
+                        return@put DoubleValue.ONE
+                    } else {
+                        return@put DoubleValue.ZERO
+                    }
+                }
             }
             map
         }

deps/local/com/bedrockk/molang/1.1.16/molang-1.1.16.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>local.com.bedrockk</groupId>
+    <artifactId>molang</artifactId>
+    <version>1.1.16</version>
+</project>

deps/local/com/bedrockk/molang/maven-metadata-local.xml

@@ -3,10 +3,10 @@
   <groupId>local.com.bedrockk</groupId>
   <artifactId>molang</artifactId>
   <versioning>
-    <release>1.1.15</release>
+    <release>1.1.16</release>
     <versions>
-      <version>1.1.15</version>
+      <version>1.1.16</version>
     </versions>
-    <lastUpdated>20231949390001</lastUpdated>
+    <lastUpdated>20231949390002</lastUpdated>
   </versioning>
 </metadata>

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ loom = "1.7-SNAPSHOT"
 architectury-plugin = "3.4-SNAPSHOT"
 
 # Common
-molang = "1.1.15"
+molang = "1.1.16"
 graal = "22.3.0"
 icu4j = "71.1"
 jei-api = "19.8.2.99"