Rethinking structure a bit

2024-01-08 10:57:01 +01:00
parent 6b1205e160
commit 312294edb8
19 changed files with 229 additions and 222 deletions
--- a/media/lua/client/TOC/Controllers/DataController.lua
+++ b/media/lua/client/TOC/Controllers/DataController.lua
@@ -2,21 +2,24 @@ local CommandsData = require("TOC/CommandsData")
 local StaticData = require("TOC/StaticData")
 ----------------

--- Handle all mod data related stuff
---@class ModDataHandler
+--- An instance will be abbreviated with dcInst
+
+
+--- Handle all TOC mod data related stuff
+---@class DataController
 ---@field username string
---@field tocData tocModData
+---@field tocData tocModDataType
 ---@field isDataReady boolean
 ---@field isResetForced boolean
-local ModDataHandler = {}
-ModDataHandler.instances = {}
+local DataController = {}
+DataController.instances = {}

 ---Setup a new Mod Data Handler
 ---@param username string
 ---@param isResetForced boolean?
---@return ModDataHandler
-function ModDataHandler:new(username, isResetForced)
-    TOC_DEBUG.print("[ModDataHandler] NEW for " .. username)
+---@return DataController
+function DataController:new(username, isResetForced)
+    TOC_DEBUG.print("[DataController] NEW for " .. username)
    --error("TEST TRIGGER")
    local o = {}
    setmetatable(o, self)
@@ -36,17 +39,17 @@ function ModDataHandler:new(username, isResetForced)
        o.isDataReady = true
    end

-    ModDataHandler.instances[username] = o
+    DataController.instances[username] = o

    return o
 end

 ---Setup a new toc mod data data class
 ---@param key string
-function ModDataHandler:setup(key)
-    TOC_DEBUG.print("[ModDataHandler] Running setup")
+function DataController:setup(key)
+    TOC_DEBUG.print("[DataController] Running setup")

