Use any loader instead of .nlogo loader

Author: ERSUCC

build.sbt

@@ -10,7 +10,7 @@ isSnapshot := true
 
 netLogoExtName      := "ls"
 netLogoClassManager := "org.nlogo.ls.LevelSpace"
-netLogoVersion      := "7.0.0-beta1-c8d671e"
+netLogoVersion      := "7.0.0-beta2"
 netLogoTestExtras   += (baseDirectory.value / "test")
 
 Compile / scalaSource := baseDirectory.value / "src" / "main"

src/main/InterfaceComponent.scala

@@ -93,7 +93,7 @@ with ThemeSync {
     val uri = Paths.get(path).toUri
     interfacePanel.reset()
     val controller = new FileController(this, workspace)
-    val loader = FileFormat.basicLoader
+    val loader = FileFormat.standardAnyLoader(false, workspace.compiler.utilities)
     val modelOpt = OpenModelFromURI(uri, controller, loader, FileFormat.defaultConverter, Version)
     modelOpt.foreach(model => ReconfigureWorkspaceUI(this, uri, ModelType.Library, model, workspace))
   }

src/main/LevelSpaceMenu.scala

@@ -139,7 +139,7 @@ object LevelSpaceMenu {
       FileDialog.setDirectory(App.app.workspace.getModelDir)
 
       val ws = App.app.workspace
-      val loader = FileFormat.basicLoader
+      val loader = FileFormat.standardAnyLoader(false, ws.compiler.utilities)
       val controller = new SaveModel.Controller {
         def chooseFilePath(modelType: org.nlogo.api.ModelType): Option[java.net.URI] = {
           try {

src/main/ModelCodeTab.scala

@@ -24,7 +24,7 @@ with ModelSavedEvent.Handler {
   var currentModel = Option.empty[Model]
 
   locally {
-    val loader = FileFormat.basicLoader
+    val loader = FileFormat.standardAnyLoader(false, workspace.compiler.utilities)
     val controller = new OpenModel.Controller {
       def errorOpeningURI(uri: URI, exception: Exception): Unit = {
         throw new ExtensionException("Levelspace encountered an error while opening: " + Paths.get(uri).toString + ". " + exception.toString)
@@ -92,7 +92,7 @@ with ModelSavedEvent.Handler {
     save()
 
   def save(): Unit = {
-    val loader = FileFormat.basicLoader
+    val loader = FileFormat.standardAnyLoader(false, workspace.compiler.utilities)
     val controller = new SaveModel.Controller {
       def chooseFilePath(modelType: ModelType): Option[URI] = {
         Some(Paths.get(workspace.getModelPath).toUri)