Move contextTypeName to ScriptHolder

zbx1425 · Feb 7, 2024 · 4f299eb · 4f299eb
1 parent 461bcb1
commit 4f299eb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/data/EyeCandyRegistry.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/data/EyeCandyRegistry.java
@@ -125,7 +125,7 @@ MtrModelRegistryUtil.resourceManager,  new ResourceLocation(obj.get("atlasIndex"
                 ResourceLocation scriptLocation = new ResourceLocation(scriptFiles.get(i).getAsString());
                 scripts.put(scriptLocation, ResourceUtil.readResource(resourceManager, scriptLocation));
             }
-            scriptContext.load("EyeCandy " + key, resourceManager, scripts);
+            scriptContext.load("EyeCandy " + key, "Block", resourceManager, scripts);
 
             return new EyeCandyProperties(Text.translatable(obj.get("name").getAsString()), scriptContext);
         } else {

diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/data/ScriptedCustomTrains.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/data/ScriptedCustomTrains.java
@@ -58,7 +58,7 @@ public static void init(ResourceManager resourceManager) {
                                 scripts.put(scriptLocation, null);
                             }
                         }
-                        scriptContext.load("Train " + entry.getKey(), resourceManager, scripts);
+                        scriptContext.load("Train " + entry.getKey(), "Train", resourceManager, scripts);
 
                         boolean dummyBaseTrain = jsonObject.has("base_type");
                         String baseTrainType = dummyBaseTrain ? jsonObject.get("base_type").getAsString() : prevTrainProp.baseTrainType;

diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/AbstractScriptContext.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/AbstractScriptContext.java
@@ -22,8 +22,6 @@ public abstract class AbstractScriptContext {
 
     public abstract Object getWrapperObject();
 
-    public abstract String getContextTypeName();
-
     public abstract boolean isBearerAlive();
 
     public void setDebugInfo(String key, Object value) {

diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/ScriptHolder.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/ScriptHolder.java
@@ -37,10 +37,12 @@ public class ScriptHolder {
     public Exception failException = null;
 
     public String name;
+    public String contextTypeName;
     private Map<ResourceLocation, String> scripts;
 
-    public void load(String name, ResourceManager resourceManager, Map<ResourceLocation, String> scripts) throws Exception {
+    public void load(String name, String contextTypeName, ResourceManager resourceManager, Map<ResourceLocation, String> scripts) throws Exception {
         this.name = name;
+        this.contextTypeName = contextTypeName;
         this.scripts = scripts;
         Context rhinoCtx = Context.enter();
         rhinoCtx.setLanguageVersion(Context.VERSION_ES6);
@@ -105,8 +107,11 @@ public void load(String name, ResourceManager resourceManager, Map<ResourceLocat
                         ? ResourceUtil.readResource(resourceManager, entry.getKey()) : entry.getValue();
                 ScriptResourceUtil.executeScript(rhinoCtx, scope, entry.getKey(), scriptStr);
                 acquireFunction("create", createFunctions);
+                acquireFunction("create" + contextTypeName, createFunctions);
                 acquireFunction("render", renderFunctions);
+                acquireFunction("render" + contextTypeName, renderFunctions);
                 acquireFunction("dispose", disposeFunctions);
+                acquireFunction("dispose" + contextTypeName, disposeFunctions);
             }
             ScriptResourceUtil.activeContext = null;
             ScriptResourceUtil.activeScope = null;
@@ -116,7 +121,7 @@ public void load(String name, ResourceManager resourceManager, Map<ResourceLocat
     }
 
     public void reload(ResourceManager resourceManager) throws Exception {
-        load(name, resourceManager, scripts);
+        load(name, contextTypeName, resourceManager, scripts);
     }
 
     private void acquireFunction(String functionName, List<Function> target) {

diff --git a/...rc/main/java/cn/zbx1425/mtrsteamloco/render/scripting/eyecandy/EyeCandyScriptContext.java b/...rc/main/java/cn/zbx1425/mtrsteamloco/render/scripting/eyecandy/EyeCandyScriptContext.java
@@ -37,11 +37,6 @@ public Object getWrapperObject() {
         return entity;
     }
 
-    @Override
-    public String getContextTypeName() {
-        return "Block";
-    }
-
     @Override
     public boolean isBearerAlive() {
         return !entity.isRemoved();

diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/train/TrainScriptContext.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/train/TrainScriptContext.java
@@ -51,11 +51,6 @@ public Object getWrapperObject() {
         return trainExtra;
     }
 
-    @Override
-    public String getContextTypeName() {
-        return "Train";
-    }
-
     @Override
     public boolean isBearerAlive() {
         return !train.isRemoved && ClientData.TRAINS.contains(train);