-    ---@type tocModData
+    ---@type tocModDataType
    self.tocData = {
        -- Generic stuff that does not belong anywhere else
        isIgnoredPartInfected = false,
@@ -84,8 +87,8 @@ function ModDataHandler:setup(key)
 end

 ---In case of desync between the table on ModData and the table here
---@param tocData tocModData
-function ModDataHandler:reapplyTocData(tocData)
+---@param tocData tocModDataType
+function DataController:reapplyTocData(tocData)
    local key = CommandsData.GetKey(self.username)
    ModData.add(key, tocData)
    self.tocData = ModData.get(key)
@@ -94,54 +97,54 @@ end
 -----------------
 --* Setters *--

-function ModDataHandler:setIsDataReady(isDataReady)
+function DataController:setIsDataReady(isDataReady)
    self.isDataReady = isDataReady
 end

 ---Set a generic boolean that toggles varies function of the mod
 ---@param isAnyLimbCut boolean
-function ModDataHandler:setIsAnyLimbCut(isAnyLimbCut)
+function DataController:setIsAnyLimbCut(isAnyLimbCut)
    self.tocData.isAnyLimbCut = isAnyLimbCut
 end

 ---Set isIgnoredPartInfected
 ---@param isIgnoredPartInfected boolean
-function ModDataHandler:setIsIgnoredPartInfected(isIgnoredPartInfected)
+function DataController:setIsIgnoredPartInfected(isIgnoredPartInfected)
    self.tocData.isIgnoredPartInfected = isIgnoredPartInfected
 end

 ---Set isCut 
 ---@param limbName string
 ---@param isCut boolean
-function ModDataHandler:setIsCut(limbName, isCut)
+function DataController:setIsCut(limbName, isCut)
    self.tocData.limbs[limbName].isCut = isCut
 end

 ---Set isInfected
 ---@param limbName string
 ---@param isInfected boolean
-function ModDataHandler:setIsInfected(limbName, isInfected)
+function DataController:setIsInfected(limbName, isInfected)
    self.tocData.limbs[limbName].isInfected = isInfected
 end

 ---Set isCicatrized
 ---@param limbName string
 ---@param isCicatrized boolean
-function ModDataHandler:setIsCicatrized(limbName, isCicatrized)
+function DataController:setIsCicatrized(limbName, isCicatrized)
    self.tocData.limbs[limbName].isCicatrized = isCicatrized
 end

 ---Set isCauterized
 ---@param limbName string
 ---@param isCauterized boolean
-function ModDataHandler:setIsCauterized(limbName, isCauterized)
+function DataController:setIsCauterized(limbName, isCauterized)
    self.tocData.limbs[limbName].isCauterized = isCauterized
 end

 ---Set woundDirtyness
 ---@param limbName string
 ---@param woundDirtyness number
-function ModDataHandler:setWoundDirtyness(limbName, woundDirtyness)
+function DataController:setWoundDirtyness(limbName, woundDirtyness)
    self.tocData.limbs[limbName].woundDirtyness = woundDirtyness
 end

@@ -149,21 +152,21 @@ end
 ---Set cicatrizationTime
 ---@param limbName string
 ---@param cicatrizationTime number
-function ModDataHandler:setCicatrizationTime(limbName, cicatrizationTime)
+function DataController:setCicatrizationTime(limbName, cicatrizationTime)
    self.tocData.limbs[limbName].cicatrizationTime = cicatrizationTime
 end

 ---Set isProstEquipped
 ---@param group string
 ---@param isProstEquipped boolean
-function ModDataHandler:setIsProstEquipped(group, isProstEquipped)
+function DataController:setIsProstEquipped(group, isProstEquipped)
    self.tocData.prostheses[group].isProstEquipped = isProstEquipped
 end

 ---Set prostFactor
 ---@param group string
 ---@param prostFactor number
-function ModDataHandler:setProstFactor(group, prostFactor)
+function DataController:setProstFactor(group, prostFactor)
    self.tocData.prostheses[group].prostFactor = prostFactor
 end

@@ -172,26 +175,26 @@ end

 ---comment
 ---@return boolean
-function ModDataHandler:getIsDataReady()
+function DataController:getIsDataReady()
    return self.isDataReady
 end
 ---Set a generic boolean that toggles varies function of the mod
 ---@return boolean
-function ModDataHandler:getIsAnyLimbCut()
+function DataController:getIsAnyLimbCut()
    --if self.isDataReady == false then return false end
    return self.tocData.isAnyLimbCut
 end

 ---Get isIgnoredPartInfected
 ---@return boolean
-function ModDataHandler:getIsIgnoredPartInfected()
+function DataController:getIsIgnoredPartInfected()
    return self.tocData.isIgnoredPartInfected
 end

 ---Get isCut
 ---@param limbName string
 ---@return boolean
-function ModDataHandler:getIsCut(limbName)
+function DataController:getIsCut(limbName)
    if not self.isDataReady then return false end

    if self.tocData.limbs[limbName] then
@@ -204,7 +207,7 @@ end
 ---Get isVisible
 ---@param limbName string
 ---@return boolean
-function ModDataHandler:getIsVisible(limbName)
+function DataController:getIsVisible(limbName)
    if not self.isDataReady then return false end

    return self.tocData.limbs[limbName].isVisible
@@ -213,21 +216,21 @@ end
 ---Get isCicatrized
 ---@param limbName string
 ---@return boolean
-function ModDataHandler:getIsCicatrized(limbName)
+function DataController:getIsCicatrized(limbName)
    return self.tocData.limbs[limbName].isCicatrized
 end

 ---Get isCauterized
 ---@param limbName string
 ---@return boolean
-function ModDataHandler:getIsCauterized(limbName)
+function DataController:getIsCauterized(limbName)
    return self.tocData.limbs[limbName].isCauterized
 end

 ---Get woundDirtyness
 ---@param limbName string
 ---@return number
-function ModDataHandler:getWoundDirtyness(limbName)
+function DataController:getWoundDirtyness(limbName)
    return self.tocData.limbs[limbName].woundDirtyness
 end

@@ -235,21 +238,21 @@ end
 ---Get cicatrizationTime
 ---@param limbName string
 ---@return number
-function ModDataHandler:getCicatrizationTime(limbName)
+function DataController:getCicatrizationTime(limbName)
    return self.tocData.limbs[limbName].cicatrizationTime
 end

 ---Get isProstEquipped
 ---@param group string
 ---@return boolean
-function ModDataHandler:getIsProstEquipped(group)
+function DataController:getIsProstEquipped(group)
    return self.tocData.prostheses[group].isProstEquipped
 end

 ---Get prostFactor
 ---@param group string
 ---@return number
-function ModDataHandler:getProstFactor(group)
+function DataController:getProstFactor(group)
    return self.tocData.prostheses[group].prostFactor
 end

@@ -261,7 +264,7 @@ end
 ---@param isCicatrized boolean
 ---@param isCauterized boolean
 ---@param surgeonFactor number?
-function ModDataHandler:setCutLimb(limbName, isOperated, isCicatrized, isCauterized, surgeonFactor)
+function DataController:setCutLimb(limbName, isOperated, isCicatrized, isCauterized, surgeonFactor)
    local cicatrizationTime = 0
    if isCicatrized == false or isCauterized == false then
        cicatrizationTime = StaticData.LIMBS_CICATRIZATION_TIME_IND_NUM[limbName] - surgeonFactor
@@ -292,7 +295,7 @@ end
 ---@param limbName string
 ---@param ampStatus partData {isCut, isInfected, isOperated, isCicatrized, isCauterized, isVisible}
 ---@param cicatrizationTime integer?
-function ModDataHandler:setLimbParams(limbName, ampStatus, cicatrizationTime)
+function DataController:setLimbParams(limbName, ampStatus, cicatrizationTime)
    local limbData = self.tocData.limbs[limbName]
    if ampStatus.isCut ~= nil then limbData.isCut = ampStatus.isCut end
    if ampStatus.isInfected ~= nil then limbData.isInfected = ampStatus.isInfected end
@@ -309,44 +312,44 @@ end

 ---Decreases the cicatrization time
 ---@param limbName string
-function ModDataHandler:decreaseCicatrizationTime(limbName)
+function DataController:decreaseCicatrizationTime(limbName)
    self.tocData.limbs[limbName].cicatrizationTime = self.tocData.limbs[limbName].cicatrizationTime - 1
 end

 --* Global Mod Data Handling *--

-function ModDataHandler:apply()
+function DataController:apply()
    ModData.transmit(CommandsData.GetKey(self.username))
 end

-function ModDataHandler.ReceiveData(key, data)
+function DataController.ReceiveData(key, data)
    if not isClient() then
-        TOC_DEBUG.print("SP, skipping ModDataHandler.ReceiveData")
+        TOC_DEBUG.print("SP, skipping DataController.ReceiveData")
    end
    -- During startup the game can return Bob as the player username, adding a useless ModData table
    if key == "TOC_Bob" then return end

-    TOC_DEBUG.print("[ModDataHandler] ReceiveData for " .. key)
+    TOC_DEBUG.print("[DataController] ReceiveData for " .. key)
    if data == {} or data == nil then
        TOC_DEBUG.print("table is nil... returning")
        return
    end

-    -- Get ModDataHandler instance if there was none for that user and reapply the correct ModData table as a reference
+    -- Get DataController instance if there was none for that user and reapply the correct ModData table as a reference
    local username = key:sub(5)
-    local handler = ModDataHandler.GetInstance(username)
+    local handler = DataController.GetInstance(username)
    if handler.isResetForced or data == nil or data == {} or data == false then
-        TOC_DEBUG.print("[ModDataHandler] Setup")
+        TOC_DEBUG.print("[DataController] Setup")
        handler:setup(key)
        handler.isResetForced = false
    else
-        TOC_DEBUG.print("[ModDataHandler] Reapply")
+        TOC_DEBUG.print("[DataController] Reapply")
        handler:reapplyTocData(data)
    end


    -- if handler.isResetForced or handler.tocData == nil or handler.tocData.limbs == nil or handler.tocData.limbs.Hand_L == nil or handler.tocData.limbs.Hand_L.isCut == nil then
-    --     TOC_DEBUG.print("tocData in ModDataHandler for " .. handler.username .. " is nil, creating it now")
+    --     TOC_DEBUG.print("tocData in DataController for " .. handler.username .. " is nil, creating it now")
    --     handler:setup(key)
    --     handler.isResetForced = false
    -- elseif table then
@@ -361,27 +364,27 @@ function ModDataHandler.ReceiveData(key, data)

    -- Transmit it to the server
    ModData.transmit(key)
-    TOC_DEBUG.print("[ModDataHandler] Transmitting data after receiving it for: " .. handler.username)
+    TOC_DEBUG.print("[DataController] Transmitting data after receiving it for: " .. handler.username)

 end

-Events.OnReceiveGlobalModData.Add(ModDataHandler.ReceiveData)
+Events.OnReceiveGlobalModData.Add(DataController.ReceiveData)

 -------------------

 ---@param username string?
---@return ModDataHandler
-function ModDataHandler.GetInstance(username)
+---@return DataController
+function DataController.GetInstance(username)
    if username == nil or username == "Bob" then
        username = getPlayer():getUsername()
    end

-    if ModDataHandler.instances[username] == nil then
-        TOC_DEBUG.print("[ModDataHandler] Creating NEW instance for " .. username)
-        return ModDataHandler:new(username)
+    if DataController.instances[username] == nil then
+        TOC_DEBUG.print("[DataController] Creating NEW instance for " .. username)
+        return DataController:new(username)
    else
-        return ModDataHandler.instances[username]
+        return DataController.instances[username]
    end
 end

-return ModDataHandler
+return DataController
--- a/media/lua/client/TOC/Controllers/ItemsController.lua
+++ b/media/lua/client/TOC/Controllers/ItemsController.lua
@@ -3,21 +3,21 @@ local CommonMethods = require("TOC/CommonMethods")
 ---------------------------

 --- Submodule to handle spawning the correct items after certain actions (ie: cutting a hand). LOCAL ONLY!
---@class ItemsHandler
-local ItemsHandler = {}
+---@class ItemsController
+local ItemsController = {}



 --* Player Methods *--
---@class ItemsHandler.Player
-ItemsHandler.Player = {}
+---@class ItemsController.Player
+ItemsController.Player = {}

 ---Returns the correct index for the textures of the amputation
 ---@param playerObj IsoPlayer
 ---@param isCicatrized boolean
 ---@return number
 ---@private
-function ItemsHandler.Player.GetAmputationTexturesIndex(playerObj, isCicatrized)
+function ItemsController.Player.GetAmputationTexturesIndex(playerObj, isCicatrized)
    local textureString = playerObj:getHumanVisual():getSkinTexture()
    local isHairy = textureString:sub(-1) == "a"

@@ -39,7 +39,7 @@ end
 ---@param clothingItem InventoryItem?
 ---@return boolean
 ---@private
-function ItemsHandler.Player.RemoveClothingItem(playerObj, clothingItem)
+function ItemsController.Player.RemoveClothingItem(playerObj, clothingItem)
    if clothingItem and instanceof(clothingItem, "InventoryItem") then
        playerObj:removeWornItem(clothingItem)

@@ -53,7 +53,7 @@ end
 ---Search and deletes an old amputation clothing item on the same side
 ---@param playerObj IsoPlayer
 ---@param limbName string
-function ItemsHandler.Player.DeleteOldAmputationItem(playerObj, limbName)
+function ItemsController.Player.DeleteOldAmputationItem(playerObj, limbName)
    local side = CommonMethods.GetSide(limbName)
    for partName, _ in pairs(StaticData.PARTS_IND_STR) do
        local othLimbName = partName .. "_" .. side
@@ -65,30 +65,30 @@ function ItemsHandler.Player.DeleteOldAmputationItem(playerObj, limbName)

        -- If we manage to find and remove an item, then we should stop this function.
        ---@cast othClothingItem InventoryItem
-        if ItemsHandler.Player.RemoveClothingItem(playerObj, othClothingItem) then return end
+        if ItemsController.Player.RemoveClothingItem(playerObj, othClothingItem) then return end
    end
 end

 ---Deletes all the old amputation items, used for resets
 ---@param playerObj IsoPlayer
-function ItemsHandler.Player.DeleteAllOldAmputationItems(playerObj)
+function ItemsController.Player.DeleteAllOldAmputationItems(playerObj)

    for i=1, #StaticData.LIMBS_STR do
        local limbName = StaticData.LIMBS_STR[i]
        local clothItemName = StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName
        local clothItem = playerObj:getInventory():FindAndReturn(clothItemName)
        ---@cast clothItem InventoryItem
-        ItemsHandler.Player.RemoveClothingItem(playerObj, clothItem)
+        ItemsController.Player.RemoveClothingItem(playerObj, clothItem)
    end
 end

 ---Spawns and equips the correct amputation item to the player.
 ---@param playerObj IsoPlayer
 ---@param limbName string
-function ItemsHandler.Player.SpawnAmputationItem(playerObj, limbName)
+function ItemsController.Player.SpawnAmputationItem(playerObj, limbName)
    TOC_DEBUG.print("clothing name " .. StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName)
    local clothingItem = playerObj:getInventory():AddItem(StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName)
-    local texId = ItemsHandler.Player.GetAmputationTexturesIndex(playerObj, false)
+    local texId = ItemsController.Player.GetAmputationTexturesIndex(playerObj, false)

    ---@cast clothingItem InventoryItem
    clothingItem:getVisual():setTextureChoice(texId) -- it counts from 0, so we have to subtract 1
@@ -98,12 +98,12 @@ end


 --* Zombie Methods *--
---@class ItemsHandler.Zombie
-ItemsHandler.Zombie = {}
+---@class ItemsController.Zombie
+ItemsController.Zombie = {}

 ---Set an amputation to a zombie
 ---@param zombie IsoZombie
-function ItemsHandler.Zombie.SpawnAmputationItem(zombie)
+function ItemsController.Zombie.SpawnAmputationItem(zombie)
    -- TODO Set texture ID
    local itemVisualsList = zombie:getItemVisuals()
    local ignoredLimbs = {}
@@ -164,4 +164,4 @@ function ISInventoryPane:refreshContainer()
    end
 end

-return ItemsHandler
+return ItemsController
--- a/media/lua/client/TOC/Controllers/LocalPlayerController.lua
+++ b/media/lua/client/TOC/Controllers/LocalPlayerController.lua
@@ -1,4 +1,4 @@
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local CommonMethods = require("TOC/CommonMethods")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
 local StaticData = require("TOC/StaticData")
@@ -11,36 +11,36 @@ local StaticData = require("TOC/StaticData")
 -- Update current player status (infection checks)
 -- handle stats increase\decrease

---@class PlayerHandler
+---@class LocalPlayerController
 ---@field playerObj IsoPlayer
 ---@field username string
 ---@field hasBeenDamaged boolean
-local PlayerHandler = {}
+local LocalPlayerController = {}

 ---Setup the Player Handler and modData, only for local client
 ---@param playerObj IsoPlayer
 ---@param isForced boolean?
-function PlayerHandler.InitializePlayer(playerObj, isForced)
+function LocalPlayerController.InitializePlayer(playerObj, isForced)
    local username = playerObj:getUsername()

    TOC_DEBUG.print("[PlayerHandler] Initializing local player: " .. username)

-    ModDataHandler:new(username, isForced)
-    PlayerHandler.playerObj = playerObj
-    PlayerHandler.username = username
+    DataController:new(username, isForced)
+    LocalPlayerController.playerObj = playerObj
+    LocalPlayerController.username = username

    -- Calculate amputated limbs and highest point of amputations at startup
    --CachedDataHandler.CalculateAmputatedLimbs(username)
    --CachedDataHandler.CalculateHighestAmputatedLimbs(username)

    --Setup the CicatrizationUpdate event and triggers it once
-    Events.OnAmputatedLimb.Add(PlayerHandler.ToggleUpdateAmputations)
-    PlayerHandler.ToggleUpdateAmputations()
+    Events.OnAmputatedLimb.Add(LocalPlayerController.ToggleUpdateAmputations)
+    LocalPlayerController.ToggleUpdateAmputations()

    -- Since isForced is used to reset an existing player data, we're gonna clean their ISHealthPanel table too
    if isForced then
-        local ItemsHandler = require("TOC/Handlers/ItemsHandler")
-        ItemsHandler.Player.DeleteAllOldAmputationItems(playerObj)
+        local ItemsController = require("TOC/Handlers/ItemsController")
+        ItemsController.Player.DeleteAllOldAmputationItems(playerObj)
        CachedDataHandler.Reset(username)
    end

@@ -51,7 +51,7 @@ end

 ---Handles the traits
 ---@param playerObj IsoPlayer
-function PlayerHandler.ManageTraits(playerObj)
+function LocalPlayerController.ManageTraits(playerObj)
    local AmputationHandler = require("Handlers/TOC_AmputationHandler")
    for k, v in pairs(StaticData.TRAITS_BP) do
        if playerObj:HasTrait(k) then
@@ -68,7 +68,7 @@ end

 ---Used to heal an area that has been cut previously. There's an exception for bites, those are managed differently
 ---@param bodyPart BodyPart
-function PlayerHandler.HealArea(bodyPart)
+function LocalPlayerController.HealArea(bodyPart)
    bodyPart:setBleeding(false)
    bodyPart:setBleedingTime(0)

@@ -90,8 +90,8 @@ end
 ---@param bodyDamage BodyDamage
 ---@param bodyPart BodyPart
 ---@param limbName string
---@param modDataHandler ModDataHandler
-function PlayerHandler.HealZombieInfection(bodyDamage, bodyPart, limbName, modDataHandler)
+---@param dcInst DataController
+function LocalPlayerController.HealZombieInfection(bodyDamage, bodyPart, limbName, dcInst)
    if bodyDamage:isInfected() == false then return end

    bodyDamage:setInfected(false)
@@ -100,16 +100,16 @@ function PlayerHandler.HealZombieInfection(bodyDamage, bodyPart, limbName, modDa
    bodyDamage:setInfectionLevel(-1)
    bodyPart:SetInfected(false)

-    modDataHandler:setIsInfected(limbName, false)
-    modDataHandler:apply()
+    dcInst:setIsInfected(limbName, false)
+    dcInst:apply()
 end

 ---comment
 ---@param character IsoPlayer
 ---@param limbName string
-function PlayerHandler.TryRandomBleed(character, limbName)
+function LocalPlayerController.TryRandomBleed(character, limbName)
    -- Chance should be determined by the cicatrization time
-    local cicTime = ModDataHandler.GetInstance():getCicatrizationTime(limbName)
+    local cicTime = DataController.GetInstance():getCicatrizationTime(limbName)
    if cicTime == 0 then return end
    -- TODO Sometimes we get cicTime = 0... Shouldn't really do it

@@ -129,37 +129,37 @@ end
 -------------------------
 --* Events *--
 --- Locks OnPlayerGetDamage event, to prevent it from getting spammed constantly
-PlayerHandler.hasBeenDamaged = false
+LocalPlayerController.hasBeenDamaged = false


 ---Check if the player has in infected body part or if they have been hit in a cut area
 ---@param character IsoPlayer
-function PlayerHandler.HandleDamage(character)
+function LocalPlayerController.HandleDamage(character)
    -- TOC_DEBUG.print("Player got hit!")
    -- TOC_DEBUG.print(damageType)
    if character ~= getPlayer() then return end
    local bd = character:getBodyDamage()
-    local modDataHandler = ModDataHandler.GetInstance()
+    local dcInst = DataController.GetInstance()
    local modDataNeedsUpdate = false
    for i=1, #StaticData.LIMBS_STR do
        local limbName = StaticData.LIMBS_STR[i]
        local bptEnum = StaticData.BODYLOCS_IND_BPT[limbName]
        local bodyPart = bd:getBodyPart(bptEnum)
-        if modDataHandler:getIsCut(limbName) then
+        if dcInst:getIsCut(limbName) then

            -- Generic injury, let's heal it since they already cut the limb off
            if bodyPart:HasInjury() then
-                PlayerHandler.HealArea(bodyPart)
+                LocalPlayerController.HealArea(bodyPart)
            end

            -- Special case for bites\zombie infections
            if bodyPart:IsInfected() then
                TOC_DEBUG.print("Healed from zombie infection " .. tostring(bodyPart))
-                PlayerHandler.HealZombieInfection(bd, bodyPart, limbName, modDataHandler)
+                LocalPlayerController.HealZombieInfection(bd, bodyPart, limbName, dcInst)
            end
        else
            if bodyPart:bitten() or bodyPart:IsInfected() then
-                modDataHandler:setIsInfected(limbName, true)
+                dcInst:setIsInfected(limbName, true)
                modDataNeedsUpdate = true
            end
        end
@@ -167,24 +167,24 @@ function PlayerHandler.HandleDamage(character)

    -- Check other body parts that are not included in the mod, if there's a bite there then the player is fucked
    -- We can skip this loop if the player has been infected. The one before we kinda need it to handle correctly the bites in case the player wanna cut stuff off anyway
-    if modDataHandler:getIsIgnoredPartInfected() then return end
+    if dcInst:getIsIgnoredPartInfected() then return end

    for i=1, #StaticData.IGNORED_BODYLOCS_BPT do
        local bodyPartType = StaticData.IGNORED_BODYLOCS_BPT[i]
        local bodyPart = bd:getBodyPart(bodyPartType)
        if bodyPart and (bodyPart:bitten() or bodyPart:IsInfected()) then
-            modDataHandler:setIsIgnoredPartInfected(true)
+            dcInst:setIsIgnoredPartInfected(true)
            modDataNeedsUpdate = true
        end
    end

    -- TODO in theory  should sync modData, but it's gonna be expensive as fuck. Figure it out
    if modDataNeedsUpdate then
-        modDataHandler:apply()
+        dcInst:apply()
    end

    -- Disable the lock
-    PlayerHandler.hasBeenDamaged = false
+    LocalPlayerController.hasBeenDamaged = false

 end

@@ -192,29 +192,29 @@ end
 ---@param character IsoGameCharacter
 ---@param damageType string
 ---@param damageAmount number
-function PlayerHandler.OnGetDamage(character, damageType, damageAmount)
+function LocalPlayerController.OnGetDamage(character, damageType, damageAmount)

    -- TODO Check if other players in the online triggers this

-    if PlayerHandler.hasBeenDamaged == false then
+    if LocalPlayerController.hasBeenDamaged == false then
        -- Start checks

        -- TODO Add a timer before we can re-enable this bool?
-        PlayerHandler.hasBeenDamaged = true
-        PlayerHandler.HandleDamage(character)
+        LocalPlayerController.hasBeenDamaged = true
+        LocalPlayerController.HandleDamage(character)
    end
 end

-Events.OnPlayerGetDamage.Add(PlayerHandler.OnGetDamage)
+Events.OnPlayerGetDamage.Add(LocalPlayerController.OnGetDamage)

 ---Updates the cicatrization process, run when a limb has been cut. Run it every 1 hour
-function PlayerHandler.UpdateAmputations()
-    local modDataHandler = ModDataHandler.GetInstance()
-    if modDataHandler:getIsAnyLimbCut() == false then
-        Events.EveryHours.Remove(PlayerHandler.UpdateAmputations)
+function LocalPlayerController.UpdateAmputations()
+    local dcInst = DataController.GetInstance()
+    if dcInst:getIsAnyLimbCut() == false then
+        Events.EveryHours.Remove(LocalPlayerController.UpdateAmputations)
    end

-    local pl = PlayerHandler.playerObj
+    local pl = LocalPlayerController.playerObj
    local bd = pl:getBodyDamage()
    local visual = pl:getHumanVisual()
    local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(pl:getUsername())
@@ -222,11 +222,11 @@ function PlayerHandler.UpdateAmputations()

    for k, _ in pairs(amputatedLimbs) do
        local limbName = k
-        local isCicatrized = modDataHandler:getIsCicatrized(limbName)
+        local isCicatrized = dcInst:getIsCicatrized(limbName)

        if not isCicatrized then
            needsUpdate = true
-            local cicTime = modDataHandler:getCicatrizationTime(limbName)
+            local cicTime = dcInst:getCicatrizationTime(limbName)
            TOC_DEBUG.print("updating cicatrization for " .. tostring(limbName))

            -- TODO Check if bandaged, sutured, whatever
@@ -245,7 +245,7 @@ function PlayerHandler.UpdateAmputations()
            -- TEST SECTION

            local dirtynessVis = visual:getDirt(bbptEnum) + visual:getBlood(bbptEnum)
-            local dirtynessWound = modDataHandler:getWoundDirtyness(limbName) + modifier
+            local dirtynessWound = dcInst:getWoundDirtyness(limbName) + modifier
            --------------

            local dirtyness = dirtynessVis + dirtynessWound
@@ -254,44 +254,44 @@ function PlayerHandler.UpdateAmputations()
                dirtyness = 1
            end

-            modDataHandler:setWoundDirtyness(limbName, dirtyness)
+            dcInst:setWoundDirtyness(limbName, dirtyness)

            TOC_DEBUG.print("dirtyness for this zone: " .. tostring(dirtyness))

            cicTime = cicTime - SandboxVars.TOC.CicatrizationSpeed
-            modDataHandler:setCicatrizationTime(limbName, cicTime)
+            dcInst:setCicatrizationTime(limbName, cicTime)
            TOC_DEBUG.print("new cicatrization time: " .. tostring(cicTime))
            if cicTime <= 0 then
                TOC_DEBUG.print(tostring(limbName) .. " is cicatrized")
-                modDataHandler:setIsCicatrized(limbName, true)
+                dcInst:setIsCicatrized(limbName, true)
            end
        end
    end

    if needsUpdate then
        TOC_DEBUG.print("updating modData from cicatrization loop")
-        modDataHandler:apply()      -- TODO This is gonna be heavy. Not entirely sure
+        dcInst:apply()      -- TODO This is gonna be heavy. Not entirely sure
    else
        TOC_DEBUG.print("Removing UpdateAmputations")
-        Events.EveryHours.Remove(PlayerHandler.UpdateAmputations)     -- We can remove it safely, no cicatrization happening here boys
+        Events.EveryHours.Remove(LocalPlayerController.UpdateAmputations)     -- We can remove it safely, no cicatrization happening here boys
    end
    TOC_DEBUG.print("updating cicatrization and wound dirtyness!")

 end

 ---Starts safely the loop to update cicatrzation
-function PlayerHandler.ToggleUpdateAmputations()
+function LocalPlayerController.ToggleUpdateAmputations()
    TOC_DEBUG.print("[PlayerHandler] Activating amputation handling loop (if it wasn't active before)")
-    CommonMethods.SafeStartEvent("EveryHours", PlayerHandler.UpdateAmputations)
+    CommonMethods.SafeStartEvent("EveryHours", LocalPlayerController.UpdateAmputations)
 end


 --* Helper functions for overrides *--

 local function CheckHandFeasibility(limbName)
-    local modDataHandler = ModDataHandler.GetInstance()
+    local dcInst = DataController.GetInstance()

-    return not modDataHandler:getIsCut(limbName) or modDataHandler:getIsProstEquipped(StaticData.LIMBS_TO_PROST_GROUP_MATCH_IND_STR[limbName])
+    return not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(StaticData.LIMBS_TO_PROST_GROUP_MATCH_IND_STR[limbName])
 end

 ------------------------------------------
@@ -310,14 +310,14 @@ function ISBaseTimedAction:adjustMaxTime(maxTime)
    if queue and queue.current and queue.current.skipTOC then return time end

    -- Action is valid, check if we have any cut limb and then modify maxTime
-    local modDataHandler = ModDataHandler.GetInstance()
-    if time ~= -1 and modDataHandler and modDataHandler:getIsAnyLimbCut() then
+    local dcInst = DataController.GetInstance()
+    if time ~= -1 and dcInst and dcInst:getIsAnyLimbCut() then
        local pl = getPlayer()
        local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(pl:getUsername())

        for k, _ in pairs(amputatedLimbs) do
            local limbName = k
-            --if modDataHandler:getIsCut(limbName) then
+            --if dcInst:getIsCut(limbName) then
            local perk = Perks["Side_" .. CommonMethods.GetSide(limbName)]
            local perkLevel = pl:getPerkLevel(perk)
            local perkLevelScaled
@@ -337,20 +337,20 @@ local og_ISBaseTimedAction_perform = ISBaseTimedAction.perform
 function ISBaseTimedAction:perform()
 	og_ISBaseTimedAction_perform(self)

-    local modDataHandler = ModDataHandler.GetInstance()
-    if not modDataHandler:getIsAnyLimbCut() then return end
+    local dcInst = DataController.GetInstance()
+    if not dcInst:getIsAnyLimbCut() then return end

-    local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(PlayerHandler.username)
+    local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(LocalPlayerController.username)
    for k, _ in pairs(amputatedLimbs) do
        local limbName = k
-        if modDataHandler:getIsCut(limbName) then
+        if dcInst:getIsCut(limbName) then
            local side = CommonMethods.GetSide(limbName)
-            PlayerHandler.playerObj:getXp():AddXP(Perks["Side_" .. side], 1)       -- TODO Make it dynamic
+            LocalPlayerController.playerObj:getXp():AddXP(Perks["Side_" .. side], 1)       -- TODO Make it dynamic
            local prostGroup = StaticData.LIMBS_TO_PROST_GROUP_MATCH_IND_STR[limbName]
-            if not modDataHandler:getIsCicatrized(limbName) and modDataHandler:getIsProstEquipped(prostGroup) then
+            if not dcInst:getIsCicatrized(limbName) and dcInst:getIsProstEquipped(prostGroup) then
                TOC_DEBUG.print("Trying for bleed, player met the criteria")
                -- TODO If we have cut a forearm, it will try to check the hand too, with cicatrization time = 0. We should skip this
-                PlayerHandler.TryRandomBleed(self.character, limbName)
+                LocalPlayerController.TryRandomBleed(self.character, limbName)
            end
        end
    end
@@ -368,8 +368,8 @@ local og_ISEquipWeaponAction_isValid = ISEquipWeaponAction.isValid
 ---@diagnostic disable-next-line: duplicate-set-field
 function ISEquipWeaponAction:isValid()
    local isValid = og_ISEquipWeaponAction_isValid(self)
-    local modDataHandler = ModDataHandler.GetInstance(self.character:getUsername())
-    if isValid and modDataHandler:getIsAnyLimbCut() then
+    local dcInst = DataController.GetInstance(self.character:getUsername())
+    if isValid and dcInst:getIsAnyLimbCut() then
        local isPrimaryHandValid = CheckHandFeasibility(primaryHand)
        local isSecondaryHandValid = CheckHandFeasibility(secondaryHand)

@@ -405,8 +405,8 @@ end
 ---@field character IsoPlayer

 ---A recreation of the original method, but with amputations in mind
---@param modDataHandler ModDataHandler
-function ISEquipWeaponAction:performWithAmputation(modDataHandler)
+---@param dcInst DataController
+function ISEquipWeaponAction:performWithAmputation(dcInst)

    -- TODO Simplify this
    local hand = nil
@@ -446,12 +446,12 @@ function ISEquipWeaponAction:performWithAmputation(modDataHandler)
            end
        else
            setMethodSecond(self.character, nil)
-            -- TODO We should use the CachedData indexable instead of modDataHandler
+            -- TODO We should use the CachedData indexable instead of dcInst

-            if not modDataHandler:getIsCut(hand) then
+            if not dcInst:getIsCut(hand) then
                setMethodSecond(self.character, self.item)
                -- Check other HAND!
-            elseif not modDataHandler:getIsCut(otherHand) then
+            elseif not dcInst:getIsCut(otherHand) then
                setMethodFirst(self.character, self.item)
            end
        end
@@ -489,10 +489,10 @@ function ISEquipWeaponAction:perform()
    og_ISEquipWeaponAction_perform(self)

    -- TODO Can we do it earlier?
-    local modDataHandler = ModDataHandler.GetInstance(self.character:getUsername())
+    local dcInst = DataController.GetInstance(self.character:getUsername())
    -- Just check it any limb has been cut. If not, we can just return from here
-    if modDataHandler:getIsAnyLimbCut() == true then
-        self:performWithAmputation(modDataHandler)
+    if dcInst:getIsAnyLimbCut() == true then
+        self:performWithAmputation(dcInst)
    end
 end

@@ -531,4 +531,4 @@ function ISInventoryPaneContextMenu.doEquipOption(context, playerObj, isWeapon,
 end


-return PlayerHandler
+return LocalPlayerController
--- a/media/lua/client/TOC/Handlers/AmputationHandler.lua
+++ b/media/lua/client/TOC/Handlers/AmputationHandler.lua
@@ -1,7 +1,7 @@
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
-local ItemsHandler = require("TOC/Handlers/ItemsHandler")
+local DataController = require("TOC/Controllers/DataController")
+local ItemsController = require("TOC/Handlers/ItemsController")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
-local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local LocalPlayerController = require("TOC/Controllers/LocalPlayerController")
 local StaticData = require("TOC/StaticData")
 ---------------------------

@@ -132,9 +132,9 @@ function AmputationHandler:execute(damagePlayer)
    local surgeonFactor = self.surgeonPl:getPerkLevel(Perks.Doctor) * SandboxVars.TOC.SurgeonAbilityImportance

    -- Set the data in modData
-    local modDataHandler = ModDataHandler.GetInstance()
-    modDataHandler:setCutLimb(self.limbName, false, false, false, surgeonFactor)
-    modDataHandler:apply()      -- This will force rechecking the cached amputated limbs on the other client
+    local dcInst = DataController.GetInstance()
+    dcInst:setCutLimb(self.limbName, false, false, false, surgeonFactor)
+    dcInst:apply()      -- This will force rechecking the cached amputated limbs on the other client

    -- Heal the area, we're gonna re-set the damage after (if it's enabled)
    local bd = self.patientPl:getBodyDamage()
@@ -142,8 +142,8 @@ function AmputationHandler:execute(damagePlayer)
    PlayerHandler.HealArea(bodyPart)

    -- Give the player the correct amputation item
-    ItemsHandler.Player.DeleteOldAmputationItem(self.patientPl, self.limbName)
-    ItemsHandler.Player.SpawnAmputationItem(self.patientPl, self.limbName)
+    ItemsController.Player.DeleteOldAmputationItem(self.patientPl, self.limbName)
+    ItemsController.Player.SpawnAmputationItem(self.patientPl, self.limbName)

    -- Add it to the list of cut limbs on this local client
    local username = self.patientPl:getUsername()
@@ -158,8 +158,8 @@ function AmputationHandler:execute(damagePlayer)
    CachedDataHandler.CalculateHighestAmputatedLimbs(username)

    -- If the part was actually infected, heal the player, if they were in time (infectionLevel < 20)
-    if bd:getInfectionLevel() < 20 and bodyPart:IsInfected() and not modDataHandler:getIsIgnoredPartInfected() then
-        PlayerHandler.HealZombieInfection(bd, bodyPart, self.limbName, modDataHandler)
+    if bd:getInfectionLevel() < 20 and bodyPart:IsInfected() and not dcInst:getIsIgnoredPartInfected() then
+        PlayerHandler.HealZombieInfection(bd, bodyPart, self.limbName, dcInst)
    end

    -- The last part is to handle the damage that the player will receive after the amputation
--- a/media/lua/client/TOC/Handlers/CachedDataHandler.lua
+++ b/media/lua/client/TOC/Handlers/CachedDataHandler.lua
@@ -1,5 +1,5 @@
 local StaticData = require("TOC/StaticData")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local CommonMethods = require("TOC/CommonMethods")
 ---------------------------

@@ -21,12 +21,12 @@ CachedDataHandler.amputatedLimbs = {}
 function CachedDataHandler.CalculateAmputatedLimbs(username)
    TOC_DEBUG.print("[CachedDataHandler] Calculating amputated limbs for " .. username)
    CachedDataHandler.amputatedLimbs[username] = {}
-    local modDataHandler = ModDataHandler.GetInstance(username)
+    local dcInst = DataController.GetInstance(username)

    -- TODO If the data hasn't arrived, this won't work
    for i=1, #StaticData.LIMBS_STR do
        local limbName = StaticData.LIMBS_STR[i]
-        if modDataHandler:getIsCut(limbName) then
+        if dcInst:getIsCut(limbName) then
            CachedDataHandler.AddAmputatedLimb(username, limbName)
        end
    end
@@ -58,9 +58,9 @@ CachedDataHandler.highestAmputatedLimbs = {}
 ---@param username string
 function CachedDataHandler.CalculateHighestAmputatedLimbs(username)
    TOC_DEBUG.print("[CachedDataHandler] Triggered CalculateHighestAmputatedLimbs")
-    local modDataHandler = ModDataHandler.GetInstance(username)
-    if modDataHandler == nil then
-        TOC_DEBUG.print("ModDataHandler not found for " .. username)
+    local dcInst = DataController.GetInstance(username)
+    if dcInst == nil then
+        TOC_DEBUG.print("DataController not found for " .. username)
        return
    end

@@ -83,7 +83,7 @@ function CachedDataHandler.CalculateHighestAmputatedLimbs(username)
    for k, _ in pairs(amputatedLimbs) do
        local limbName = k
        local index = CommonMethods.GetSide(limbName)
-        if modDataHandler:getIsCut(limbName) and modDataHandler:getIsVisible(limbName) then
+        if dcInst:getIsCut(limbName) and dcInst:getIsVisible(limbName) then
            TOC_DEBUG.print("[CachedDataHandler] Added Highest Amputation: " .. limbName)
            CachedDataHandler.highestAmputatedLimbs[username][index] = limbName
        end
--- a/media/lua/client/TOC/Handlers/ProsthesisHandler.lua
+++ b/media/lua/client/TOC/Handlers/ProsthesisHandler.lua
@@ -1,6 +1,6 @@
 local CommonMethods = require("TOC/CommonMethods")
 local StaticData = require("TOC/StaticData")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
 -------------------------

@@ -67,9 +67,9 @@ function ProsthesisHandler.SearchAndSetupProsthesis(item, isEquipping)

    local group = ProsthesisHandler.GetGroup(item)
    TOC_DEBUG.print("applying prosthesis stuff for " .. group)
-    local modDataHandler = ModDataHandler.GetInstance()
-    modDataHandler:setIsProstEquipped(group, isEquipping)
-    modDataHandler:apply()
+    local dcInst = DataController.GetInstance()
+    dcInst:setIsProstEquipped(group, isEquipping)
+    dcInst:apply()
    
 end

--- a/media/lua/client/TOC/Handlers/SurgeryHandler.lua
+++ b/media/lua/client/TOC/Handlers/SurgeryHandler.lua
@@ -1,4 +1,4 @@
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")

 ---@class SurgeryHandler
 ---@field type string
@@ -28,7 +28,7 @@ function SurgeryHandler:execute()


    if self.type == "oven" then
-        ModDataHandler.GetInstance():setIsCauterized(self.limbName, true)
+        DataController.GetInstance():setIsCauterized(self.limbName, true)
    end
 end

--- a/media/lua/client/TOC/Main.lua
+++ b/media/lua/client/TOC/Main.lua
@@ -1,4 +1,4 @@
-local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local LocalPlayerController = require("TOC/Controllers/LocalPlayerController")
 local CommonMethods = require("TOC/CommonMethods")
 local CommandsData = require("TOC/CommandsData")
 ------------------
--- a/media/lua/client/TOC/Tests.lua
+++ b/media/lua/client/TOC/Tests.lua
@@ -2,9 +2,9 @@ if not getActivatedMods():contains("TEST_FRAMEWORK") or not isDebugEnabled() the
 local TestFramework = require("TestFramework/TestFramework")
 local TestUtils = require("TestFramework/TestUtils")

-local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local LocalPlayerController = require("TOC/Controllers/LocalPlayerController")
 local AmputationHandler = require("TOC/Handlers/AmputationHandler")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local StaticData = require("TOC/StaticData")


@@ -52,11 +52,11 @@ TestFramework.registerTestModule("PlayerHandler", "Cicatrization", function()
    function Tests.SetCicatrizationTimeToOne()
        for i=1, #StaticData.LIMBS_STR do
            local limbName = StaticData.LIMBS_STR[i]
-            ModDataHandler.GetInstance():setCicatrizationTime(limbName, 1)
-            TestUtils.assert(ModDataHandler.GetInstance():getCicatrizationTime(limbName) == 1)
+            DataController.GetInstance():setCicatrizationTime(limbName, 1)
+            TestUtils.assert(DataController.GetInstance():getCicatrizationTime(limbName) == 1)
        end
-        ModDataHandler.GetInstance():apply()
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("Hand_L"))
+        DataController.GetInstance():apply()
+        TestUtils.assert(DataController.GetInstance():getIsCut("Hand_L"))
    end

    return Tests
@@ -69,19 +69,19 @@ TestFramework.registerTestModule("AmputationHandler", "Top Left", function()
    function Tests.CutLeftHand()
        local handler = AmputationHandler:new("Hand_L")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("Hand_L"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("Hand_L"))
    end

    function Tests.CutLeftForearm()
        local handler = AmputationHandler:new("ForeArm_L")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("ForeArm_L") and ModDataHandler.GetInstance():getIsCut("Hand_L"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("ForeArm_L") and DataController.GetInstance():getIsCut("Hand_L"))
    end

    function Tests.CutLeftUpperarm()
        local handler = AmputationHandler:new("UpperArm_L")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("UpperArm_L") and ModDataHandler.GetInstance():getIsCut("ForeArm_L") and ModDataHandler.GetInstance():getIsCut("Hand_L"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("UpperArm_L") and DataController.GetInstance():getIsCut("ForeArm_L") and DataController.GetInstance():getIsCut("Hand_L"))
    end

    return Tests
@@ -93,19 +93,19 @@ TestFramework.registerTestModule("AmputationHandler", "Top Right", function()
    function Tests.CutRightHand()
        local handler = AmputationHandler:new("Hand_R")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("Hand_R"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("Hand_R"))
    end

    function Tests.CutRightForearm()
        local handler = AmputationHandler:new("ForeArm_R")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("ForeArm_R") and ModDataHandler.GetInstance():getIsCut("Hand_R"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("ForeArm_R") and DataController.GetInstance():getIsCut("Hand_R"))
    end

    function Tests.CutRightUpperarm()
        local handler = AmputationHandler:new("UpperArm_R")
        handler:execute(true)
-        TestUtils.assert(ModDataHandler.GetInstance():getIsCut("UpperArm_R") and ModDataHandler.GetInstance():getIsCut("ForeArm_R") and ModDataHandler.GetInstance():getIsCut("Hand_R"))
+        TestUtils.assert(DataController.GetInstance():getIsCut("UpperArm_R") and DataController.GetInstance():getIsCut("ForeArm_R") and DataController.GetInstance():getIsCut("Hand_R"))
    end

    return Tests
--- a/media/lua/client/TOC/TimedActions/CleanWoundAction.lua
+++ b/media/lua/client/TOC/TimedActions/CleanWoundAction.lua
@@ -1,4 +1,4 @@
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local CommonMethods = require("TOC/CommonMethods")
 ----

@@ -70,8 +70,8 @@ function CleanWoundAction:perform()
    local limbName = CommonMethods.GetLimbNameFromBodyPart(self.bodyPart)

    -- TODO CHeck if correct in MP
-    local modDataHandler = ModDataHandler.GetInstance(self.otherPlayer:getUsername())
-    modDataHandler:setWoundDirtyness(limbName, 0)
+    local dcInst = DataController.GetInstance(self.otherPlayer:getUsername())
+    dcInst:setWoundDirtyness(limbName, 0)


    -- Clean visual
--- a/media/lua/client/TOC/UI/HealthPanel.lua
+++ b/media/lua/client/TOC/UI/HealthPanel.lua
@@ -1,8 +1,12 @@
 local StaticData = require("TOC/StaticData")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
-local CutLimbHandler = require("TOC/UI/CutLimbInteractions")
-local WoundCleaningHandler = require("TOC/UI/WoundCleaningInteraction")
+
+local CutLimbHandler = require("TOC/UI/Interactions/CutLimbHandler")
+local WoundCleaningHandler = require("TOC/UI/Interactions/WoundCleaningHandler")
+------------------------
+
+

 local isReady = false

@@ -105,7 +109,7 @@ end
            local limbName = highestAmputations[side]
            TOC_DEBUG.print("Drawing " .. tostring(limbName) .. " for " .. username)

-            local cicTime = ModDataHandler.GetInstance(username):getCicatrizationTime(limbName)
+            local cicTime = DataController.GetInstance(username):getCicatrizationTime(limbName)
            redColor = GetColorFromCicatrizationTime(cicTime, limbName)

            local sexPl
@@ -204,16 +208,16 @@ end
        local bodyPartTypeStr = BodyPartType.ToString(bodyPart:getType())
        local limbName = StaticData.LIMBS_IND_STR[bodyPartTypeStr]
        if limbName then
-            local modDataHandler = ModDataHandler.GetInstance(username)
-            if modDataHandler:getIsCut(limbName) and modDataHandler:getIsVisible(limbName) then
-                if modDataHandler:getIsCicatrized(limbName) then
-                    if modDataHandler:getIsCauterized(limbName) then
+            local dcInst = DataController.GetInstance(username)
+            if dcInst:getIsCut(limbName) and dcInst:getIsVisible(limbName) then
+                if dcInst:getIsCicatrized(limbName) then
+                    if dcInst:getIsCauterized(limbName) then
                        self:drawText("- " .. getText("IGUI_HealthPanel_Cauterized"), x, y,  0.58, 0.75, 0.28, 1, UIFont.Small)
                    else
                        self:drawText("- " .. getText("IGUI_HealthPanel_Cicatrized"), x, y,  0.28, 0.89, 0.28, 1, UIFont.Small)
                    end
                else
-                    local cicaTime = modDataHandler:getCicatrizationTime(limbName)
+                    local cicaTime = dcInst:getCicatrizationTime(limbName)

                    -- Show it in percentage
                    local maxCicaTime = StaticData.LIMBS_CICATRIZATION_TIME_IND_NUM[limbName]
@@ -221,7 +225,7 @@ end
                    self:drawText("- " .. getText("IGUI_HealthPanel_Cicatrization") .. string.format(" %.2f", percentage) .. "%", x, y, 0.89, 0.28, 0.28, 1, UIFont.Small)
                    y = y + fontHgt

-                    local scaledDirtyness = math.floor(modDataHandler:getWoundDirtyness(limbName) * 100)
+                    local scaledDirtyness = math.floor(dcInst:getWoundDirtyness(limbName) * 100)
                    self:drawText("- " .. getText("IGUI_HealthPanel_WoundDirtyness") .. string.format(" %d", scaledDirtyness) .. "%", x, y, 0.89, 0.28, 0.28, 1, UIFont.Small)
                end
                y = y + fontHgt
@@ -247,7 +251,7 @@ end
            end

            local patientUsername = self:getPatient():getUsername()
-            local mdh = ModDataHandler.GetInstance(patientUsername)
+            local mdh = DataController.GetInstance(patientUsername)
            for i=1,bodyParts:size() do
                local bodyPart = bodyParts:get(i-1)
                local bodyPartTypeStr = BodyPartType.ToString(bodyPart:getType())
--- a/media/lua/client/TOC/UI/Interactions/CutLimbHandler.lua
+++ b/media/lua/client/TOC/UI/Interactions/CutLimbHandler.lua
@@ -1,7 +1,8 @@
-local BaseHandler = require("TOC/UI/HealthPanelBaseHandler")
-local CutLimbAction = require("TOC/TimedActions/CutLimbAction")
+local BaseHandler = require("TOC/UI/Interactions/HealthPanelBaseHandler")
 local StaticData = require("TOC/StaticData")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
+
+local CutLimbAction = require("TOC/TimedActions/CutLimbAction")
 ---------------------

 -- TODO Add interaction to cut and bandage!
@@ -96,7 +97,7 @@ local function AddInvAmputationOptions(player, context, sawItem, stitchesItem, b

    for i = 1, #StaticData.LIMBS_STR do
        local limbName = StaticData.LIMBS_STR[i]
-        if not ModDataHandler.GetInstance():getIsCut(limbName) then
+        if not DataController.GetInstance():getIsCut(limbName) then
            local limbTranslatedName = getText("ContextMenu_Limb_" .. limbName)
            subMenu:addOption(limbTranslatedName, player, PerformAction, player, limbName, sawItem, stitchesItem, bandageItem)
        end
@@ -177,7 +178,7 @@ end
 function CutLimbHandler:addToMenu(context)
    TOC_DEBUG.print("CutLimbHandler addToMenu")
    local types = self:getAllItemTypes(self.items.ITEMS)
-    if #types > 0 and StaticData.BODYLOCS_IND_BPT[self.limbName] and not ModDataHandler.GetInstance():getIsCut(self.limbName) then
+    if #types > 0 and StaticData.BODYLOCS_IND_BPT[self.limbName] and not DataController.GetInstance():getIsCut(self.limbName) then
        TOC_DEBUG.print("addToMenu, types > 0")
        for i=1, #types do
            context:addOption(getText("ContextMenu_Amputate"), self, self.onMenuOptionSelected, types[i])
@@ -199,7 +200,7 @@ end
 function CutLimbHandler:isValid()
    TOC_DEBUG.print("CutLimbHandler isValid")
    self:checkItems()
-    return not ModDataHandler.GetInstance():getIsCut(self.limbName)
+    return not DataController.GetInstance():getIsCut(self.limbName)
 end

 function CutLimbHandler:perform(previousAction, itemType)
--- a/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua
+++ b/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua
--- a/media/lua/client/TOC/UI/Interactions/WoundCleaningHandler.lua
+++ b/media/lua/client/TOC/UI/Interactions/WoundCleaningHandler.lua
@@ -1,7 +1,7 @@

-local BaseHandler = require("TOC/UI/HealthPanelBaseHandler")
+local BaseHandler = require("TOC/UI/Interactions/HealthPanelBaseHandler")
 local CommonMethods = require("TOC/CommonMethods")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")

 local CleanWoundAction = require("TOC/TimedActions/CleanWoundAction")
 -------------------------
@@ -60,11 +60,11 @@ function WoundCleaningHandler:isValid()
    -- todo get username 
    if self.limbName == nil then return false end

-    local modDataHandler = ModDataHandler.GetInstance(self.username)
+    local dcInst = DataController.GetInstance(self.username)

-    --and modDataHandler:getWoundDirtyness(self.limbName) > 0.1
+    --and dcInst:getWoundDirtyness(self.limbName) > 0.1

-    return modDataHandler:getIsCut(self.limbName) and not modDataHandler:getIsCicatrized(self.limbName)
+    return dcInst:getIsCut(self.limbName) and not dcInst:getIsCicatrized(self.limbName)
    --return self:getItemOfType(self.items.ITEMS, itemType)
 end

--- a/media/lua/client/TOC/UI/ProsthesisBuilderUI.lua
+++ b/media/lua/client/TOC/UI/ProsthesisBuilderUI.lua
@@ -1 +0,0 @@
-- TODO Separate UI to craft prosthesis... No just use the crafting menu you mook
--- a/media/lua/client/TOC/UI/SurgeryInteractions.lua
+++ b/media/lua/client/TOC/UI/SurgeryInteractions.lua
@@ -1,5 +1,5 @@
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
-local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local DataController = require("TOC/Controllers/DataController")
 ---------------


@@ -17,14 +17,14 @@ Events.OnFillInventoryObjectContextMenu.Add(AddInventorySurgeryMenu)

 -- TODO We need a class to handle operations, this is just a placeholder
 local function Cauterize(limbName)
-    local modDataHandler = ModDataHandler.GetInstance()
-    modDataHandler:setCicatrizationTime(limbName, 0)
-    modDataHandler:setIsCicatrized(limbName, true)
-    modDataHandler:setIsCauterized(limbName, true)
+    local dcInst = DataController.GetInstance()
+    dcInst:setCicatrizationTime(limbName, 0)
+    dcInst:setIsCicatrized(limbName, true)
+    dcInst:setIsCauterized(limbName, true)

    -- we don't care bout the depended limbs, since they're alread "cicatrized"

-    modDataHandler:apply()
+    dcInst:apply()
 end

 ---@param playerNum number
@@ -36,8 +36,8 @@ local function AddOvenContextMenu(playerNum, context, worldObjects, test)

    local pl = getSpecificPlayer(playerNum)

-    local modDataHandler = ModDataHandler.GetInstance()
-    if not modDataHandler:getIsAnyLimbCut() then return end
+    local dcInst = DataController.GetInstance()
+    if not dcInst:getIsAnyLimbCut() then return end
    local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(pl:getUsername())

    local stoveObj = nil
@@ -63,7 +63,7 @@ local function AddOvenContextMenu(playerNum, context, worldObjects, test)

            -- We need to let the player cauterize ONLY the visible one!
            local limbName = k
-            if modDataHandler:getIsVisible(limbName) and not modDataHandler:getIsCicatrized(limbName) then
+            if dcInst:getIsVisible(limbName) and not dcInst:getIsCicatrized(limbName) then
                if addMainOption == false then
                    -- Adds the cauterize option ONLY when it's needed
                    local optionMain = context:addOption(getText("ContextMenu_Cauterize"), nil)
--- a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua
+++ b/media/lua/client/TOC/Zombies/ZombiesAmputation.lua
@@ -1,4 +1,4 @@
-local ItemsHandler = require("TOC/Handlers/ItemsHandler")
+local ItemsController = require("TOC/Handlers/ItemsController")

 --------------------

@@ -8,7 +8,7 @@ local ItemsHandler = require("TOC/Handlers/ItemsHandler")
 -------------------

 local function test(zombie, character, bodyPartType, handWeapon)
-    --ItemsHandler.Zombie.SpawnAmputationItem(zombie)
+    --ItemsController.Zombie.SpawnAmputationItem(zombie)
 end

 Events.OnHitZombie.Add(test)
--- a/media/lua/server/TOC/ServerDataHandler.lua
+++ b/media/lua/server/TOC/ServerDataHandler.lua
@@ -8,14 +8,14 @@ ServerDataHandler.modData = {}

 ---Get the server mod data table containing that player TOC data
 ---@param key string
---@return tocModData
+---@return tocModDataType
 function ServerDataHandler.GetTable(key)
    return ServerDataHandler.modData[key]
 end

 ---Add table to the ModData and a local table
 ---@param key string
---@param table tocModData
+---@param table tocModDataType
 function ServerDataHandler.AddTable(key, table)
    -- Check if key is valid
    if not luautils.stringStarts(key, StaticData.MOD_NAME .. "_") then return end
--- a/media/lua/shared/TOC/StaticData.lua
+++ b/media/lua/shared/TOC/StaticData.lua
@@ -2,7 +2,7 @@
 ---@alias limbsTable {Hand_L : partData, ForeArm_L : partData, UpperArm_L : partData, Hand_R : partData, ForeArm_R : partData, UpperArm_R : partData }
 ---@alias prosthesisData {isProstEquipped : boolean, prostFactor : number }
 ---@alias prosthesesTable {Top_L : prosthesisData, Top_R : prosthesisData }     -- TODO add Bottom_L and Bottom_R
---@alias tocModData { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean }
+---@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean }
 ---------------------------
				`@@ -1 +0,0 @@`
				`-- TODO Separate UI to craft prosthesis... No just use the crafting menu you mook`