new: update updater + kdiscordipc and remove requisite

W-OVERFLOW · Jan 14, 2022 · 80ead8d · 80ead8d
1 parent 1df2ef4
commit 80ead8d
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 445 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id "java"
     id "com.github.johnrengelman.shadow" version "6.1.0"
-    id "net.minecraftforge.gradle.forge" version "86b2392"
+    id "net.minecraftforge.gradle.forge" version "ddb1eb0"
     id "org.jetbrains.kotlin.jvm" version "1.5.30"
     id 'org.spongepowered.mixin' version 'd5f9873'
 }
 
-version = "1.2.0"
+version = "1.3.0"
 group = "net.wyvest"
 archivesBaseName = "SimpleRPC"
 
@@ -18,9 +18,9 @@ minecraft {
     runDir = "run"
     mappings = "stable_22"
     makeObfSourceJar = false
-    clientJvmArgs += '-Dfml.coreMods.load=net.wyvest.simplerpc.tweaker.SimpleRPCLoadingPlugin'
-    clientRunArgs += '--tweakClass net.wyvest.requisiteessentialloader.RequisiteEssentialTweaker'
+
     clientRunArgs += '--mixin mixins.simplerpc.json'
+    clientRunArgs += '--tweakClass gg.essential.loader.stage0.EssentialSetupTweaker'
 }
 
 configurations {
@@ -37,28 +37,23 @@ repositories {
 }
 
 dependencies {
-    // Libraries
-    provided 'xyz.matthewtgm:Requisite:1.1.1'
-    include 'com.github.W-OVERFLOW:RequisiteEssentialLoader:7a4eb4eeb7'
-    implementation ('xyz.matthewtgm:RequisiteLaunchwrapper:1.1')
-    implementation ('gg.essential:loader-launchwrapper:1.1.0')
-    provided 'gg.essential:essential-1.8.9-forge:1328'
-    include ('com.github.cbyrneee:KDiscordIPC:155dc128bc') {
+    include ('gg.essential:loader-launchwrapper:1.1.3')
+    provided 'gg.essential:essential-1.8.9-forge:1788'
+    include ('com.github.cbyrneee:KDiscordIPC:763fd63') {
         transitive = false
     }
-    annotationProcessor 'org.spongepowered:mixin:0.7.11-SNAPSHOT'
-    include('com.google.code.gson:gson:2.8.8')
+    annotationProcessor compileOnly('org.spongepowered:mixin:0.7.11-SNAPSHOT')
+    include('com.google.code.gson:gson:2.8.9')
     include('com.kohlschutter.junixsocket:junixsocket-core:2.4.0')
 }
 
 jar {
     manifest.attributes(
             'ModSide': 'CLIENT',
-            'FMLCorePlugin': 'net.wyvest.simplerpc.tweaker.SimpleRPCLoadingPlugin',
             'FMLCorePluginContainsFMLMod': true,
             'ForceLoadAsMod': true,
             'MixinConfigs': 'mixins.simplerpc.json',
-            'TweakClass': 'net.wyvest.requisiteessentialloader.RequisiteEssentialTweaker',
+            'TweakClass': 'gg.essential.loader.stage0.EssentialSetupTweaker',
             'TweakOrder': '0'
     )
 

diff --git a/src/main/java/net/wyvest/simplerpc/tweaker/SimpleRPCLoadingPlugin.java b/src/main/java/net/wyvest/simplerpc/tweaker/SimpleRPCLoadingPlugin.java
diff --git a/src/main/kotlin/net/wyvest/simplerpc/SimpleRPC.kt b/src/main/kotlin/net/wyvest/simplerpc/SimpleRPC.kt
@@ -6,8 +6,8 @@ import gg.essential.api.EssentialAPI
 import io.github.dediamondpro.hycord.features.discord.RichPresence
 import io.github.dediamondpro.hycord.options.Settings
 import net.minecraft.client.Minecraft
-import net.minecraft.util.EnumChatFormatting
 import net.minecraftforge.common.MinecraftForge.EVENT_BUS
+import net.minecraftforge.fml.common.Loader
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
@@ -16,9 +16,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.network.FMLNetworkEvent
 import net.wyvest.simplerpc.commands.SimpleRPCCommand
 import net.wyvest.simplerpc.config.RPCConfig
-import net.wyvest.simplerpc.utils.Updater
-import xyz.matthewtgm.requisite.util.ChatHelper
-import xyz.matthewtgm.requisite.util.ForgeHelper
+import net.wyvest.simplerpc.updater.Updater
 import java.awt.event.ActionListener
 import java.io.File
 import java.time.Instant
@@ -34,17 +32,13 @@ import javax.swing.Timer
 object SimpleRPC {
     private var disconnectedHypixel = false
     const val NAME = "SimpleRPC"
-    const val VERSION = "1.2.0"
+    const val VERSION = "1.3.0"
     const val ID = "simplerpc"
     val mc: Minecraft
         get() = Minecraft.getMinecraft()
 
-    fun sendMessage(message: String?) {
-        ChatHelper.sendMessage(EnumChatFormatting.DARK_PURPLE.toString() + "[$NAME] ", message)
-    }
-
     lateinit var jarFile: File
-    val modDir = File(File(File(mc.mcDataDir, "config"), "Wyvest"), NAME)
+    val modDir = File(File(mc.mcDataDir, "W-OVERFLOW"), NAME)
     private val regex = Regex("§[a-z0-9]")
     val ipc = DiscordIPC("862536466793103411")
     private var startTime = Instant.now().epochSecond
@@ -107,8 +101,8 @@ object SimpleRPC {
         SimpleRPCCommand.register()
         Updater.update()
         EVENT_BUS.register(this)
-        sccDetected = ForgeHelper.isModLoaded("skyclientcosmetics")
-        hycordDetected = ForgeHelper.isModLoaded("hycord")
+        sccDetected = Loader.isModLoaded("skyclientcosmetics")
+        hycordDetected = Loader.isModLoaded("hycord")
         if (RPCConfig.toggled) {
             ipc.presence = presence {
                 state = "Playing Minecraft 1.8.9"
@@ -121,7 +115,11 @@ object SimpleRPC {
                 }
             }
             if (canConnect) {
-                ipc.connect()
+                try {
+                    ipc.connect()
+                } catch (e: Throwable) {
+                    e.printStackTrace()
+                }
             }
             timer.start()
         }
@@ -136,7 +134,11 @@ object SimpleRPC {
                         if (!disconnectedHypixel && RPCConfig.hycordDetect) {
                             try {
                                 if (canConnect) {
-                                    ipc.disconnect()
+                                    try {
+                                        ipc.disconnect()
+                                    } catch (e: Throwable) {
+                                        e.printStackTrace()
+                                    }
                                 }
                                 disconnectedHypixel = true
                             } catch (e: Exception) {
@@ -154,7 +156,11 @@ object SimpleRPC {
         if (disconnectedHypixel && hycordDetected && RPCConfig.hycordDetect) {
             try {
                 if (canConnect) {
-                    ipc.connect()
+                    try {
+                        ipc.connect()
+                    } catch (e: Throwable) {
+                        e.printStackTrace()
+                    }
                 }
                 disconnectedHypixel = false
             } catch (e: Exception) {

diff --git a/src/main/kotlin/net/wyvest/simplerpc/config/RPCConfig.kt b/src/main/kotlin/net/wyvest/simplerpc/config/RPCConfig.kt
@@ -6,9 +6,8 @@ import gg.essential.vigilance.data.Property
 import gg.essential.vigilance.data.PropertyType
 import net.wyvest.simplerpc.SimpleRPC
 import net.wyvest.simplerpc.SimpleRPC.NAME
-import net.wyvest.simplerpc.SimpleRPC.mc
-import net.wyvest.simplerpc.gui.DownloadConfirmGui
-import net.wyvest.simplerpc.utils.Updater
+import net.wyvest.simplerpc.updater.DownloadGui
+import net.wyvest.simplerpc.updater.Updater
 import java.io.File
 import kotlin.properties.Delegates
 
@@ -138,7 +137,7 @@ object RPCConfig : Vigilant(File(SimpleRPC.modDir, "${SimpleRPC.ID}.toml"), NAME
     )
     fun update() {
         if (Updater.shouldUpdate) EssentialAPI.getGuiUtil()
-            .openScreen(DownloadConfirmGui(mc.currentScreen)) else EssentialAPI.getNotifications()
+            .openScreen(DownloadGui()) else EssentialAPI.getNotifications()
             .push(NAME, "No update had been detected at startup, and thus the update GUI has not been shown.")
     }
 

diff --git a/src/main/kotlin/net/wyvest/simplerpc/gui/DownloadConfirmGui.kt b/src/main/kotlin/net/wyvest/simplerpc/gui/DownloadConfirmGui.kt