Use require for loading more modules (#10267)

Author: vaisest

src/Classes/BuildListControl.lua

@@ -5,7 +5,7 @@
 --
 local ipairs = ipairs
 local s_format = string.format
-local buildListHelpers = LoadModule("Modules/BuildListHelpers")
+local buildListHelpers = require("Modules.BuildListHelpers")
 
 ---@class BuildListControl: ListControl
 local BuildListClass = newClass("BuildListControl", "ListControl")

src/Classes/CalcsTab.lua

@@ -29,7 +29,7 @@ function CalcsTabClass:CalcsTab(build)
 
 	self.build = build
 
-	self.calcs = LoadModule("Modules/Calcs")
+	self.calcs = require("Modules.Calcs")
 
 	self.input = { }
 	self.input.skill_number = 1

src/Classes/CompareBuySimilar.lua

@@ -6,15 +6,19 @@
 local t_insert = table.insert
 local m_floor = math.floor
 local dkjson = require "dkjson"
-local tradeHelpers = LoadModule("Classes/TradeHelpers")
-local tradeStats = tradeHelpers.getTradeStats()
-
--- used to check what stats actually exist on the trade site.
-local existingStats = {}
-for _, cat in ipairs(tradeStats or {}) do
-	for _, entry in ipairs(cat.entries) do
-		existingStats[entry.id] = true
+local tradeHelpers = require("Classes.TradeHelpers")
+
+-- used to check what stats actually exist on the trade site
+local _existingStats
+local function getStats()
+	if _existingStats then return _existingStats end
+	_existingStats = {}
+	for _, cat in ipairs(tradeHelpers.getTradeStats() or {}) do
+		for _, entry in ipairs(cat.entries) do
+			_existingStats[entry.id] = true
+		end
 	end
+	return _existingStats
 end
 
 local M = {}
@@ -257,6 +261,7 @@ function M.addModEntries(item, modTypeSources)
 							-- convert hashes to string ids
 							local resultIds = {}
 							if resultHashes then
+								local existingStats = getStats()
 								for idx = 1, #resultHashes do
 									local id = string.format("%s.stat_%s", source.type, resultHashes[idx])
 									if existingStats[id] then

src/Classes/CompareEntry.lua

@@ -48,7 +48,7 @@ function CompareEntryClass:CompareEntry(xmlText, label)
 	self.outputRevision = 1
 
 	-- Display stats (same as primary build uses)
-	local displayStatsModule = LoadModule("Modules/BuildDisplayStats")
+	local displayStatsModule = require("Modules.BuildDisplayStats")
 	self.displayStats = displayStatsModule.displayStats
 	self.minionDisplayStats = displayStatsModule.minionDisplayStats
 	self.extraSaveStats = displayStatsModule.extraSaveStats

src/Classes/CompareTab.lua

@@ -9,12 +9,12 @@ local m_min = math.min
 local m_max = math.max
 local m_floor = math.floor
 local s_format = string.format
-local tradeHelpers = LoadModule("Classes/TradeHelpers")
-local buySimilar = LoadModule("Classes/CompareBuySimilar")
-local calcsHelpers = LoadModule("Classes/CompareCalcsHelpers")
-local buildListHelpers = LoadModule("Modules/BuildListHelpers")
-local itemSlotHelper = LoadModule("Modules/ItemSlotHelper")
-local configVisibility = LoadModule("Modules/ConfigVisibility")
+local tradeHelpers = require("Classes.TradeHelpers")
+local buySimilar = require("Classes.CompareBuySimilar")
+local calcsHelpers = require("Classes.CompareCalcsHelpers")
+local buildListHelpers = require("Modules.BuildListHelpers")
+local itemSlotHelper = require("Modules.ItemSlotHelper")
+local configVisibility = require("Modules.ConfigVisibility")
 
 -- Node IDs below this value are normal passive tree nodes; IDs at or above are cluster jewel nodes
 local CLUSTER_NODE_OFFSET = 65536
@@ -188,9 +188,9 @@ function CompareTabClass:CompareTab(primaryBuild)
 	self.comparePowerCompareId = nil      -- track which compare entry was calculated
 
 	-- Pre-load static module data
-	self.configOptions = LoadModule("Modules/ConfigOptions")
+	self.configOptions = require("Modules.ConfigOptions")
 	self.calcSections = LoadModule("Modules/CalcSections")
-	self.calcs = LoadModule("Modules/Calcs")
+	self.calcs = require("Modules.Calcs")
 
 	-- Controls for the comparison screen
 	self:InitControls()

src/Classes/ConfigTab.lua

@@ -9,8 +9,8 @@ local m_max = math.max
 local m_floor = math.floor
 local s_upper = string.upper
 
-local varList = LoadModule("Modules/ConfigOptions")
-local configVisibility = LoadModule("Modules/ConfigVisibility")
+local varList = require("Modules.ConfigOptions")
+local configVisibility = require("Modules.ConfigVisibility")
 
 ---@class CustomModBlock: ControlHost, Control
 local CustomModBlockClass = newClass("CustomModBlockControl", "ControlHost", "Control")

src/Classes/GemSelectControl.lua

@@ -11,7 +11,7 @@ local m_min = math.min
 local m_max = math.max
 local m_floor = math.floor
 
-local gemTooltip = LoadModule("Classes/GemTooltip")
+local gemTooltip = require("Classes.GemTooltip")
 local toolTipText = "Prefix tag searches with a colon and exclude tags with a dash. e.g. :fire:lightning:-cold:area"
 local imbuedTooltipText = "\"Socketed in\" item must be set in order to add an imbued support.\nOnly one imbued support is allowed per item."
 

src/Classes/ItemSlotControl.lua

@@ -7,7 +7,7 @@ local pairs = pairs
 local t_insert = table.insert
 local m_min = math.min
 
-local itemSlotHelper = LoadModule("Modules/ItemSlotHelper")
+local itemSlotHelper = require("Modules.ItemSlotHelper")
 ---@class ItemSlotControl
 local ItemSlotClass = newClass("ItemSlotControl", "DropDownControl")
 

src/Classes/ItemsTab.lua

@@ -14,9 +14,9 @@ local m_min = math.min
 local m_ceil = math.ceil
 local m_floor = math.floor
 local m_modf = math.modf
-local buySimilar = LoadModule("Classes/CompareBuySimilar")
+local buySimilar = require("Classes.CompareBuySimilar")
 
-local gemTooltip = LoadModule("Classes/GemTooltip")
+local gemTooltip = require("Classes.GemTooltip")
 local rarityDropList = {
 	{ label = colorCodes.NORMAL.."Normal", rarity = "NORMAL" },
 	{ label = colorCodes.MAGIC.."Magic", rarity = "MAGIC" },

src/Classes/PassiveTree.lua

@@ -75,8 +75,8 @@ function PassiveTreeClass:PassiveTree(treeVersion)
 	self.treeVersion = treeVersion
 	local versionNum = treeVersions[treeVersion].num
 
-	self.legion = LoadModule("Data/TimelessJewelData/LegionPassives")
-	self.tattoo = LoadModule("Data/TattooPassives")
+	self.legion = require("Data.TimelessJewelData.LegionPassives")
+	self.tattoo = require("Data.TattooPassives")
 
 	MakeDir("TreeData")
 
@@ -231,7 +231,7 @@ function PassiveTreeClass:PassiveTree(treeVersion)
 	end
 
 	if not self.assets then
-		self.assets = LoadModule("TreeData/3_19/Assets.lua")
+		self.assets = require("TreeData.3_19.Assets")
 		self.assets = self.assets.assets
 		if self.alternate_ascendancies then
 			-- backgrounds
@@ -386,7 +386,7 @@ function PassiveTreeClass:PassiveTree(treeVersion)
 	end
 
 	-- Load legion sprite sheets and build sprite map
-	local legionSprites = LoadModule("TreeData/legion/tree-legion.lua")
+	local legionSprites = require("TreeData.legion.tree-legion")
 	local function loadLegionSheet(data)
 		local sheet = spriteSheets[data.filename]
 		if not sheet then