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

New shaders, remake of Android placement partially done

Browse Source
This commit is contained in:
Anuken
2018-05-29 22:03:43 -04:00
parent b434c37f01
commit 0f09a0b152
18 changed files with 508 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -10,6 +10,7 @@ import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings;
import java.net.NetworkInterface;
@@ -24,7 +25,7 @@ import java.util.Random;
import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform {
final static boolean useDiscord = false;//OS.getPropertyNotNull("sun.arch.data.model").equals("64");
final static boolean useDiscord = !OS.is64Bit;
final static String applicationId = "398246104468291591";
final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
String[] args;
@@ -32,6 +33,8 @@ public class DesktopPlatform extends Platform {
public DesktopPlatform(String[] args){
this.args = args;
if(useDiscord) {
DiscordEventHandlers handlers = new DiscordEventHandlers();
DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "");