Skip to content
This repository has been archived by the owner on Apr 22, 2021. It is now read-only.

Commit

Permalink
close #318
Browse files Browse the repository at this point in the history
  • Loading branch information
@5HT2
5HT2 committed Jan 14, 2020
1 parent 2a9022b commit 0a9f913
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 238 deletions.
238 changes: 32 additions & 206 deletions src/main/java/me/zeroeightsix/kami/DiscordPresence.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,257 +4,83 @@
import club.minnced.discord.rpc.DiscordRPC;
import club.minnced.discord.rpc.DiscordRichPresence;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.misc.BlueDiscordRPC;
import me.zeroeightsix.kami.module.modules.bewwawho.misc.DiscordSettings;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraftforge.fml.common.FMLLog;

import static me.zeroeightsix.kami.KamiMod.MODVER;
import static me.zeroeightsix.kami.KamiMod.APP_ID;

/***
* @author snowmii
* Updated by S-B99 on 19/12/19
* @author S-B99
* Updated by S-B99 on 13/01/20
*/
public class DiscordPresence {
private static final String APP_ID = "638403216278683661";
private static final DiscordRPC rpc;
public static DiscordRichPresence presence;
private static boolean hasStarted;
public static final Minecraft mc = Minecraft.getMinecraft();
private static String details;
private static String state;
private static int players;
private static int maxPlayers;
private static ServerData svr;
private static String[] popInfo;
private static int players2;
private static int maxPlayers2;

public static void disable() {
DiscordPresence.presence.state = "";
}
private static DiscordSettings discordSettings;
private static String separator = " | ";

public static void start() {
boolean versionPrivateStart = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).versionGlobal.getValue();

FMLLog.log.info("Starting Discord RPC");
if (DiscordPresence.hasStarted) {
return;
}
if (DiscordPresence.hasStarted) return;
DiscordPresence.hasStarted = true;
final DiscordEventHandlers handlers = new DiscordEventHandlers();
handlers.disconnected = ((var1, var2) -> System.out.println("Discord RPC disconnected, var1: " + String.valueOf(var1) + ", var2: " + var2));
DiscordPresence.rpc.Discord_Initialize(APP_ID, handlers, true, "");
DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;
if (versionPrivateStart) {
DiscordPresence.presence.details = MODVER + " - " + "Main Menu";
}
else {
DiscordPresence.presence.details = "Main Menu";
}
DiscordPresence.presence.state = "";

discordSettings = ((DiscordSettings) ModuleManager.getModuleByName("DiscordRPC"));
details = discordSettings.getLine(discordSettings.line1Setting.getValue()) + " " + discordSettings.getLine(discordSettings.line3Setting.getValue());
state = discordSettings.getLine(discordSettings.line2Setting.getValue()) + " " + discordSettings.getLine(discordSettings.line4Setting.getValue());

DiscordPresence.presence.details = details;
DiscordPresence.presence.state = state;

DiscordPresence.presence.largeImageKey = "kami";
DiscordPresence.presence.largeImageText = "bella.wtf/kamiblue";

DiscordPresence.rpc.Discord_UpdatePresence(DiscordPresence.presence);
new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
boolean versionPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).versionGlobal.getValue();
boolean ipPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).ipGlobal.getValue();
boolean hpPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).hpGlobal.getValue();
boolean userNamePrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).usernameGlobal.getValue();

try {
DiscordPresence.rpc.Discord_RunCallbacks();
details = "";
state = "";
players = 0;
maxPlayers = 0;
if (mc.isIntegratedServerRunning()) {
if (userNamePrivate) {
if (versionPrivate) {
details = MODVER + " - " + mc.player.getName();
} else {
details = mc.player.getName();
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Singleplayer";
} else {
details = "Singleplayer";
}
}
}
else if (mc.getCurrentServerData() != null) {
svr = mc.getCurrentServerData();
if (!svr.serverIP.equals("")) {
if (userNamePrivate) {
if (versionPrivate) {
details = MODVER + " - " + mc.player.getName();
} else {
details = mc.player.getName();
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Multiplayer";
} else {
details = "Multiplayer";
}
}
if (ipPrivate) {
if (hpPrivate) {
state = svr.serverIP + " (" + ((int) mc.player.getHealth()) + " hp)";
}
else {
state = svr.serverIP;
}
if (svr.populationInfo != null) {
popInfo = svr.populationInfo.split("/");
if (popInfo.length > 2) {
players2 = Integer.parseInt(popInfo[0]);
maxPlayers2 = Integer.parseInt(popInfo[1]);
}
}
}
else {
if (hpPrivate) {
state = "(" + ((int) mc.player.getHealth()) + " hp)";
}
else {
state = "";
}
}
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Main Menu";
}
else {
details = "Main Menu";
}
state = "";
}
if (!details.equals(DiscordPresence.presence.details) || !state.equals(DiscordPresence.presence.state)) {
DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;
}

discordSettings = ((DiscordSettings) ModuleManager.getModuleByName("DiscordRPC"));
details = discordSettings.getLine(discordSettings.line1Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line3Setting.getValue());
state = discordSettings.getLine(discordSettings.line2Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line4Setting.getValue());
DiscordPresence.presence.details = details;
DiscordPresence.presence.state = state;

DiscordPresence.rpc.Discord_UpdatePresence(DiscordPresence.presence);
}
catch (Exception e2) {
e2.printStackTrace();
}
try {
Thread.sleep(5000L);
}
catch (InterruptedException e3) {
e3.printStackTrace();
}
catch (Exception e2) { e2.printStackTrace(); }
try { Thread.sleep(4000L); }
catch (InterruptedException e3) { e3.printStackTrace(); }
}
return;
}, "Discord-RPC-Callback-Handler").start();
FMLLog.log.info("Discord RPC initialised succesfully");
FMLLog.log.info("Discord RPC initialised successfully");
}

