Updated build.gradle to make built jars need the minimal amount of shadowed libs.

Added Config and a config command.
 - Made it so that you can disable the confirmation popup.
Fixed some classes have the wrong names.
Added a backup plan to disable the mod via the ExternalConfiguration.

3 files changed, 33 insertions, 27 deletions

diff --git a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/RewardClaimGui.kt b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/RewardClaimGui.kt
index 0e5b054..acdc2f7 100644
--- a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/RewardClaimGui.kt
+++ b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/RewardClaimGui.kt
@@ -10,7 +10,8 @@ import gg.essential.universal.ChatColor
 import gg.essential.universal.UDesktop
 import gg.essential.vigilance.gui.VigilancePalette
 import org.apache.commons.io.IOUtils
-import tech.thatgravyboat.rewardclaim.RewardConfiguration
+import tech.thatgravyboat.rewardclaim.Config
+import tech.thatgravyboat.rewardclaim.ExternalConfiguration
 import tech.thatgravyboat.rewardclaim.types.WebData
 import java.awt.Color
 import java.net.*
@@ -40,7 +41,7 @@ class RewardClaimGui(private val id: String) : WindowScreen() {
                 (url.openConnection() as HttpURLConnection).apply {
                     requestMethod = "GET"
                     useCaches = true
-                    addRequestProperty("User-Agent", RewardConfiguration.userAgent)
+                    addRequestProperty("User-Agent", ExternalConfiguration.userAgent)
                     readTimeout = 15000
                     connectTimeout = 15000
                     doOutput = true
@@ -141,7 +142,10 @@ class RewardClaimGui(private val id: String) : WindowScreen() {
                 button.onMouseEnter { setColor(BUTTON_HOVER) }
                 button.onMouseLeave { setColor(VigilancePalette.getAccent()) }
                 button.onMouseClick { event ->
-                    if (event.mouseButton == 0 && selected != -1) confirmPopup()
+                    if (event.mouseButton == 0 && selected != -1) {
+                        if (Config.showConfirmation) confirmPopup()
+                        else claimReward()
+                    }
                     event.stopPropagation()
                 }
             }
@@ -239,28 +243,30 @@ class RewardClaimGui(private val id: String) : WindowScreen() {
             { removePopup() },
             "${ChatColor.BOLD}Back",
             null,
-            {
-                runAsync {
-                    try {
-                        (URL("https://rewards.hypixel.net/claim-reward/claim?option=$selected&id=$id&activeAd=${data.activeAd}&_csrf=${data.securityToken}&watchedFallback=false").openConnection() as HttpURLConnection).apply {
-                            requestMethod = "POST"
-                            useCaches = true
-                            addRequestProperty("User-Agent", RewardConfiguration.userAgent)
-                            readTimeout = 15000
-                            connectTimeout = 15000
-                            responseCode
-                            CookieManager.setDefault(null)
-                            restorePreviousScreen()
-                        }
-                    } catch (ignored: Exception) {
-                        //IGNORED
-                    }
-                }
-            },
+            { claimReward() },
             "${ChatColor.BOLD}Continue"
         ) childOf this.window
     }
 
+    private fun claimReward() {
+        runAsync {
+            try {
+                (URL("https://rewards.hypixel.net/claim-reward/claim?option=$selected&id=$id&activeAd=${data.activeAd}&_csrf=${data.securityToken}&watchedFallback=false").openConnection() as HttpURLConnection).apply {
+                    requestMethod = "POST"
+                    useCaches = true
+                    addRequestProperty("User-Agent", ExternalConfiguration.userAgent)
+                    readTimeout = 15000
+                    connectTimeout = 15000
+                    responseCode
+                    CookieManager.setDefault(null)
+                    restorePreviousScreen()
+                }
+            } catch (ignored: Exception) {
+                //IGNORED
+            }
+        }
+    }
+
     private fun removePopup() {
         Window.enqueueRenderOperation {
             popup?.let {
diff --git a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UIReward.kt b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UIReward.kt
index 02408d4..ffc698a 100644
--- a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UIReward.kt
+++ b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UIReward.kt
@@ -12,9 +12,9 @@ import gg.essential.elementa.utils.withAlpha
 import gg.essential.universal.ChatColor
 import gg.essential.vigilance.gui.VigilancePalette
 import tech.thatgravyboat.rewardclaim.MappedImageCache
-import tech.thatgravyboat.rewardclaim.RewardConfiguration
-import tech.thatgravyboat.rewardclaim.RewardLanguage
+import tech.thatgravyboat.rewardclaim.ExternalConfiguration
 import tech.thatgravyboat.rewardclaim.types.RewardData
+import tech.thatgravyboat.rewardclaim.types.RewardLanguage
 
 class UIReward(xConstraint: XConstraint, yConstraint: YConstraint) :
     UIBlock(VigilancePalette.getHighlight().withAlpha(204)) {
@@ -96,7 +96,7 @@ class UIReward(xConstraint: XConstraint, yConstraint: YConstraint) :
 
         data.image?.let {
             it.url?.let { url ->
-                val imageType = RewardConfiguration.getImageType(it.imageType)
+                val imageType = ExternalConfiguration.getImageType(it.imageType)
                 UIImage.ofURL(url, MappedImageCache).constrain {
                     width = imageType.width.percent()
                     height = imageType.height.percent()
diff --git a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UISelectedReward.kt b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UISelectedReward.kt
index 863ebc5..447c3c5 100644
--- a/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UISelectedReward.kt
+++ b/src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/UISelectedReward.kt
@@ -12,9 +12,9 @@ import gg.essential.elementa.utils.withAlpha
 import gg.essential.universal.ChatColor
 import gg.essential.vigilance.gui.VigilancePalette
 import tech.thatgravyboat.rewardclaim.MappedImageCache
-import tech.thatgravyboat.rewardclaim.RewardConfiguration
-import tech.thatgravyboat.rewardclaim.RewardLanguage
+import tech.thatgravyboat.rewardclaim.ExternalConfiguration
 import tech.thatgravyboat.rewardclaim.types.RewardData
+import tech.thatgravyboat.rewardclaim.types.RewardLanguage
 
 class UISelectedReward(middle: XConstraint) : UIBlock(VigilancePalette.getHighlight().withAlpha(204)) {
 
@@ -76,7 +76,7 @@ class UISelectedReward(middle: XConstraint) : UIBlock(VigilancePalette.getHighli
 
         data.image?.let {
             it.url?.let { url ->
-                val imageType = RewardConfiguration.getImageType(it.imageType)
+                val imageType = ExternalConfiguration.getImageType(it.imageType)
                 image?.let(imageBackground::removeChild)
                 image = UIImage.ofURL(url, MappedImageCache).constrain {
                     width = imageType.width.percent()