The script controller now checks whether a language can have objects loaded into it on startup, catching an exception and skipping that language as available if so.

This commit is contained in:
Luis C.M committed 2022-05-29 16:01:05 -05:00
1 parent e4eb0e9cd8
commit c0406958a3
7 files changed
+40 -12

No files matched your search

@@ -8,8 +8,7 @@ import net.minecraft.client.gui.GuiYesNoCallback;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.server.MinecraftServer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.DataScript;
import noppes.npcs.controllers.data.DataScript;
import noppes.npcs.NoppesStringUtils;
import noppes.npcs.client.Client;
import noppes.npcs.client.NoppesUtil;
@@ -67,7 +67,13 @@ public class ScriptController {
for(ScriptEngineFactory fac : manager.getEngineFactories()){
if(fac.getExtensions().isEmpty())
continue;
fac.getScriptEngine();
ScriptEngine scriptEngine = fac.getScriptEngine();
try {
scriptEngine.put("$RunTest",null);
} catch (Exception e) {
continue;
}
String ext = "." + fac.getExtensions().get(0).toLowerCase();
LogWriter.info(fac.getLanguageName() + ": " + ext);
languages.put(fac.getLanguageName(), ext);
@@ -1,4 +1,4 @@
package noppes.npcs;
package noppes.npcs.controllers.data;
import java.util.*;
@@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import noppes.npcs.EventHooks;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.IScriptHandler;
@@ -58,7 +59,14 @@ public class DataScript implements IScriptHandler {
public void readFromNBT(NBTTagCompound compound) {
scripts = readScript(compound.getTagList("ScriptsContainers", 10));
scriptLanguage = compound.getString("ScriptLanguage");
this.scriptLanguage = compound.getString("ScriptLanguage");
if (!ScriptController.Instance.languages.containsKey(scriptLanguage)) {
if (!ScriptController.Instance.languages.isEmpty()) {
this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0];
} else {
this.scriptLanguage = "ECMAScript";
}
}
enabled = compound.getBoolean("ScriptEnabled");
}
@@ -38,6 +38,13 @@ public class ForgeDataScript implements IScriptHandler {
public void readFromNBT(NBTTagCompound compound) {
this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this);
this.scriptLanguage = compound.getString("ScriptLanguage");
if (!ScriptController.Instance.languages.containsKey(scriptLanguage)) {
if (!ScriptController.Instance.languages.isEmpty()) {
this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0];
} else {
this.scriptLanguage = "ECMAScript";
}
}
this.enabled = compound.getBoolean("ScriptEnabled");
}
@@ -41,6 +41,13 @@ public class NPCDataScript implements IScriptHandler {
public void readFromNBT(NBTTagCompound compound) {
this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this);
this.scriptLanguage = compound.getString("ScriptLanguage");
if (!ScriptController.Instance.languages.containsKey(scriptLanguage)) {
if (!ScriptController.Instance.languages.isEmpty()) {
this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0];
} else {
this.scriptLanguage = "ECMAScript";
}
}
this.enabled = compound.getBoolean("ScriptEnabled");
this.console = NBTTags.GetLongStringMap(compound.getTagList("ScriptConsole", 10));
}
@@ -47,6 +47,13 @@ public class PlayerDataScript implements IScriptHandler {
public void readFromNBT(NBTTagCompound compound) {
this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this);
this.scriptLanguage = compound.getString("ScriptLanguage");
if (!ScriptController.Instance.languages.containsKey(scriptLanguage)) {
if (!ScriptController.Instance.languages.isEmpty()) {
this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0];
} else {
this.scriptLanguage = "ECMAScript";
}
}
this.enabled = compound.getBoolean("ScriptEnabled");
this.console = NBTTags.GetLongStringMap(compound.getTagList("ScriptConsole", 10));
}
@@ -62,17 +62,11 @@ import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.constants.EnumPotionType;
import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.constants.EnumStandingType;
import noppes.npcs.controllers.data.Dialog;
import noppes.npcs.controllers.data.DialogOption;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.controllers.data.*;
import noppes.npcs.controllers.FactionController;
import noppes.npcs.controllers.data.Line;
import noppes.npcs.controllers.LinkedNpcController;
import noppes.npcs.controllers.LinkedNpcController.LinkedData;
import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.data.PlayerQuestData;
import noppes.npcs.controllers.data.QuestData;
import noppes.npcs.controllers.data.DataTransform;
import noppes.npcs.entity.data.DataTimers;
import noppes.npcs.roles.JobBard;
import noppes.npcs.roles.JobFollower;