private static /* synthetic */ void lambdastart1() {
while (!Thread.currentThread().isInterrupted()) {
boolean versionPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).versionGlobal.getValue();
boolean ipPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).ipGlobal.getValue();
boolean hpPrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).hpGlobal.getValue();
boolean userNamePrivate = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).usernameGlobal.getValue();

try {
DiscordPresence.rpc.Discord_RunCallbacks();
String details = "";
String state = "";
int players = 0;
int maxPlayers = 0;
if (mc.isIntegratedServerRunning()) {
if (userNamePrivate) {
if (versionPrivate) {
details = MODVER + " - " + mc.player.getName();
} else {
details = mc.player.getName();
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Singleplayer";
} else {
details = "Singleplayer";
}
}
}
else if (mc.getCurrentServerData() != null) {
final ServerData svr = mc.getCurrentServerData();
if (!svr.serverIP.equals("")) {
if (userNamePrivate) {
if (versionPrivate) {
details = MODVER + " - " + mc.player.getName();
} else {
details = mc.player.getName();
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Multiplayer";
} else {
details = "Multiplayer";
}
}
if (ipPrivate) {
if (hpPrivate) {
state = svr.serverIP + " (" + ((int) mc.player.getHealth()) + " hp)";
}
else {
state = svr.serverIP;
}
if (svr.populationInfo != null) {
popInfo = svr.populationInfo.split("/");
if (popInfo.length > 2) {
players2 = Integer.parseInt(popInfo[0]);
maxPlayers2 = Integer.parseInt(popInfo[1]);
}
}
}
else {
if (hpPrivate) {
state = "(" + ((int) mc.player.getHealth()) + " hp)";
}
else {
state = "";
}
}
}
}
else {
if (versionPrivate) {
details = MODVER + " - " + "Main Menu";
}
else {
details = "Main Menu";
}
state = "";
}
if (!details.equals(DiscordPresence.presence.details) || !state.equals(DiscordPresence.presence.state)) {
DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;
}

discordSettings = ((DiscordSettings) ModuleManager.getModuleByName("DiscordRPC"));
details = discordSettings.getLine(discordSettings.line1Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line3Setting.getValue());
state = discordSettings.getLine(discordSettings.line2Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line4Setting.getValue());

DiscordPresence.presence.details = details;
DiscordPresence.presence.state = state;
DiscordPresence.rpc.Discord_UpdatePresence(DiscordPresence.presence);
}
catch (Exception e2) {
e2.printStackTrace();
}
try {
Thread.sleep(5000L);
}
catch (InterruptedException e3) {
e3.printStackTrace();
}
catch (Exception e2) { e2.printStackTrace(); }
try { Thread.sleep(4000L); }
catch (InterruptedException e3) { e3.printStackTrace(); }
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/me/zeroeightsix/kami/KamiMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.capes.Capes;
import me.zeroeightsix.kami.module.modules.bewwawho.misc.BlueDiscordRPC;
import me.zeroeightsix.kami.module.modules.bewwawho.misc.DiscordSettings;
import me.zeroeightsix.kami.module.modules.zeroeightysix.misc.CustomChat;
import me.zeroeightsix.kami.module.modules.zeroeightysix.render.TabFriends;
import me.zeroeightsix.kami.setting.Setting;
Expand Down Expand Up @@ -48,7 +48,6 @@
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;

/**
Expand All @@ -66,15 +65,16 @@ public class KamiMod {
static final String MODID = "kamiblue";
static final String MODNAME = "KAMI Blue";
public static final String MODVER = "v1.1.1";
public static final String APP_ID = "638403216278683661";

static final String UPDATE_JSON = "https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/updateChecker.json";
public static final String DONATORS_JSON = "https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/donators.json";
public static final String CAPES_JSON = "https://raw.githubusercontent.com/S-B99/KAMI/assets/assets/capes.json";

public static final String KAMI_HIRAGANA = "\u304B\u307F";
public static final String KAMI_KATAKANA = "\u30AB\u30DF";
// public static final String KAMI_HIRAGANA = "\u304B\u307F";
// public static final String KAMI_KATAKANA = "\u30AB\u30DF";
// public static final String KAMI_BLUE = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07";
public static final String KAMI_KANJI = "\u30ab\u30df\u30d6\u30eb"; //\u30ab\u30df\u30d6\u30eb //\u795E
public static final String KAMI_BLUE = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07";

private static final String KAMI_CONFIG_NAME_DEFAULT = "KAMIBlueConfig.json";

Expand Down Expand Up @@ -183,7 +183,7 @@ public void init(FMLInitializationEvent event) {
try { // load modules that are on by default
ModuleManager.getModuleByName("InfoOverlay").setEnabled(true);

if (((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).startupGlobal.getValue()) {
if (((DiscordSettings) ModuleManager.getModuleByName("DiscordRPC")).startupGlobal.getValue()) {
ModuleManager.getModuleByName("DiscordRPC").setEnabled(true);
}
// if (((AntiChunkLoadPatch) ModuleManager.getModuleByName("AntiChunkLoadPatch")).startupGlobal.getValue()) {
Expand Down
26 changes: 0 additions & 26 deletions src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/BlueDiscordRPC.java
View file

This file was deleted.

Loading

0 comments on commit 0a9f913

Please sign in to comment.