perf(molangkit): use a map instead of a list in the flavorcache to no…

…t do a lookup every frame
LunarClient · Mar 9, 2024 · 03430cc · 03430cc
1 parent bb7e919
commit 03430cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ plugins {
 
 apply plugin: 'maven-publish'
 apply plugin: 'com.google.cloud.artifactregistry.gradle-plugin'
-version = "1.0.10"
+version = "1.0.11"
 group = "com.eliotlash.molang"
 archivesBaseName = "particleman"
 

diff --git a/src/main/java/com/eliotlash/molang/variables/ExecutionContext.java b/src/main/java/com/eliotlash/molang/variables/ExecutionContext.java
@@ -35,7 +35,7 @@ public class ExecutionContext {
     private final Evaluator evaluator;
 
     public final Stack<Expr.Access> contextStack = new Stack<>();
-    public final Map<VariableFlavor, List<Pair<RuntimeVariable, Expr.Access>>> flavorCache = new HashMap<>();
+    public final Map<VariableFlavor, Map<RuntimeVariable, Expr.Access>> flavorCache = new HashMap<>();
     public final Object2DoubleMap<Assignable> assignableMap = new Object2DoubleOpenHashMap<>();
     public Object2DoubleMap<Assignable> functionScopedArguments = new Object2DoubleOpenHashMap<>();
 
@@ -84,13 +84,12 @@ public RuntimeVariable parseRuntimeVariable(String name, Expr.Access access) {
         }
 
         if (access != null) {
-            Pair<RuntimeVariable, Expr.Access> pair = Pair.of(runtimeVariable, access);
             if (!flavorCache.containsKey(flavor)) {
-                flavorCache.put(flavor, new ArrayList<>());
+                flavorCache.put(flavor, new HashMap<>());
             }
-            List<Pair<RuntimeVariable, Expr.Access>> list = flavorCache.get(flavor);
-            if (!list.contains(pair)) {
-                list.add(pair);
+            Map<RuntimeVariable, Expr.Access> map = flavorCache.get(flavor);
+            if (!map.containsKey(runtimeVariable)) {
+                map.put(runtimeVariable, access);
             }
         }
         return runtimeVariable;