Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-24 07:02:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source
This commit is contained in:
KingRainbow44 2023-05-19 19:26:01 -04:00
commit bda963adca
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@ -137,9 +137,6 @@ public final class ResourceLoader {
var textMaps = ResourceLoader.runAsync(Language::loadTextMaps); var textMaps = ResourceLoader.runAsync(Language::loadTextMaps);
// Load 'BinOutput'. // Load 'BinOutput'.
var binOutput = ResourceLoader.loadConfigData(); var binOutput = ResourceLoader.loadConfigData();
// Load 'ExcelBinOutput'.
var errors = new ConcurrentLinkedQueue<Pair<String, Exception>>();
var excelBinOutput = ResourceLoader.loadResources(true, errors);
// Load ability lists. // Load ability lists.
var abilities = var abilities =
ResourceLoader.runAsync( ResourceLoader.runAsync(
@ -148,6 +145,9 @@ public final class ResourceLoader {
ResourceLoader.loadOpenConfig(); ResourceLoader.loadOpenConfig();
ResourceLoader.loadAbilityModifiers(); ResourceLoader.loadAbilityModifiers();
}); });
// Load 'ExcelBinOutput'.
var errors = new ConcurrentLinkedQueue<Pair<String, Exception>>();
var excelBinOutput = ResourceLoader.loadResources(true, errors);
// Load spawn data and quests. // Load spawn data and quests.
var scene = var scene =
ResourceLoader.runAsync( ResourceLoader.runAsync(