From ef33bfb8cc8df5229bb458a91218e453def5ec4e Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:00:17 +0200 Subject: [PATCH 1/5] Remove `fastloaduserpanel` --- MainModule/Client/UI/Default/UserPanel.lua | 53 +++++++++------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/MainModule/Client/UI/Default/UserPanel.lua b/MainModule/Client/UI/Default/UserPanel.lua index d17ed49135..a514616c70 100644 --- a/MainModule/Client/UI/Default/UserPanel.lua +++ b/MainModule/Client/UI/Default/UserPanel.lua @@ -337,13 +337,6 @@ return function(data, env) if window then local commandPrefix = ":" local playerData, chatMod, settingsData - if not Variables.FastLoadUserpanel then - playerData = Remote.Get("PlayerData") - chatMod = Remote.Get("Setting", {"Prefix", "SpecialPrefix", "BatchKey", "AnyPrefix", "DonorCommands", "DonorCapes"}) - settingsData = Remote.Get("AllSettings") - Variables.Aliases = playerData.Aliases or {} - commandPrefix = {chatMod.Prefix} - end local tabFrame = window:Add("TabFrame", { Size = UDim2.new(1, -10, 1, -10); Position = UDim2.new(0, 5, 0, 5); @@ -477,30 +470,28 @@ return function(data, env) end - if Variables.FastLoadUserpanel then - local LOAD_TEXT = { - BackgroundTransparency = 1; - Size = UDim2.new(1, 0, 1, 0); - Text = "Loading..."; - TextScaled = true; - TextColor3 = Color3.new(1, 1, 1); - TextXAlignment = Enum.TextXAlignment.Center; - TextYAlignment = Enum.TextYAlignment.Center; - Font = Enum.Font.SourceSansSemibold - } - - local donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad = donorTab:Add("TextLabel", LOAD_TEXT), keyTab:Add("TextLabel", LOAD_TEXT), aliasTab:Add("TextLabel", LOAD_TEXT), clientTab:Add("TextLabel", LOAD_TEXT), gameTab:Add("TextLabel", LOAD_TEXT) - gTable = window.gTable - window:Ready() - playerData = Remote.Get("PlayerData") - chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"}) - settingsData = Remote.Get("AllSettings") - Variables.Aliases = playerData.Aliases or {} - commandPrefix = chatMod.Prefix - - for _, v in {donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad} do - v:Destroy() - end + local LOAD_TEXT = { + BackgroundTransparency = 1; + Size = UDim2.new(1, 0, 1, 0); + Text = "Loading..."; + TextScaled = true; + TextColor3 = Color3.new(1, 1, 1); + TextXAlignment = Enum.TextXAlignment.Center; + TextYAlignment = Enum.TextYAlignment.Center; + Font = Enum.Font.SourceSansSemibold + } + + local donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad = donorTab:Add("TextLabel", LOAD_TEXT), keyTab:Add("TextLabel", LOAD_TEXT), aliasTab:Add("TextLabel", LOAD_TEXT), clientTab:Add("TextLabel", LOAD_TEXT), gameTab:Add("TextLabel", LOAD_TEXT) + gTable = window.gTable + window:Ready() + playerData = Remote.Get("PlayerData") + chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"}) + settingsData = Remote.Get("AllSettings") + Variables.Aliases = playerData.Aliases or {} + commandPrefix = chatMod.Prefix + + for _, v in {donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad} do + v:Destroy() end --// Donor Tab From 97c0e6d497818bf3232255d8afed784c93a314fd Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:01:14 +0200 Subject: [PATCH 2/5] Remove `fastloaduserpanel` --- MainModule/Client/Core/Variables.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Client/Core/Variables.lua b/MainModule/Client/Core/Variables.lua index f3a02c6df6..002bb7c238 100644 --- a/MainModule/Client/Core/Variables.lua +++ b/MainModule/Client/Core/Variables.lua @@ -74,7 +74,6 @@ return function(Vargs, GetEnv) ParticlesEnabled = true; CapesEnabled = true; HideChatCommands = false; - FastLoadUserpanel = true; Particles = {}; KeyBinds = {}; Aliases = {}; From 25276fb5829fd880a6787e4c1e849072b36802e5 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:02:35 +0200 Subject: [PATCH 3/5] Remove `fastloaduserpanel` --- MainModule/Client/UI/Default/Settings.lua | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/MainModule/Client/UI/Default/Settings.lua b/MainModule/Client/UI/Default/Settings.lua index ea672ea739..78b0073b35 100644 --- a/MainModule/Client/UI/Default/Settings.lua +++ b/MainModule/Client/UI/Default/Settings.lua @@ -180,19 +180,6 @@ return function(data, env) toggle.Text = "Default" end end - }; - { - Text = "Userpanel FastLoad: "; - Desc = "- Enables/Disables fast loading of userpanel"; - Entry = "Boolean"; - Value = Variables.FastLoadUserpanel or false; - Function = function(enabled, toggle) - Variables.FastLoadUserpanel = enabled - local text = toggle.Text - toggle.Text = "Saving.." - Remote.Get("UpdateClient","FastLoadUserpanel",enabled) - toggle.Text = text - end } } From a9f59dc4d9a1fd85e7ee2d5de37c1b499d4749f9 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:17:54 +0200 Subject: [PATCH 4/5] Change loading from text to icon --- MainModule/Client/UI/Default/UserPanel.lua | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/MainModule/Client/UI/Default/UserPanel.lua b/MainModule/Client/UI/Default/UserPanel.lua index a514616c70..a7650ce07d 100644 --- a/MainModule/Client/UI/Default/UserPanel.lua +++ b/MainModule/Client/UI/Default/UserPanel.lua @@ -472,25 +472,36 @@ return function(data, env) local LOAD_TEXT = { BackgroundTransparency = 1; - Size = UDim2.new(1, 0, 1, 0); - Text = "Loading..."; - TextScaled = true; - TextColor3 = Color3.new(1, 1, 1); - TextXAlignment = Enum.TextXAlignment.Center; - TextYAlignment = Enum.TextYAlignment.Center; - Font = Enum.Font.SourceSansSemibold + Size = UDim2.new(0, 14, 0, 14); + Position = Udim2.new(0.5, 0, 0.5, 0); + AnchorPoint = Vector2.new(0.5, 0.5); + Image = "rbxassetid://69395121"; + ImageTransparency = 0.1; + ZIndex = 10; } - local donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad = donorTab:Add("TextLabel", LOAD_TEXT), keyTab:Add("TextLabel", LOAD_TEXT), aliasTab:Add("TextLabel", LOAD_TEXT), clientTab:Add("TextLabel", LOAD_TEXT), gameTab:Add("TextLabel", LOAD_TEXT) + local loadingIcons = {donorTab:Add("ImageLabel", LOAD_TEXT), keyTab:Add("ImageLabel", LOAD_TEXT), aliasTab:Add("ImageLabel", LOAD_TEXT), clientTab:Add("ImageLabel", LOAD_TEXT), gameTab:Add("ImageLabel", LOAD_TEXT)} gTable = window.gTable window:Ready() + + task.spawn(function() + local start = os.clock() + + while loadingIcons[1].Parent do + for _, v in loadingIcons do + v.Rotation = -(os.clock() - start)/(1/60)*10 + end + task.wait(1/60) + end + end) + playerData = Remote.Get("PlayerData") chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"}) settingsData = Remote.Get("AllSettings") Variables.Aliases = playerData.Aliases or {} commandPrefix = chatMod.Prefix - for _, v in {donorLoad, keyLoad, aliasLoad, clientLoad, gameLoad} do + for _, v in loadingIcons do v:Destroy() end From c91c8fe568a21a41759da0ae162a64435dd3a017 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:25:10 +0200 Subject: [PATCH 5/5] Fix typo --- MainModule/Client/UI/Default/UserPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MainModule/Client/UI/Default/UserPanel.lua b/MainModule/Client/UI/Default/UserPanel.lua index a7650ce07d..7916979d56 100644 --- a/MainModule/Client/UI/Default/UserPanel.lua +++ b/MainModule/Client/UI/Default/UserPanel.lua @@ -470,17 +470,17 @@ return function(data, env) end - local LOAD_TEXT = { + local LOAD_ICON = { BackgroundTransparency = 1; Size = UDim2.new(0, 14, 0, 14); - Position = Udim2.new(0.5, 0, 0.5, 0); + Position = UDim2.new(0.5, 0, 0.5, 0); AnchorPoint = Vector2.new(0.5, 0.5); Image = "rbxassetid://69395121"; ImageTransparency = 0.1; ZIndex = 10; } - local loadingIcons = {donorTab:Add("ImageLabel", LOAD_TEXT), keyTab:Add("ImageLabel", LOAD_TEXT), aliasTab:Add("ImageLabel", LOAD_TEXT), clientTab:Add("ImageLabel", LOAD_TEXT), gameTab:Add("ImageLabel", LOAD_TEXT)} + local loadingIcons = {donorTab:Add("ImageLabel", LOAD_ICON), keyTab:Add("ImageLabel", LOAD_ICON), aliasTab:Add("ImageLabel", LOAD_ICON), clientTab:Add("ImageLabel", LOAD_ICON), gameTab:Add("ImageLabel", LOAD_ICON)} gTable = window.gTable window:Ready()