Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unit tests, server

Browse Source
This commit is contained in:
Anuken
2019-10-02 21:29:35 -04:00
parent ffd4297b17
commit 89db08f4ed
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/Vars.java
View File

@@ -196,7 +196,7 @@ public class Vars implements Loadable{
Version.init(); Version.init();
if(files ==null) tree = new FileTree(); if(tree == null) tree = new FileTree();
if(mods == null) mods = new Mods(); if(mods == null) mods = new Mods();
content = new ContentLoader(); content = new ContentLoader();
@@ -254,16 +254,12 @@ public class Vars implements Loadable{
maps.load(); maps.load();
} }
public static void createDirectories(){ public static void loadSettings(){
Core.settings.setAppName(appName); Core.settings.setAppName(appName);
if(steam || Version.modifier.equals("steam")){ if(steam || "steam".equals(Version.modifier)){
Core.settings.setDataDirectory(Core.files.local("saves/")); Core.settings.setDataDirectory(Core.files.local("saves/"));
} }
}
public static void loadSettings(){
createDirectories();
Core.settings.defaults("locale", "default"); Core.settings.defaults("locale", "default");
Core.keybinds.setDefaults(Binding.values()); Core.keybinds.setDefaults(Binding.values());

1
tests/src/test/java/ApplicationTests.java
View File

@@ -45,6 +45,7 @@ public class ApplicationTests{
public void setup(){ public void setup(){
headless = true; headless = true;
net = new Net(null); net = new Net(null);
tree = new FileTree();
Vars.init(); Vars.init();
content.createContent(); content.createContent();