update

.gitignore

@@ -1,9 +1,30 @@
-/run/
-/out/
-/build/
-/.settings/
-/bin/
-/.gradle/
-/.iml/
-/.ipr/
-/.iws/
+# eclipse
+eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+classes
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+#Netbeans
+.nb-gradle
+.nb-gradle-properties
+
+# other
+run
+.DS_Store
+Thumbs.db
+.env

build.gradle

@@ -42,7 +42,7 @@ configurations {
 dependencies {
  compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
  include("com.jagrosh:DiscordIPC:0.4")
- compile "com.github.MinusMCNetwork:MinusBounce:0.1.1"
+ compile "com.github.MinusMCNetwork:MinusBounce:082af77b18"
 }
 
 shadowJar {

src/main/java/net/minusmc/discordrpcplugin/ClientRichPresence.kt

@@ -51,7 +51,7 @@ class ClientRichPresence : MinecraftInstance() {
  })
  ipcClient?.connect()
  } catch (e: Throwable) {
- ClientUtils.getLogger().error("Failed to setup Discord RPC.", e)
+ ClientUtils.logger.error("Failed to setup Discord RPC.", e)
  }
 
  }
@@ -70,7 +70,9 @@ class ClientRichPresence : MinecraftInstance() {
  builder.setState("Playing Minecraft")
 
  if (mc.isIntegratedServerRunning || serverData != null) 
- builder.setSmallImage(assets["sus"], "${if (mc.isIntegratedServerRunning || serverData == null) "Lonely.." else serverData.serverIP}")
+ builder.setSmallImage(assets["sus"],
+ if (mc.isIntegratedServerRunning || serverData == null) "Lonely.." else serverData.serverIP
+ )
  else
  builder.setSmallImage(assets["sus"], "Enabled ${MinusBounce.moduleManager.modules.count { it.state }}/${MinusBounce.moduleManager.modules.size}.")
 
@@ -84,7 +86,7 @@ class ClientRichPresence : MinecraftInstance() {
  try {
  ipcClient?.close()
  } catch (e: Throwable) {
- ClientUtils.getLogger().error("Failed to close Discord RPC.", e)
+ ClientUtils.logger.error("Failed to close Discord RPC.", e)
  }
  }
 

src/main/java/net/minusmc/discordrpcplugin/DiscordRPCPlugin.kt

@@ -1,24 +1,27 @@
 package net.minusmc.discordrpcplugin
 
+import net.minusmc.minusbounce.MinusBounce
 import net.minusmc.minusbounce.plugin.Plugin
 import net.minusmc.minusbounce.plugin.PluginAPIVersion
 import net.minusmc.minusbounce.event.EventTarget
 import net.minusmc.minusbounce.event.ClientShutdownEvent
 import net.minusmc.minusbounce.utils.ClientUtils
 import kotlin.concurrent.thread
 
-class DiscordRPCPlugin: Plugin("DiscordRPCPlugin", "dev", PluginAPIVersion.VER_01) {
+object DiscordRPCPlugin: Plugin("DiscordRPCPlugin", version = "dev", minApiVersion = PluginAPIVersion.VER_01) {
 
  lateinit var clientRichPresence: ClientRichPresence
 
  override fun init() {
+ MinusBounce.addMenuButton("DiscordRPC", GuiDiscordRPC::class.java)
+
  clientRichPresence = ClientRichPresence()
  if (clientRichPresence.showRichPresenceValue) {
  thread {
  try {
  clientRichPresence.setup()
  } catch (throwable: Throwable) {
- ClientUtils.getLogger().error("Failed to setup Discord RPC.", throwable)
+ ClientUtils.logger.error("Failed to setup Discord RPC.", throwable)
  }
  }
  }

src/main/java/net/minusmc/discordrpcplugin/GuiDiscordRPC.kt

@@ -1,13 +1,32 @@
 package net.minusmc.discordrpcplugin
 
+import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.gui.GuiScreen
+import net.minusmc.minusbounce.ui.client.BoolButton
+import net.minusmc.minusbounce.ui.font.Fonts
+import net.minusmc.minusbounce.utils.render.RenderUtils
+import java.awt.Color
 
-class GuiKeybindHelper(private val prevGui: GuiScreen) : GuiScreen() {
+class GuiDiscordRPC(private val prevGui: GuiScreen) : GuiScreen() {
  override fun initGui() {
- buttonList.add(GuiButton(1, width / 2 + 40, height / 3, "ON"))
+ buttonList.add(BoolButton(0, width / 2 + 100, height / 2 - 60, DiscordRPCPlugin.clientRichPresence.showRichPresenceValue))
  }
 
  override fun drawScreen(mouseX: Int, mouseY: Int, partialTicks: Float) {
- Fonts.font40.drawString("Enable", width / 2 - 100, (height / 3 - mc.fontRendererObj.FONT_HEIGHT * 2).toFloat(), 0xffffff, false)
+ drawBackground(0)
+ RenderUtils.drawRoundedRect((width / 2 - 200).toFloat(), (height / 2 - 120).toFloat(), (width / 2 + 200).toFloat(), (height / 2 + 120).toFloat(), 4f, Color(249, 246, 238, 120).rgb)
+ Fonts.font72.drawCenteredString("Discord RPC Settings", width.toFloat() / 2f, (height / 2 - mc.fontRendererObj.FONT_HEIGHT - 90).toFloat(), Color(54, 69, 79).rgb, false)
+ Fonts.font50.drawString("Enable", (width / 2 - 140).toFloat(), (height / 2 - 56).toFloat(), Color(54, 69, 79).rgb, false)
+ super.drawScreen(mouseX, mouseY, partialTicks)
+ }
+
+ override fun actionPerformed(button: GuiButton) {
+ when (button.id) {
+ 0 -> {
+ val button = button as BoolButton
+ button.state = !button.state
+ DiscordRPCPlugin.clientRichPresence.showRichPresenceValue = !DiscordRPCPlugin.clientRichPresence.showRichPresenceValue
+ }
+ }
  }
 }