From 33c6dc8ac872a59b397be6910926fc43aee0d2f2 Mon Sep 17 00:00:00 2001
From: Kakarot <57848836+GhzGarage@users.noreply.github.com>
Date: Sun, 22 Jun 2025 13:35:42 -0500
Subject: [PATCH] more testing

---
 html/css/editor.css | 27 +++++++++----
 html/index.html     |  7 +---
 server/player.lua   | 99 +++++++++++++++++++--------------------------
 3 files changed, 63 insertions(+), 70 deletions(-)

diff --git a/html/css/editor.css b/html/css/editor.css
index 613acba..d96e121 100644
--- a/html/css/editor.css
+++ b/html/css/editor.css
@@ -74,44 +74,54 @@
     background-color: var(--md-dark-surface-container);
     box-shadow: inset -1px 0 0 0 var(--md-dark-outline-variant);
 }
-#editor-container .sidebar h2 {
-    margin-top: 0;
-    margin-bottom: 12px;
-    font-size: var(--md-typescale-title-small-size);
-    color: var(--md-dark-on-surface);
-}
+
 #editor-container .file-list {
     list-style: none;
     margin: 0;
     padding: 0;
 }
+
 #editor-container .file-list li {
     display: flex;
     align-items: center;
     gap: 8px;
     padding: 8px;
     border-radius: var(--md-radius-small);
+    color: var(--md-dark-on-surface);
     cursor: pointer;
     transition: background-color 0.2s;
 }
+
 #editor-container .file-list li:hover {
     background-color: rgba(255, 255, 255, var(--md-state-hover-dark-opacity));
 }
+
 #editor-container .file-list li.active {
     color: var(--md-dark-on-primary);
 }
 
 /* Main content area */
-#editor-container .main-content {
+.main-content {
     flex: 1;
     display: flex;
     flex-direction: column;
     padding: 16px;
     overflow: hidden;
 }
-#editor-container .search-container {
+
+/* Search bar */
+.search-container {
+    display: flex;
+    flex-direction: row;
     margin-bottom: 12px;
 }
+
+.search-container span {
+    line-height: 1.5;
+    margin-right: 5px;
+    color: var(--md-dark-on-surface);
+}
+
 #search-input {
     width: 100%;
     padding: 8px 12px;
@@ -122,6 +132,7 @@
     font-size: var(--md-typescale-body-medium-size);
     transition: border-color 0.2s;
 }
+
 #search-input:focus {
     border-color: var(--md-dark-primary);
     outline: none;
diff --git a/html/index.html b/html/index.html
index 478220e..645112a 100644
--- a/html/index.html
+++ b/html/index.html
@@ -44,7 +44,6 @@
 
             <div class="content">
                 <div class="sidebar">
-                    <h2>Files</h2>
                     <ul class="file-list">
                         <li data-file="config">
                             <span class="material-symbols-rounded">settings</span>
@@ -79,10 +78,8 @@
 
                 <div class="main-content">
                     <div class="search-container">
-                        <div class="search-wrapper">
-                            <span class="material-symbols-rounded search-icon">search</span>
-                            <input type="text" id="search-input" placeholder="Search..." aria-label="Search through config items" />
-                        </div>
+                        <span class="material-symbols-rounded search-icon">search</span>
+                        <input type="text" id="search-input" placeholder="Search..." aria-label="Search through config items" />
                     </div>
 
                     <div id="data-container"></div>
diff --git a/server/player.lua b/server/player.lua
index 4accac6..b08cb42 100644
--- a/server/player.lua
+++ b/server/player.lua
@@ -115,35 +115,6 @@ local function pruneExtras(dest, src)
     end
 end
 
