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

Re-added discord RPC

Browse Source
This commit is contained in:
Anuken
2018-05-13 21:43:53 -07:00
parent c79f0b76ff
commit a8900bb50e
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@@ -85,8 +85,7 @@ project(":desktop") {
compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion" compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
//todo uncomment compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
//compile 'com.github.MinnDevelopment:java-discord-rpc:v1.3.2'
} }
} }

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

@@ -1,8 +1,8 @@
package io.anuke.mindustry.desktop; package io.anuke.mindustry.desktop;
//import club.minnced.discord.rpc.DiscordEventHandlers; import club.minnced.discord.rpc.DiscordEventHandlers;
//import club.minnced.discord.rpc.DiscordRPC; import club.minnced.discord.rpc.DiscordRPC;
//import club.minnced.discord.rpc.DiscordRichPresence; import club.minnced.discord.rpc.DiscordRichPresence;
import com.badlogic.gdx.utils.Base64Coder; import com.badlogic.gdx.utils.Base64Coder;
import io.anuke.kryonet.DefaultThreadImpl; import io.anuke.kryonet.DefaultThreadImpl;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
@@ -24,7 +24,7 @@ import java.util.Locale;
import java.util.Random; import java.util.Random;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
//TODO uncomment discord related stuff
public class DesktopPlatform extends Platform { public class DesktopPlatform extends Platform {
final static boolean useDiscord = UCore.getPropertyNotNull("sun.arch.data.model").equals("64"); final static boolean useDiscord = UCore.getPropertyNotNull("sun.arch.data.model").equals("64");
final static String applicationId = "398246104468291591"; final static String applicationId = "398246104468291591";
@@ -35,8 +35,8 @@ public class DesktopPlatform extends Platform {
this.args = args; this.args = args;
if(useDiscord) { if(useDiscord) {
// DiscordEventHandlers handlers = new DiscordEventHandlers(); DiscordEventHandlers handlers = new DiscordEventHandlers();
// DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, ""); DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "");
} }
} }
@@ -62,7 +62,7 @@ public class DesktopPlatform extends Platform {
@Override @Override
public void updateRPC() { public void updateRPC() {
/*
if(!useDiscord) return; if(!useDiscord) return;
DiscordRichPresence presence = new DiscordRichPresence(); DiscordRichPresence presence = new DiscordRichPresence();
@@ -87,12 +87,12 @@ public class DesktopPlatform extends Platform {
presence.largeImageKey = "logo"; presence.largeImageKey = "logo";
DiscordRPC.INSTANCE.Discord_UpdatePresence(presence);*/ DiscordRPC.INSTANCE.Discord_UpdatePresence(presence);
} }
@Override @Override
public void onGameExit() { public void onGameExit() {
//if(useDiscord) DiscordRPC.INSTANCE.Discord_Shutdown(); if(useDiscord) DiscordRPC.INSTANCE.Discord_Shutdown();
} }
@Override @Override