Fix CI

.github/workflows/package-macos.yml

@@ -21,23 +21,23 @@ jobs:
     steps:
       # Checkout, install haxe and libs
       - uses: actions/checkout@v2
-      - uses: krdlab/setup-haxe@v1
+      - uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ matrix.haxe }}
       - run: haxe -version
       - run: haxe setup.hxml
       - run: haxelib list
 
       # Node/NPM commands
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: '14'
+          node-version: '20'
       - run: cd app && npm install
       - run: cd app && npm run pack-prepare
       - run: cd app && npm run pack-macos
 
       # Upload
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v7
         with:
           name: mac-distribution
           path: app/redist/LDtk**installer.dmg

.github/workflows/package-raspberry.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       # Checkout, install haxe and libs
       - uses: actions/checkout@v2
-      - uses: krdlab/setup-haxe@v1
+      - uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ matrix.haxe }}
 
@@ -34,14 +34,14 @@ jobs:
       - run: haxelib list
 
       # Node/NPM commands
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: '14'
+          node-version: '20'
       - run: cd app && npm install
       - run: cd app && npm run pack-linux-arm64
 
       # Upload
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v7
         with:
           name: raspberry-distribution
           path: app/redist/LDtk**installer.AppImage

.github/workflows/package-ubuntu-dev.yml

@@ -28,7 +28,7 @@ jobs:
 
       # Checkout, install haxe and libs
       - uses: actions/checkout@v2
-      - uses: krdlab/setup-haxe@v1
+      - uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ matrix.haxe }}
       - run: haxe -version
@@ -58,14 +58,14 @@ jobs:
       - run: haxelib list
 
       # Node/NPM commands
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: '14'
+          node-version: '20'
       - run: cd app && npm install
       - run: cd app && npm run pack-linux-x86
 
       # Upload
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v7
         with:
           name: ubuntu-distribution
           path: app/redist/LDtk**installer.AppImage

.github/workflows/package-ubuntu.yml

@@ -21,22 +21,22 @@ jobs:
     steps:
       # Checkout, install haxe and libs
       - uses: actions/checkout@v2
-      - uses: krdlab/setup-haxe@v1
+      - uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ matrix.haxe }}
       - run: haxe -version
       - run: haxe setup.hxml
       - run: haxelib list
 
       # Node/NPM commands
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: '14'
+          node-version: '20'
       - run: cd app && npm install
       - run: cd app && npm run pack-linux-x86
 
       # Upload
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v7
         with:
           name: ubuntu-distribution
           path: app/redist/LDtk**installer.AppImage

.github/workflows/test-windows.yml

@@ -29,7 +29,7 @@ jobs:
 
       # Checkout & install haxe
       - uses: actions/checkout@v2
-      - uses: krdlab/setup-haxe@v1
+      - uses: krdlab/setup-haxe@v2
         with:
           haxe-version: ${{ matrix.haxe }}
       - run: haxe -version
@@ -59,9 +59,9 @@ jobs:
       - run: haxelib list
 
       # Node/NPM commands
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v6
         with:
-          node-version: '14'
+          node-version: '20'
       - run: cd app && npm install
       - run: cd app && npm run compile
 

src/electron.renderer/form/input/EnumSelect.hx