-function QBCore.Player.CheckPlayerData(source, PlayerData)
-    PlayerData = PlayerData or {}
-    local Offline = not source
-
-    local defaults = json.decode(LoadResourceFile(resourceName, 'shared/player_defaults.json'))
-
-    if not PlayerData.citizenid then
-        applyDynamicDefaults(defaults)
-        mergeDefaults(PlayerData, defaults)
-    else
-        pruneExtras(PlayerData, defaults)
-        mergeWithGenerators(PlayerData, defaults)
-    end
-
-    if source then
-        PlayerData.source  = source
-        PlayerData.license = PlayerData.license or GetPlayerIdentifierByType(source, 'license')
-        PlayerData.name    = GetPlayerName(source)
-    end
-
-    if GetResourceState('qb-inventory') ~= 'missing' then
-        PlayerData.items = exports['qb-inventory']:LoadInventory(PlayerData.source, PlayerData.citizenid)
-    end
-
-    return QBCore.Player.CreatePlayer(PlayerData, Offline)
-end
-
--- Util Function
-
 local function LogAndSyncMoneyChange(self, moneytype, amount, changeType, reason, diff)
     local source = self.PlayerData.source
     local citizenid = self.PlayerData.citizenid
@@ -183,32 +154,36 @@ local function LogAndSyncMoneyChange(self, moneytype, amount, changeType, reason
     end
 end
 
--- Create a new character
+function QBCore.Player.CheckPlayerData(source, PlayerData)
+    PlayerData = PlayerData or {}
+    local Offline = not source
+
+    local defaults = json.decode(LoadResourceFile(resourceName, 'shared/player_defaults.json'))
+
+    if not PlayerData.citizenid then
+        applyDynamicDefaults(defaults)
+        mergeDefaults(PlayerData, defaults)
+    else
+        pruneExtras(PlayerData, defaults)
+        mergeWithGenerators(PlayerData, defaults)
+    end
+
+    if source then
+        PlayerData.source  = source
+        PlayerData.license = PlayerData.license or GetPlayerIdentifierByType(source, 'license')
+        PlayerData.name    = GetPlayerName(source)
+    end
+
+    if GetResourceState('qb-inventory') ~= 'missing' then
+        PlayerData.items = exports['qb-inventory']:LoadInventory(PlayerData.source, PlayerData.citizenid)
+    end
+
+    return QBCore.Player.CreatePlayer(PlayerData, Offline)
+end
 
 local Player = {}
 Player.__index = Player
 
-function Player.new(PlayerData, Offline)
-    local self = setmetatable({}, Player)
-    self.PlayerData = PlayerData
-    self.Offline = Offline
-
-    -- Compatibility layer for legacy .Functions calls
-    self.Functions = setmetatable({}, {
-        __index = function(_, key)
-            return function(_, ...)
-                if Player[key] then
-                    return Player[key](self, ...)
-                else
-                    error("Attempt to call undefined function '" .. key .. "'")
-                end
-            end
-        end
-    })
-
-    return self
-end
-
 -- Add/Edit Player Functions Below
 
 -- Player Data Getters
@@ -423,18 +398,18 @@ function Player:Notify(text, type, length)
 end
 
 function Player:AddMethod(methodName, handler)
-    if self.Functions[methodName] or Player[methodName] then
+    if Player[methodName] then
         return false
     end
-    self.Functions[methodName] = handler
+    Player[methodName] = handler
     return true
 end
 
 function Player:AddField(fieldName, data)
-    if self[fieldName] ~= nil or Player[fieldName] ~= nil then
+    if Player[fieldName] then
         return false
     end
-    self[fieldName] = data
+    Player[fieldName] = data
     return true
 end
 
@@ -459,11 +434,21 @@ function Player:Logout()
     QBCore.Player.Logout(self.PlayerData.source)
 end
 
+function Player.new(PlayerData, Offline)
+    local self = {
+        PlayerData = PlayerData,
+        Offline = Offline
+    }
+    return setmetatable(self, Player)
+end
+
 function QBCore.Player.CreatePlayer(PlayerData, Offline)
     local player = Player.new(PlayerData, Offline)
+    QBCore.Debug(player)
     if not Offline then
-        QBCore.Players[PlayerData.source] = player
-        QBCore.Player.Save(PlayerData.source)
+        local src = PlayerData.source
+        QBCore.Players[src] = player
+        QBCore.Player.Save(src)
         TriggerEvent('QBCore:Server:PlayerLoaded', player)
         player:UpdatePlayerData()
     end