diff --git a/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt b/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt index 3ab20967..48664ae3 100644 --- a/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt +++ b/src/main/java/net/aspw/client/features/module/impl/visual/Animations.kt @@ -94,10 +94,10 @@ class Animations : Module() { val blockingOnly = BoolValue("CancelEquip-BlockingOnly", true) { cancelEquip.get() } @JvmField - val scale = FloatValue("Scale", 0f, -0.5f, 0.5f) + val scale = FloatValue("Item-Size", 0f, -0.5f, 0.5f) @JvmField - val itemFov = FloatValue("ItemFov", 0f, -5f, 5f) + val itemFov = FloatValue("Item-Fov", 0f, -5f, 5f) @JvmField val itemPosX = FloatValue("ItemPos-X", 0f, -1f, 1f) diff --git a/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java b/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java index 218a2338..8ef881a8 100644 --- a/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java +++ b/src/main/java/net/aspw/client/injection/forge/mixins/render/MixinLayerHeldItem.java @@ -40,6 +40,7 @@ public void doRenderLayer(EntityLivingBase entitylivingbaseIn, float p_177141_2_ if (itemstack != null) { GlStateManager.pushMatrix(); + GlStateManager.scale(Animations.scale.get() + 1, Animations.scale.get() + 1, Animations.scale.get() + 1); if (this.livingEntityRenderer.getMainModel().isChild) { float f = 0.5F; diff --git a/src/main/java/net/aspw/client/utils/APIConnecter.kt b/src/main/java/net/aspw/client/utils/APIConnecter.kt index 11aff12d..e200554d 100644 --- a/src/main/java/net/aspw/client/utils/APIConnecter.kt +++ b/src/main/java/net/aspw/client/utils/APIConnecter.kt @@ -25,6 +25,7 @@ object APIConnecter { var discordApp = "" var appClientID = "" var appClientSecret = "" + var donate = "" var changelogs = "" var bugs = "" var bmcstafflist = "" @@ -96,8 +97,9 @@ object APIConnecter { gotData = response.body!!.string() } val details = gotData.split("///") - isLatest = details[4] == Launch.CLIENT_VERSION - discord = details[3] + isLatest = details[5] == Launch.CLIENT_VERSION + discord = details[4] + donate = details[3] discordApp = details[2] appClientSecret = details[1] appClientID = details[0] diff --git a/src/main/java/net/aspw/client/visual/client/GuiMainMenu.kt b/src/main/java/net/aspw/client/visual/client/GuiMainMenu.kt index ddc422b6..640ee366 100644 --- a/src/main/java/net/aspw/client/visual/client/GuiMainMenu.kt +++ b/src/main/java/net/aspw/client/visual/client/GuiMainMenu.kt @@ -2,6 +2,7 @@ package net.aspw.client.visual.client import net.aspw.client.Launch import net.aspw.client.utils.APIConnecter +import net.aspw.client.utils.misc.MiscUtils import net.aspw.client.utils.render.RenderUtils import net.aspw.client.visual.client.altmanager.GuiAltManager import net.aspw.client.visual.font.smooth.FontLoaders @@ -74,6 +75,16 @@ class GuiMainMenu : GuiScreen(), GuiYesNoCallback { this.buttonList.add( GuiButton( 5, + (this.width - 24F - FontLoaders.SF21.getStringWidth("Connect API")).toInt(), + 8, + buttonWidth - 42, + buttonHeight, + "Connect API" + ) + ) + this.buttonList.add( + GuiButton( + 6, (this.width - 112F - FontLoaders.SF21.getStringWidth("Configure")).toInt(), 8, buttonWidth - 42, @@ -83,12 +94,12 @@ class GuiMainMenu : GuiScreen(), GuiYesNoCallback { ) this.buttonList.add( GuiButton( - 6, - (this.width - 24F - FontLoaders.SF21.getStringWidth("Connect API")).toInt(), + 7, + (this.width - 177F - FontLoaders.SF21.getStringWidth("Donate Now")).toInt(), 8, buttonWidth - 42, buttonHeight, - "Connect API" + "Donate Now" ) ) super.initGui() @@ -211,15 +222,17 @@ class GuiMainMenu : GuiScreen(), GuiYesNoCallback { 2 -> mc.displayGuiScreen(GuiAltManager(this)) 3 -> mc.displayGuiScreen(GuiOptions(this, mc.gameSettings)) 4 -> mc.shutdown() - 5 -> mc.displayGuiScreen(GuiInfo(this)) - 6 -> { + 5 -> { APIConnecter.checkStatus() APIConnecter.checkChangelogs() APIConnecter.checkBugs() APIConnecter.checkStaffList() APIConnecter.loadDonors() } + + 6 -> mc.displayGuiScreen(GuiInfo(this)) + 7 -> MiscUtils.showURL(APIConnecter.donate) } }