@@ -4,7 +4,7 @@ class EnumSelect<T:EnumValue> extends form.Input<T> {
 	var enumRef : Enum<T>;
 	var allowNull : Bool;
 
-	public function new(j:js.jquery.JQuery, e:Enum<T>, allowNull=false, getter:Void->T, setter:T->Void, ?nameLocalizer:T->dn.data.GetText.LocaleString, ?keepOnly:T->Bool, disableFilteredOuts=false) {
+	public function new(j:js.jquery.JQuery, e:Enum<T>, allowNull=false, getter:Void->T, setter:T->Void, ?nameLocalizer:T->LocaleString, ?keepOnly:T->Bool, disableFilteredOuts=false) {
 		this.allowNull = allowNull;
 
 		super(j, getter, setter);

src/electron.renderer/import.hx

@@ -9,6 +9,7 @@ import dn.legacy.Color as C;
 import hxd.Key as K;
 import Lang as L;
 import dn.data.GetText;
+import dn.data.LocaleString;
 import dn.js.ElectronTools as ET;
 import dn.js.NodeTools as NT;
 

src/electron.renderer/page/Editor.hx

@@ -1836,7 +1836,7 @@ class Editor extends Page {
 			return;
 		ui.Modal.closeAll();
 		if( needSaving )
-			new ui.modal.dialog.UnsavedChanges( bt, App.ME.loadPage.bind( ()->new Home() ) );
+			new ui.modal.dialog.UnsavedChanges( bt, () -> App.ME.loadPage( ()->new Home() ) );
 		else
 			App.ME.loadPage( ()->new Home(), true );
 	}
@@ -2549,7 +2549,7 @@ class Editor extends Page {
 		var jGuide = new J("#guide");
 		jGuide.empty();
 
-		function _createGuideBlock(?keys:Array<Int>, mouseIconId:Null<String>, label:dn.data.GetText.LocaleString) {
+		function _createGuideBlock(?keys:Array<Int>, mouseIconId:Null<String>, label:LocaleString) {
 			var block = new J('<span/>');
 			block.appendTo(jGuide);
 

src/electron.renderer/ui/LastChance.hx

@@ -4,7 +4,7 @@ class LastChance extends dn.Process {
 	static var CUR : Null<LastChance>;
 	var elem : js.jquery.JQuery;
 
-	public function new(str:dn.data.GetText.LocaleString, project:data.Project) {
+	public function new(str:LocaleString, project:data.Project) {
 		super(Editor.ME);
 
 		LastChance.end();

src/electron.renderer/ui/modal/ContextMenu.hx

@@ -1,7 +1,5 @@
 package ui.modal;
 
-import dn.data.GetText.LocaleString;
-
 typedef ContextActions = Array<ContextAction>;
 typedef ContextAction = {
 	var ?label : LocaleString;

src/electron.renderer/ui/modal/Dialog.hx

@@ -40,22 +40,22 @@ class Dialog extends ui.Modal {
 	}
 
 
-	public function addTitle(label:dn.data.GetText.LocaleString, atTheBeginning:Bool) {
+	public function addTitle(label:LocaleString, atTheBeginning:Bool) {
 		var t = new J('<h2>$label</h2>');
 		if( atTheBeginning )
 			jContent.prepend(t);
 		else
 			jContent.append(t);
 	}
 
-	public function addParagraph(str:dn.data.GetText.LocaleString, ?className:String) {
+	public function addParagraph(str:LocaleString, ?className:String) {
 		var jElem = new J('<p>$str</p>');
 		if( className!=null )
 			jElem.addClass(className);
 		jContent.append(jElem);
 	}
 
-	public function addDiv(str:dn.data.GetText.LocaleString, ?className:String) {
+	public function addDiv(str:LocaleString, ?className:String) {
 		var jElem = new J('<div>$str</div>');
 		if( className!=null )
 			jElem.addClass(className);

src/electron.renderer/ui/modal/dialog/EditAppSettings.hx

@@ -166,7 +166,7 @@ class EditAppSettings extends ui.modal.Dialog {
 				jOpt.prop("selected",true);
 		}
 		jSelect.change( (_)->{
-			settings.v.fieldsRender = FieldsRender.createByName( jSelect.val() );
+			settings.v.fieldsRender = Settings.FieldsRender.createByName( jSelect.val() );
 			onSettingChanged();
 		});
 

src/electron.renderer/ui/modal/dialog/InputDialog.hx

@@ -8,7 +8,7 @@ class InputDialog<T> extends ui.modal.Dialog {
 	var parser : String->T;
 	var onConfirm : T->Void;
 
-	public function new(desc:dn.data.GetText.LocaleString, ?curValue:T, ?suffix="", ?getError:T->Null<String>, parser:String->T, onConfirm:T->Void) {
+	public function new(desc:LocaleString, ?curValue:T, ?suffix="", ?getError:T->Null<String>, parser:String->T, onConfirm:T->Void) {
 		super("inputDialog");
 
 		this.getError = getError;

src/electron.renderer/ui/modal/dialog/Message.hx

@@ -1,7 +1,7 @@
 package ui.modal.dialog;
 
 class Message extends ui.modal.Dialog {
-	public function new(?str:dn.data.GetText.LocaleString, ?iconId:String, ?onClose:Void->Void) {
+	public function new(?str:LocaleString, ?iconId:String, ?onClose:Void->Void) {
 		super("message");
 
 		if( iconId!=null ) {

src/electron.renderer/ui/modal/dialog/Retry.hx

@@ -1,7 +1,7 @@
 package ui.modal.dialog;
 
 class Retry extends ui.modal.Dialog {
-	public function new(str:dn.data.GetText.LocaleString, cb:Void->Void) {
+	public function new(str:LocaleString, cb:Void->Void) {
 		super("retry");
 
 		jContent.append('<h2>Error</h2>');

src/electron.renderer/ui/modal/dialog/Warning.hx

@@ -1,7 +1,7 @@
 package ui.modal.dialog;
 
 class Warning extends ui.modal.Dialog {
-	public function new(str:dn.data.GetText.LocaleString) {
+	public function new(str:LocaleString) {
 		super("warning");
 
 		jContent.append('<h2>Warning</h2>');