Cleanup for major, rebrand

Author: Avanatiker

src/main/kotlin/com/lambda/client/LambdaMod.kt

@@ -31,7 +31,7 @@ class LambdaMod {
 
         const val APP_ID = "835368493150502923"
 
-        const val DOWNLOADS_API = "https://lambda-client.com/api/v1/downloads.json" // needs to be changed when domain is registered
+        const val DOWNLOADS_API = "https://api.github.com/repos/lambda-plugins/HighwayTools/releases" // ToDo: setup when next version comes out
         const val CAPES_JSON = "https://raw.githubusercontent.com/lambda-client/cape-api/capes/capes.json"
         const val GITHUB_LINK = "https://github.com/lambda-client/"
         const val GITHUB_API = "https://api.github.com/"
@@ -51,7 +51,7 @@ class LambdaMod {
         val directory = File(DIRECTORY)
         if (!directory.exists()) directory.mkdir()
 
-        LambdaGuiUpdateNotification.updateCheck()
+//        LambdaGuiUpdateNotification.updateCheck() // ToDo: Refactor for github checks
         LoaderWrapper.preLoadAll()
     }
 

src/main/kotlin/com/lambda/client/gui/mc/LambdaGuiUpdateNotification.kt

@@ -63,7 +63,7 @@ class LambdaGuiUpdateNotification : GuiScreen() {
                         LambdaMod.LOG.info("Your Lambda (" + LambdaMod.VERSION_MAJOR + ") is up-to-date with the latest stable release.")
                     }
                 } catch (e: IOException) {
-                    LambdaMod.LOG.error("Oes noes! An exception was thrown during the update check.", e)
+                    LambdaMod.LOG.error("An exception was thrown during the update check.", e)
                 }
             }
         }

src/main/kotlin/com/lambda/client/module/modules/client/Capes.kt

@@ -119,10 +119,10 @@ object Capes : Module(
         renderCapeLayer(playerRenderer, player, CapeTexture.PRIMARY, primaryColor, partialTicks)
         renderCapeLayer(playerRenderer, player, CapeTexture.BORDER, borderColor, partialTicks)
 
-        if (cape.type == CapeType.CONTRIBUTOR) {
-            renderCapeLayer(playerRenderer, player, CapeTexture.TEXT_ICON, DyeColors.WHITE.color, partialTicks)
-        } else {
-            renderCapeLayer(playerRenderer, player, CapeTexture.TEXT, DyeColors.WHITE.color, partialTicks)
+        when (cape.type) {
+            CapeType.CONTRIBUTOR -> {
+                renderCapeLayer(playerRenderer, player, CapeTexture.CONTRIBUTOR, DyeColors.WHITE.color, partialTicks)
+            }
         }
 
         return true
@@ -213,10 +213,10 @@ object Capes : Module(
         renderElytraLayer(renderer, model, player, CapeTexture.PRIMARY, primaryColor, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, partialTicks)
         renderElytraLayer(renderer, model, player, CapeTexture.BORDER, borderColor, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, partialTicks)
 
-        if (cape.type == CapeType.CONTRIBUTOR) {
-            renderElytraLayer(renderer, model, player, CapeTexture.TEXT_ICON, DyeColors.WHITE.color, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, partialTicks)
-        } else {
-            renderElytraLayer(renderer, model, player, CapeTexture.TEXT, DyeColors.WHITE.color, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, partialTicks)
+        when (cape.type) {
+            CapeType.CONTRIBUTOR -> {
+                renderElytraLayer(renderer, model, player, CapeTexture.CONTRIBUTOR, DyeColors.WHITE.color, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, partialTicks)
+            }
         }
 
         return true
@@ -258,8 +258,7 @@ object Capes : Module(
     private enum class CapeTexture(val location: ResourceLocation) {
         PRIMARY(ResourceLocation("lambda/textures/capes/primary.png")),
         BORDER(ResourceLocation("lambda/textures/capes/border.png")),
-        TEXT(ResourceLocation("lambda/textures/capes/text.png")),
-        TEXT_ICON(ResourceLocation("lambda/textures/capes/text_icon.png"))
+        CONTRIBUTOR(ResourceLocation("lambda/textures/capes/contributor.png"))
     }
 
 }

src/main/kotlin/com/lambda/client/module/modules/misc/DiscordRPC.kt

@@ -30,7 +30,6 @@ object DiscordRPC : Module(
     description = "Discord Rich Presence",
     enabledByDefault = false
 ) {
-    private val asset by setting("Image", Asset.DEFAULT)
     private val line1Left by setting("Line 1 Left", LineInfo.VERSION) // details left
     private val line1Right by setting("Line 1 Right", LineInfo.USERNAME) // details right
     private val line2Left by setting("Line 2 Left", LineInfo.DIMENSION) // state left
@@ -41,10 +40,6 @@ object DiscordRPC : Module(
         VERSION, WORLD, DIMENSION, USERNAME, HEALTH, HUNGER, SERVER_IP, COORDS, SPEED, HELD_ITEM, FPS, TPS, NONE
     }
 
-    private enum class Asset {
-        DEFAULT, GOLD
-    }
-
     private val presence = DiscordRichPresence()
     private val rpc = club.minnced.discord.rpc.DiscordRPC.INSTANCE
     private var connected = false
@@ -105,7 +100,7 @@ object DiscordRPC : Module(
     private fun updateRPC() {
         presence.details = getLine(line1Left) + getSeparator(0) + getLine(line1Right)
         presence.state = getLine(line2Left) + getSeparator(1) + getLine(line2Right)
-        presence.largeImageKey = asset.name.lowercase()
+        presence.largeImageKey = "default"
         rpc.Discord_UpdatePresence(presence)
     }
 
@@ -174,12 +169,7 @@ object DiscordRPC : Module(
     fun setCustomIcons(capeType: CapeType?) {
         presence.smallImageKey = capeType?.imageKey ?: ""
         presence.smallImageText = when (capeType) {
-            CapeType.BOOSTER -> "booster"
-            CapeType.CONTEST -> "contest winner!"
-            CapeType.CONTRIBUTOR -> "code contributor!"
-            CapeType.DONOR -> "donator <3"
-            CapeType.INVITER -> "inviter"
-            CapeType.SPECIAL -> "special cape!"
+            CapeType.CONTRIBUTOR -> "Contributor"
             else -> ""
         }
     }