Convert imports to use require(), and adjust modules accordingly.

Fix minion exports

Fix ModCache generation

Convert LoadModule calls which return multiple values to use require()

Convert LoadModule calls which use ..

Remove useless file extensions

Rest of the owl

Author: vaisest

spec/System/TestBuilds_spec.lua

@@ -8,7 +8,7 @@ local function fetchBuilds(path, buildList)
 			if attr.mode == "directory" then
 				fetchBuilds(f, buildList)
 			elseif file:match("^.+(%..+)$") == ".lua" then
-				buildList[file] = LoadModule(f)
+				buildList[file] = require(f)
 			end
 		end
 	end

spec/System/TestItemTools_spec.lua

@@ -48,7 +48,7 @@ describe("TestItemTools", function()
 
 	it("uses the displayed item slot for anoint comparison tooltips", function()
 		if not common.classes.ItemsTab then
-			LoadModule("Classes/ItemsTab")
+			require("Classes.ItemsTab")
 		end
 		local item = new("Item"):Item([[
 Rarity: Rare

src/Classes/CalcsTab.lua

@@ -27,7 +27,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
@@ -146,7 +146,7 @@ Effective DPS: Curses and enemy properties (such as resistances and status condi
 	end)
 
 	-- Add sections from the CalcSections module
-	local sectionData = LoadModule("Modules/CalcSections")
+	local sectionData = require("Modules.CalcSections")
 	for _, section in ipairs(sectionData) do
 		self:NewSection(unpack(section))
 	end

src/Classes/CompareBuySimilar.lua

@@ -6,7 +6,7 @@
 local t_insert = table.insert
 local m_floor = math.floor
 local dkjson = require "dkjson"
-local tradeHelpers = LoadModule("Classes/CompareTradeHelpers")
+local tradeHelpers = require("Classes.CompareTradeHelpers")
 
 local M = {}
 

src/Classes/CompareEntry.lua

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

src/Classes/CompareTab.lua

@@ -10,11 +10,11 @@ local m_max = math.max
 local m_floor = math.floor
 local s_format = string.format
 local dkjson = require "dkjson"
-local tradeHelpers = LoadModule("Classes/CompareTradeHelpers")
-local buySimilar = LoadModule("Classes/CompareBuySimilar")
-local calcsHelpers = LoadModule("Classes/CompareCalcsHelpers")
-local buildListHelpers = LoadModule("Modules/BuildListHelpers")
-local configVisibility = LoadModule("Modules/ConfigVisibility")
+local tradeHelpers = require("Classes.CompareTradeHelpers")
+local buySimilar = require("Classes.CompareBuySimilar")
+local calcsHelpers = require("Classes.CompareCalcsHelpers")
+local buildListHelpers = require("Modules.BuildListHelpers")
+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.calcSections = LoadModule("Modules/CalcSections")
-	self.calcs = LoadModule("Modules/Calcs")
+	self.configOptions = require("Modules.ConfigOptions")
+	self.calcSections = require("Modules.CalcSections")
+	self.calcs = require("Modules.Calcs")
 
 	-- Controls for the comparison screen
 	self:InitControls()

src/Classes/CompareTradeHelpers.lua

@@ -10,7 +10,7 @@ do
 	local queryModFile = io.open("Data/QueryMods.lua", "r")
 	if queryModFile then
 		queryModFile:close()
-		queryModsData = LoadModule("Data/QueryMods")
+		queryModsData = require("Data.QueryMods")
 	end
 end
 

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 ConfigTab: UndoHandler, ControlHost, Control
 local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Control")

src/Classes/EditControl.lua

@@ -7,7 +7,7 @@ local m_max = math.max
 local m_min = math.min
 local m_floor = math.floor
 local protected_replace = "*"
-local utf8 = require('lua-utf8')
+local utf8 = require("lua-utf8")
 
 local function lastLine(str)
 	local lastLineIndex = 1

src/Classes/PassiveTree.lua

@@ -56,8 +56,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")
 
@@ -200,7 +200,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
@@ -351,7 +351,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")
 	for type, data in pairs(legionSprites) do
 		local maxZoom = data[#data]
 		local sheet = spriteSheets[maxZoom.filename]