Use Haxe 4.3 features

mc2it · Apr 9, 2023 · 2594922 · 2594922
1 parent 098623d
commit 2594922
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.2.5",
+  "version": "4.3.0",
   "resolveLibs": "scoped"
 }
diff --git a/bin/mc2it_card.js b/bin/mc2it_card.js
diff --git a/haxe_libraries/tink_core.hxml b/haxe_libraries/tink_core.hxml
@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/tink_core#2.1.0" into tink_core/2.1.0/haxelib
--cp ${HAXE_LIBCACHE}/tink_core/2.1.0/haxelib/src
--D tink_core=2.1.0
+# @install: lix --silent download "haxelib:/tink_core#2.1.1" into tink_core/2.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.1/haxelib/src
+-D tink_core=2.1.1
diff --git a/scripts/Watch.hx b/scripts/Watch.hx
@@ -16,5 +16,5 @@ private function measureCallback(?done: Callback<Null<JsError>>, ?prompt: String
 	final timestamp = Timer.stamp();
 	callback.invoke(Noise);
 	Sys.println('> ${Tools.formatDuration(Timer.stamp() - timestamp)}');
-	if (done != null) done.invoke(null);
+	done?.invoke(null);
 } catch (e) { done != null ? done.invoke(new JsError(e.message)) : throw e; }
diff --git a/src/mc2it_card/CardBuilder.hx b/src/mc2it_card/CardBuilder.hx
@@ -38,7 +38,7 @@ abstract CardBuilder(StringBuf) from StringBuf {
 	/** Appends a line of plain text. **/
 	function addLine(text: String) {
 		this.add('$indent$text${Program.newLine}');
-		return (this: CardBuilder);
+		return abstract;
 	}
 
 	/** Gets the length in characters of the specified text, excluding formatting tags. **/