From ec7b131aa19eb22523be13df370b0576a3cbd70b Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Tue, 1 Aug 2023 22:33:03 +0600 Subject: [PATCH] Fixes for Premium Cosmetics --- .../java/net/silentclient/client/Client.java | 18 +++++++++--------- .../client/mixin/mixins/MinecraftMixin.java | 12 ++++++------ .../client/premium/PremiumCosmeticsGui.java | 11 ++++++----- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/silentclient/client/Client.java b/src/main/java/net/silentclient/client/Client.java index aa34e25..3fbeca3 100644 --- a/src/main/java/net/silentclient/client/Client.java +++ b/src/main/java/net/silentclient/client/Client.java @@ -292,15 +292,6 @@ public class Client { mod.setEnabled(!mod.isEnabled()); }); - if(!Client.getInstance().getAccount().getClaimedPremiumCosmetics()) { - Client.logger.info("STARTING > premium-cosmetics"); - PremiumCosmeticsResponse premiumCosmetics = PremiumUtils.getPremiumCosmetics(); - - if(premiumCosmetics != null) { - Minecraft.getMinecraft().displayGuiScreen(new PremiumCosmeticsGui(premiumCosmetics)); - } - } - Client.logger.info("STARTING > launching-detector"); Requests.post("https://api.silentclient.net/_next/launch_v2", new JSONObject().put("branch", getBuildData().getBranch()).toString()); @@ -325,6 +316,15 @@ public class Client { Minecraft.getMinecraft().displayGuiScreen(new MainMenuConcept()); } + if(!Client.getInstance().getAccount().getClaimedPremiumCosmetics()) { + Client.logger.info("STARTING > premium-cosmetics"); + PremiumCosmeticsResponse premiumCosmetics = PremiumUtils.getPremiumCosmetics(); + + if(premiumCosmetics != null) { + Minecraft.getMinecraft().displayGuiScreen(new PremiumCosmeticsGui(premiumCosmetics)); + } + } + if(!globalSettings.displayedTutorial) { Minecraft.getMinecraft().displayGuiScreen(new UserTutorial()); } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java index 3c5901b..965e7e5 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java @@ -18,10 +18,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.WorldSettings; import net.silentclient.client.Client; import net.silentclient.client.event.impl.*; -import net.silentclient.client.gui.lite.GuiNews; import net.silentclient.client.gui.lite.LiteMainMenu; import net.silentclient.client.gui.silentmainmenu.MainMenuConcept; -import net.silentclient.client.gui.silentmainmenu.SilentMainMenu; import net.silentclient.client.gui.util.BackgroundPanorama; import net.silentclient.client.hooks.MinecraftHook; import net.silentclient.client.mods.player.ZoomMod; @@ -38,7 +36,9 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.io.File; @@ -62,9 +62,9 @@ public abstract class MinecraftMixin { if(Client.backgroundPanorama == null) { Client.backgroundPanorama = new BackgroundPanorama(Minecraft.getMinecraft()); } - if(Client.getInstance().getGlobalSettings() != null) { - displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new GuiNews() : new MainMenuConcept()); - } +// if(Client.getInstance().getGlobalSettings() != null) { +// displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new GuiNews() : new MainMenuConcept()); +// } } @Inject(method = "shutdownMinecraftApplet", at = @At("HEAD")) diff --git a/src/main/java/net/silentclient/client/premium/PremiumCosmeticsGui.java b/src/main/java/net/silentclient/client/premium/PremiumCosmeticsGui.java index b3a25c4..fa33615 100644 --- a/src/main/java/net/silentclient/client/premium/PremiumCosmeticsGui.java +++ b/src/main/java/net/silentclient/client/premium/PremiumCosmeticsGui.java @@ -1,8 +1,5 @@ package net.silentclient.client.premium; -import java.io.IOException; -import java.time.LocalDate; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -10,12 +7,16 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; -import net.silentclient.client.gui.lite.GuiNews; import net.silentclient.client.gui.elements.Button; import net.silentclient.client.gui.font.SilentFontRenderer.FontType; +import net.silentclient.client.gui.lite.GuiNews; +import net.silentclient.client.gui.silentmainmenu.MainMenuConcept; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.utils.types.PremiumCosmeticsResponse; +import java.io.IOException; +import java.time.LocalDate; + public class PremiumCosmeticsGui extends GuiScreen { private final PremiumCosmeticsResponse response; @@ -104,7 +105,7 @@ public class PremiumCosmeticsGui extends GuiScreen { super.actionPerformed(button); if(button.id == 1) { Client.getInstance().getAccount().claimPremiumCosmetics(); - mc.displayGuiScreen(new GuiNews()); + mc.displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new GuiNews() : new MainMenuConcept()); } }