Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21

Author: rubensworks

resources/changelog/1.19.2-1.0.7.txt

@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Changes:
+* Cache scripts to improve performance
+  Required for CyclopsMC/IntegratedDynamics#1439
+
+Fixes:
+* Fix variable card writing failing when reselecting text, Closes #25

resources/changelog/1.20.1-1.0.7.txt

@@ -0,0 +1,11 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Changes:
+* Cache scripts to improve performance
+  Required for CyclopsMC/IntegratedDynamics#1439
+
+Fixes:
+* Fix variable card writing failing when reselecting text, Closes #25
+
+

src/main/java/org/cyclops/integratedscripting/core/network/ScriptingNetwork.java

@@ -3,6 +3,7 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import net.minecraft.network.chat.Component;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
 import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
@@ -26,6 +27,7 @@
 public class ScriptingNetwork implements IScriptingNetwork {
 
     private final Set<Integer> disks = Sets.newHashSet();
+    private final Map<Pair<Integer, Path>, IScript> scriptCache = Maps.newHashMap();
     private final Map<Triple<Integer, Path, String>, ScriptVariable> variableCache = Maps.newHashMap();
 
     @Override
@@ -46,12 +48,21 @@ public Set<Integer> getDisks() {
     @Nullable
     @Override
     public IScript getScript(int disk, Path path) throws EvaluationException {
-        ILanguageHandler languageHandler = LanguageHandlers.REGISTRY.getProvider(path);
-        if (languageHandler == null) {
-            throw new EvaluationException(Component.translatable("script.integratedscripting.error.unsupported_language", path.toString()));
+        Pair<Integer, Path> cacheKey = Pair.of(disk, path);
+        IScript script = scriptCache.get(cacheKey);
+        if (script == null) {
+            ILanguageHandler languageHandler = LanguageHandlers.REGISTRY.getProvider(path);
+            if (languageHandler == null) {
+                throw new EvaluationException(Component.translatable("script.integratedscripting.error.unsupported_language", path.toString()));
+            }
+            IScriptFactory scriptFactory = languageHandler.getScriptFactory();
+            script = scriptFactory.getScript(disk, path);
+            if (script != null) {
+                script.addInvalidationListener(() -> scriptCache.remove(cacheKey));
+                scriptCache.put(cacheKey, script);
+            }
         }
-        IScriptFactory scriptFactory = languageHandler.getScriptFactory();
-        return scriptFactory.getScript(disk, path);
+        return script;
     }
 
     @Override

src/main/java/org/cyclops/integratedscripting/inventory/container/ContainerTerminalScripting.java

@@ -45,11 +45,7 @@
 
 import javax.annotation.Nullable;
 import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 /**
@@ -375,8 +371,8 @@ public IScriptVariableFacade create(int id) {
     }
 
     @Override
-    public void setValue(int valueId, CompoundTag value) {
-        super.setValue(valueId, value);
+    public void onUpdate(int valueId, CompoundTag value) {
+        super.onUpdate(valueId, value);
 
         // Potentially trigger a variable write when a new member was selected
         if (valueId == selectionId) {