From 2b489d3bf5624a554e215dd6816bfaf1e4fd0f5b Mon Sep 17 00:00:00 2001 From: Mathieu Date: Tue, 28 Apr 2020 20:57:15 +0200 Subject: [PATCH] Refresh the state --- .gradle/4.8.1/fileHashes/fileHashes.bin | Bin 18897 -> 30897 bytes .gradle/4.8.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .gradle/4.8.1/taskHistory/taskHistory.bin | Bin 19613 -> 118845 bytes .gradle/4.8.1/taskHistory/taskHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 18695 -> 19433 bytes build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 5 +++-- .../java/ch/m4th1eu/richpresence/Utils.java | 9 ++++++++- .../events/AdvancedStatusEvent.java | 7 +++++++ 10 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.gradle/4.8.1/fileHashes/fileHashes.bin b/.gradle/4.8.1/fileHashes/fileHashes.bin index 41d6ebfd9c35380af63b3e05b18bbfe9ace43370..d745aaec7267b05b7c589693d938a7140ec9b938 100644 GIT binary patch literal 30897 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 literal 17 UcmZSPym9G?<>xIw7$86Z06}>Lg8%>k diff --git a/.gradle/4.8.1/taskHistory/taskHistory.bin b/.gradle/4.8.1/taskHistory/taskHistory.bin index 0dfbde6eb4b14a8ac088ac858eba1466f97699e9..7f3481d3588027776d69ba0c1f9386825b289a78 100644 GIT binary patch literal 118845 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%0D>nr};z2TbU%^ur>I5~3> zSLo|~TztRIBJ^{^nc;m7q<&cb`DVudOudh;b1vP$7B7EvOGo;To8pw2L1+P4cn*8L zkMXsq%&Im2^+~OssMmPvhy(CnfUDoUI~qW|4)k)%&>EYSHG;Hvh=|9KGVMZQ>UrjQ_QIA7i=? zx%Ru~t=Xer>F`J2rz&kU{+H@~P%--ll$|-M&Yk9m>(A-2%VhjttM?IA>iPaFx($2u z?V0P`$)?|5H2!bZ`{>=|fhwKKEIYWZZ_HmzokK3;|5Ck=-Cu65=W*X4UlxB_ef7ZI zrN)2hewCru*{|Jb!q!3qU!qtrbjoIr}Jt`z<_dqu@(p`sKl#_uL}C%ZG9LdTo@OVftV3`p;dJ zi~KgINh{P+h!E>AuXN!q+eIoj#r{DQ$XwpMx+=s4o1&edwnuYb(u-8Gdfn&zl%9f3 zhLmSEA}tHi##avpaE?WT=`*&GdDk$r;@#$q2GOw@OmT{7ujt zVvUq+nFtd2WxT9jwCiMMK~6A4CEKH4-DO)_8H;>WJo_SZ6*(9JFtq`iC8i|zYXdpK zpya$Z*n%>Z&zGLCmh1fCoa0}S>z_yVhhi`f)KBmvnxV{vOLBW{5@fqTXMc9>gfwaK zj-?Mpzw>$9_Qy-CF!%mmi=1lgOz3E;< z)boS(Rr&Uh+eGQ%OE~nSH?JdGgPOlDrJPI2Ux6Us1=X2{gBr(3kSn5gVr?s>)#>VV z+eIYEot2|ID<`IMkh;_%B|`#3B#)r0`&gL#`nEDO$3l7@(j;P{U?Lrwcm3Cg)<=r3 zKlsEyGv$r!L&nE6upW2>5bzGAWKfd>nn0#FeRDXM@Vw;7yK`X1_i6b>H1xL!DZqW<&H4zDex`iVV7E;#iMK9|! zfqetLf;?cGGUGYt-2?k|Qf6P)n3r$&ESt*7GbgnyH3t%NjFCS~7z=k9?%mVo8z92a z%Xo{b83Arne11*}v%uXY!jJadD!LjwHQ3v~`>_g@i)CQ{p)$1y(z-Z+xq6*~h7`hN z;+j$5@{&cgZ>#Mc!`+jm>PtC#&jVaPI(9<>4%S{Ge ziBlXlxnTYhrj)MpR>CDW5)!D~2tl&Z0Ak_6U;7-kx2lzN^s$)NBM!ql+ z{Xl4D(7->A8yG>B>w&KBa7rvr4ag}?&&*RXWE8j|bFM{{Ys=b%u0WsSgyhrU@mdm$ zQ1MC3O-e~rG1WIVGBYwYvoJEkG?aWFfrhrYTN8`Yi@DptgA+_MQ&Q6sOLIz`GZKpu zlYyr(yXFBGMFEF!n0w1J^HTE5i**f+OpPX{<|QWOq&gM@eGKknFmqRf4{(+g&Y1{V^9H?O O2iVo(1DR diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c9e16a74f8cd1f02cab7f8aa9f874a93948f52d8..8f63ca0cb02a81bf935db1f04826c1e48c7eb3b5 100644 GIT binary patch literal 17 UcmZQRE4w&0J>B~o0|XQR05PuwZ2$lO literal 17 UcmZQRE4w&0J>B~o0|f8^05MGj3jhEB diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 8e6f5171269c317645be1906c754ec7348a81452..0c2a0e12c499ca42ae1a85224efce34eed81a8ec 100644 GIT binary patch literal 19433 zcmeI%c}SB17{~E9HPTv5Ejy%~5o8x;ITf)>5_{)cT4{!rf`nG2Rx7*2Rdkq$WQ`@M zU4K{^nx(ktz*17OD2>W$iAP3sf*p29v?lNKC@}&VMG(KiwwKSIJ@5N|_vbuBXu+Wphi2Npi{0+BlTJVHQGeP$lil9ABX5ORRzQ3F*d6t|YlY79TG_=&_CfB? zTuX|QQpro$71^Gjb63=-k+-uCPpb)icqL}L?3z35?mA=jG}i%hWS1VXtJ?g}`m9eg z%N}---E(!w+%qO4{pS@{$3D@wG$W;0xq)6%GhM0=1MEZTDa`r&~3#U$WdcUPT1K2f< zI$yu2`}Dg=C)vXrZdRRYi@8PfSJ)RjOw@ImF0|5l-?2x3m_O#6w(AGE#Ja_362ijA}o-)k*T6i$FhUO2jYi~Q2R(|@TqW#y{HH;S~i?00mG01yBG5Pyhu`00mG01yBG5Pyhu`00mG01yBG5 zPyhu`00mG01yBG5Pyhu`00mG01yBG5Pyhw~j{?4y+i?v-Jp8rt5z`!WEQSpcPLId&1jvmJVOmiM8 diff --git a/build.gradle b/build.gradle index 68b5422..b5fd6dc 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "1.5" +version = "1.6" group = "ch.m4th1eu.richpresence" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "richpresence" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d80b69..0a39e29 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Apr 28 20:22:31 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/ch/m4th1eu/richpresence/Utils.java b/src/main/java/ch/m4th1eu/richpresence/Utils.java index 3891835..044f734 100644 --- a/src/main/java/ch/m4th1eu/richpresence/Utils.java +++ b/src/main/java/ch/m4th1eu/richpresence/Utils.java @@ -14,6 +14,7 @@ import java.nio.charset.StandardCharsets; public class Utils { public static final Utils instance = new Utils(); + public static int status = 0; public static String readTextFromURL(String url) throws IOException { URL urlObject; @@ -45,8 +46,11 @@ public class Utils { try { variable = variable.replaceAll("%player-name%", Minecraft.getMinecraft().getSession().getUsername()); - variable = variable.replaceAll("%server-connected-player%", readTextFromURL("https://api.serveurs-minecraft.com/api.php?Joueurs_En_Ligne_Ping&ip=" + serverip + "&port=" + serverport)); + variable = variable.replaceAll("%server-connected-player%", + readTextFromURL("https://api.serveurs-minecraft.com/api.php?Joueurs_En_Ligne_Ping&ip=" + serverip + "&port=" + serverport)); variable = variable.replaceAll("%server-max-slot%", readTextFromURL("https://api.serveurs-minecraft.com/api.php?Joueurs_Maximum_Ping&ip=" + serverip + "&port=" + serverport)); + + System.out.println(readTextFromURL("https://api.serveurs-minecraft.com/api.php?Joueurs_En_Ligne_Ping&ip=" + serverip + "&port=" + serverport)); } catch (Exception ignored) { } @@ -56,6 +60,8 @@ public class Utils { public void updateStatus(int id) { Thread t = new Thread(() -> { + status = id; + JSONObject onQuitServer = Main.config_object.getJSONObject("advanced-status-custom").getJSONObject("onQuitServer"); JSONObject onJoinServer = Main.config_object.getJSONObject("advanced-status-custom").getJSONObject("onJoinServer"); JSONObject inPauseMenu = Main.config_object.getJSONObject("advanced-status-custom").getJSONObject("inPauseMenu"); @@ -88,6 +94,7 @@ public class Utils { private String getState(JSONObject jsonObject) { String state = replaceArgsString(Main.config_object.getString("state")); + System.out.println(state); if (jsonObject.getBoolean("showState")) { return state; diff --git a/src/main/java/ch/m4th1eu/richpresence/events/AdvancedStatusEvent.java b/src/main/java/ch/m4th1eu/richpresence/events/AdvancedStatusEvent.java index 134dd58..6468738 100644 --- a/src/main/java/ch/m4th1eu/richpresence/events/AdvancedStatusEvent.java +++ b/src/main/java/ch/m4th1eu/richpresence/events/AdvancedStatusEvent.java @@ -9,6 +9,7 @@ import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.network.FMLNetworkEvent; /** @@ -17,6 +18,12 @@ import net.minecraftforge.fml.common.network.FMLNetworkEvent; @Mod.EventBusSubscriber public class AdvancedStatusEvent { + @SubscribeEvent + public void onTickEvent(TickEvent.WorldTickEvent event) { + if (event.world.getTotalWorldTime() % 1024 == 0) { + Utils.instance.updateStatus(Utils.status); + } + } @SubscribeEvent public void onJoinServer(FMLNetworkEvent.ClientConnectedToServerEvent event) {