Skip to content

Commit ac9653f

Browse files
committed
hi
1 parent 78231cb commit ac9653f

File tree

5 files changed

+45
-8
lines changed

5 files changed

+45
-8
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
run: |
2424
haxelib setup ~/haxelib
2525
haxelib install hxcpp > /dev/null --quiet
26-
haxelib install hmm --quiet
27-
haxelib run hmm install
26+
haxe -cp ./setup -D analyzer-optimize -main Main --interp
2827
- name: Skip SScript setup mode
2928
run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
3029
- name: Create Version Tag

.github/workflows/mac.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
run: |
2222
haxelib setup ~/haxelib
2323
haxelib install hxcpp > /dev/null --quiet
24-
haxelib install hmm --quiet
25-
haxelib run hmm install
24+
haxe -cp ./setup -D analyzer-optimize -main Main --interp
2625
- name: Skip SScript setup mode
2726
run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
2827
- name: Create Version Tag

.github/workflows/windows.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
run: |
2121
haxelib setup C:/haxelib
2222
haxelib install hxcpp > /dev/null --quiet
23-
haxelib install hmm --quiet
24-
haxelib run hmm install
23+
haxe -cp ./setup -D analyzer-optimize -main Main --interp
2524
shell: cmd
2625
- name: Skip SScript setup mode
2726
run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa

setup/Main.hx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package;
2+
3+
import haxe.Json;
4+
import sys.FileSystem;
5+
import sys.io.File;
6+
7+
typedef Library = {
8+
name:String, type:String,
9+
version:String, dir:String,
10+
ref:String, url:String
11+
}
12+
13+
class Main {//stolen from psych source
14+
public static function main():Void {
15+
// Create a folder to prevent messing with hmm libraries
16+
if (!FileSystem.exists(".haxelib"))
17+
FileSystem.createDirectory(".haxelib");
18+
19+
// brief explanation: first we parse a json containing the library names, data, and such
20+
final libs:Array<Library> = Json.parse(File.getContent('./hmm.json')).dependencies;
21+
22+
// now we loop through the data we currently have
23+
for (data in libs) {
24+
// and install the libraries, based on their type
25+
switch (data.type) {
26+
case "install", "haxelib": // for libraries only available in the haxe package manager
27+
final version:String = data.version == null ? "" : data.version;
28+
Sys.command('haxelib --quiet install ${data.name} ${version}');
29+
case "git": // for libraries that contain git repositories
30+
final ref:String = data.ref == null ? "" : data.ref;
31+
Sys.command('haxelib --quiet git ${data.name} ${data.url} ${data.ref}');
32+
default: // and finally, throw an error if the library has no type
33+
Sys.println('[ASTRO ENGINE SETUP]: Unable to resolve library of type "${data.type}" for library "${data.name}"');
34+
}
35+
}
36+
37+
// after the loop, we can leave
38+
Sys.exit(0);
39+
}
40+
}

source/funkin/backend/client/Discord.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class DiscordClient
5151
var requestPtr:cpp.Star<DiscordUser> = cpp.ConstPointer.fromRaw(request).ptr;
5252

5353
if (Std.parseInt(cast(requestPtr.discriminator, String)) != 0) // New Discord IDs/Discriminator system
54-
traceFr('Connected to User [${cast (requestPtr.username, String)}#${cast (requestPtr.discriminator, String)}]');
54+
traceFr('Connected to User (${cast (requestPtr.username, String)}#${cast (requestPtr.discriminator, String)})');
5555
else // Old discriminators
56-
traceFr('Connected to User [${cast (requestPtr.username, String)}]');
56+
traceFr('Connected to User (${cast (requestPtr.username, String)})');
5757

5858
changePresence();
5959
}

0 commit comments

Comments
 (0)