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

Implemented local server configs

Browse Source
This commit is contained in:
Anuken
2018-11-16 22:28:27 -05:00
parent ca5db2bff8
commit 6a5bf08d55
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '2385d794f2cd3db2fb25d320f2223fa2148c25a0' uCoreVersion = '1d5b8b5359344bd1d956d6085be69b7a836906fc'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

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

@@ -17,12 +17,12 @@ import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.gen.Serialization; import io.anuke.mindustry.gen.Serialization;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity; import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.entities.Entities; import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.entities.impl.EffectEntity; import io.anuke.ucore.entities.impl.EffectEntity;
import io.anuke.ucore.entities.trait.DrawTrait; import io.anuke.ucore.entities.trait.DrawTrait;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Translator; import io.anuke.ucore.util.Translator;
import java.util.Arrays; import java.util.Arrays;
@@ -170,7 +170,7 @@ public class Vars{
ios = Gdx.app.getType() == ApplicationType.iOS; ios = Gdx.app.getType() == ApplicationType.iOS;
android = Gdx.app.getType() == ApplicationType.Android; android = Gdx.app.getType() == ApplicationType.Android;
dataDirectory = OS.getAppDataDirectory(appName); dataDirectory = Settings.getDataDirectory(appName);
customMapDirectory = dataDirectory.child("maps/"); customMapDirectory = dataDirectory.child("maps/");
saveDirectory = dataDirectory.child("saves/"); saveDirectory = dataDirectory.child("saves/");
baseCameraScale = Math.round(Unit.dp.scl(4)); baseCameraScale = Math.round(Unit.dp.scl(4));

4
server/src/io/anuke/mindustry/server/ServerLauncher.java
View File

@@ -7,8 +7,8 @@ import com.badlogic.gdx.backends.headless.HeadlessApplicationConfiguration;
import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoClient;
import io.anuke.kryonet.KryoServer; import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.EmptyLogger; import io.anuke.ucore.util.EmptyLogger;
import io.anuke.ucore.util.OS;
public class ServerLauncher extends HeadlessApplication{ public class ServerLauncher extends HeadlessApplication{
@@ -26,7 +26,7 @@ public class ServerLauncher extends HeadlessApplication{
Net.setServerProvider(new KryoServer()); Net.setServerProvider(new KryoServer());
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration(); HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
config.preferencesDirectory = OS.getAppDataDirectoryString("Mindustry"); Settings.setPrefHandler((appName) -> Gdx.files.local("config"));
new ServerLauncher(new MindustryServer(args), config); new ServerLauncher(new MindustryServer(args), config);
}catch(Throwable t){ }catch(Throwable t){