gen(bar_codemod): rename-aliases, detach-bar-modules, spring-split

Author: keithharvey

common/configs/unit_restrictions_config.lua

@@ -40,7 +40,7 @@ local function shouldShowWaterUnits()
 		return false
 	end
 
-	local debugCommands = Spring.GetModOption("debugcommands")
+	local debugCommands = SpringShared.GetModOption("debugcommands")
 
 	-- terraform, done too late to read w/ get ground, and too hectic to even try and guess
 	if debugCommands and debugCommands:len() > 1 then
@@ -49,10 +49,10 @@ local function shouldShowWaterUnits()
 		end
 	end
 
-	local _, _, mapMinWater, _ = Spring.GetGroundExtremes()
+	local _, _, mapMinWater, _ = SpringShared.GetGroundExtremes()
 
 	-- water level shifted, done too late by another gadget for this file to read w/ get ground
-	local moddedWaterLevel = Spring.GetModOption("map_waterlevel") or 0
+	local moddedWaterLevel = SpringShared.GetModOption("map_waterlevel") or 0
 	mapMinWater = mapMinWater - moddedWaterLevel
 
 	return mapMinWater <= -11 -- units.minWaterUnitDepth
@@ -67,11 +67,11 @@ local function hasGeothermalFeatures()
 			geoFeatureDefs[defID] = true
 		end
 	end
-	local features = Spring.GetAllFeatures()
+	local features = SpringShared.GetAllFeatures()
 	for i = 1, #features do
 		local featureID = features[i]
-		if geoFeatureDefs[Spring.GetFeatureDefID(featureID)] then
-			local _, y, _ = Spring.GetFeaturePosition(featureID)
+		if geoFeatureDefs[SpringShared.GetFeatureDefID(featureID)] then
+			local _, y, _ = SpringShared.GetFeaturePosition(featureID)
 			if y < 0 then
 				hasSeaGeo = true
 			else

common/holidays.lua

@@ -1,14 +1,14 @@
-if not Spring.GetModOptions then
+if not SpringShared.GetModOptions then
 	return
 end
 
-if not Spring.GetModOptions().holiday_events then
+if not SpringShared.GetModOptions().holiday_events then
 	return
 end
 
-local currentDay = Spring.GetModOptions().date_day
-local currentMonth = Spring.GetModOptions().date_month
-local currentYear = Spring.GetModOptions().date_year
+local currentDay = SpringShared.GetModOptions().date_day
+local currentMonth = SpringShared.GetModOptions().date_month
+local currentYear = SpringShared.GetModOptions().date_year
 
 -- Meeus's Julian algorithm Function to calculate Easter Sunday for a given year. Magic.
 local function EasterDate(year)

common/lib_startpoint_guesser.lua

@@ -12,20 +12,20 @@ function IsSteep(x, z)
 	local mtta = math.acos(1.0 - 0.41221) - 0.02 --http://springrts.com/wiki/Movedefs.lua#How_slope_is_determined & the -0.02 is for safety
 	local a1, a2, a3, a4 = 0, 0, 0, 0
 	local d = 5
-	local y = Spring.GetGroundHeight(x, z)
-	local y1 = Spring.GetGroundHeight(x + d, z)
+	local y = SpringShared.GetGroundHeight(x, z)
+	local y1 = SpringShared.GetGroundHeight(x + d, z)
 	if math.abs(y1 - y) > 0.1 then
 		a1 = math.atan((y1 - y) / d)
 	end
-	local y2 = Spring.GetGroundHeight(x, z + d)
+	local y2 = SpringShared.GetGroundHeight(x, z + d)
 	if math.abs(y2 - y) > 0.1 then
 		a2 = math.atan((y2 - y) / d)
 	end
-	local y3 = Spring.GetGroundHeight(x - d, z)
+	local y3 = SpringShared.GetGroundHeight(x - d, z)
 	if math.abs(y3 - y) > 0.1 then
 		a3 = math.atan((y3 - y) / d)
 	end
-	local y4 = Spring.GetGroundHeight(x, z + d)
+	local y4 = SpringShared.GetGroundHeight(x, z + d)
 	if math.abs(y4 - y) > 0.1 then
 		a4 = math.atan((y4 - y) / d)
 	end
@@ -54,14 +54,14 @@ function GuessOne(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable)
 	for i = 1, #metalSpots do
 		local spot = metalSpots[i]
 		local mx, mz = spot.x, spot.z
-		local my = Spring.GetGroundHeight(mx, mz)
+		local my = SpringShared.GetGroundHeight(mx, mz)
 		local isWithinStartBox = (xmin < mx) and (mx < xmax) and (zmin < mz) and (mz < zmax)
 		local isWithinWalkRadius = (mx >= xmin - walkRadius) and (mx <= xmax + walkRadius) and (mz >= zmin - walkRadius) and (mz <= zmax + walkRadius)
 
 		local isFree = true
 		for _, startpoint in pairs(startPointTable) do -- we avoid enemy startpoints too, to prevent unnecessary explosions and to deal with the case of having no startboxes
 			local sx, sz = startpoint[1], startpoint[2]
-			local sy = Spring.GetGroundHeight(sx, sz)
+			local sy = SpringShared.GetGroundHeight(sx, sz)
 			local isWithinClaimRadius = ((sx - mx) * (sx - mx) + (sz - mz) * (sz - mz) <= claimRadius * claimRadius)
 			local isWithinClaimHeight = (math.abs(my - sy) <= claimHeight)
 			if isWithinClaimRadius and isWithinClaimHeight then
@@ -116,8 +116,8 @@ function GuessOne(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable)
 			local jx, jz = freeMetalSpots[j][1], freeMetalSpots[j][2]
 			if ix ~= jx or iz ~= jz then
 				local r = math.sqrt((ix - jx) ^ 2 + (iz - jz) ^ 2)
-				local iy = Spring.GetGroundHeight(ix, iz)
-				local jy = Spring.GetGroundHeight(jx, jz)
+				local iy = SpringShared.GetGroundHeight(ix, iz)
+				local jy = SpringShared.GetGroundHeight(jx, jz)
 				local isWithinClaimRadius = (r <= claimRadius)
 				local isWithinClaimHeight = (math.abs(iy - jy) <= claimHeight)
 				local score -- Magic formula. Assumes all metal spots are of equal production value, TODO...
@@ -134,8 +134,8 @@ function GuessOne(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable)
 			local jx, jz = walkableMetalSpots[j][1], walkableMetalSpots[j][2]
 			if ix ~= jx or iz ~= jz then
 				local r = math.sqrt((ix - jx) ^ 2 + (iz - jz) ^ 2)
-				local iy = Spring.GetGroundHeight(ix, iz)
-				local jy = Spring.GetGroundHeight(jx, jz)
+				local iy = SpringShared.GetGroundHeight(ix, iz)
+				local jy = SpringShared.GetGroundHeight(jx, jz)
 				local isWithinClaimRadius = (r <= claimRadius)
 				local isWithinClaimHeight = (math.abs(iy - jy) <= claimHeight)
 				local score -- Magic formula. Assumes all metal spots are of equal production value, TODO...
@@ -199,15 +199,15 @@ end
 
 function GuessTwo(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable) --TODO: make this more efficient, atm it akes 1-2 sec to run
 	-- search over metal map and find a point with a reasonable amount of non-claimed metal near to it
-	local mmapx, mmapz = Spring.GetMetalMapSize() -- metal map cords * 16 = world coords
+	local mmapx, mmapz = SpringShared.GetMetalMapSize() -- metal map cords * 16 = world coords
 	local xres = math.max(1, math.floor(mmapx / 16))
 	local zres = math.max(1, math.floor(mmapz / 16))
 
 	local points = {} --possible startpoints point[id] = {x,z,metal}, grid over metalmap of sidelength res
 	local x = xres
 	local z = zres
 	while true do --i hate lua
-		local y = Spring.GetGroundHeight(x * 16, z * 16)
+		local y = SpringShared.GetGroundHeight(x * 16, z * 16)
 		local isWithinStartBox = (xmin < 16 * x) and (16 * x < xmax) and (zmin < 16 * z) and (16 * z < zmax)
 		if isWithinStartBox then
 			points[#points + 1] = { x = x, y = y, z = z, m = 0 }
@@ -231,8 +231,8 @@ function GuessTwo(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable) --TOD
 			local isFree = true
 			for _, startpoint in pairs(startPointTable) do -- we avoid enemy startpoints too, to prevent unnecessary explosions and to deal with the case of having no startboxes
 				local sx, sz = startpoint[1], startpoint[2]
-				local sy = Spring.GetGroundHeight(sx, sz)
-				local y = Spring.GetGroundHeight(x * 16, z * 16)
+				local sy = SpringShared.GetGroundHeight(sx, sz)
+				local y = SpringShared.GetGroundHeight(x * 16, z * 16)
 				local isWithinClaimRadius = ((sx - x * 16) * (sx - x * 16) + (sz - z * 16) * (sz - z * 16) <= claimRadius2 * claimRadius2)
 				local isWithinClaimHeight = (math.abs(sy - y) <= claimHeight)
 				if isWithinClaimRadius and isWithinClaimHeight then
@@ -242,9 +242,9 @@ function GuessTwo(teamID, allyID, xmin, zmin, xmax, zmax, startPointTable) --TOD
 			end
 
 			-- if it is, add this metal into points
-			local m = Spring.GetMetalAmount(x, z)
+			local m = SpringShared.GetMetalAmount(x, z)
 			if isFree and m > 0.1 then
-				local y = Spring.GetGroundHeight(x * 16, z * 16)
+				local y = SpringShared.GetGroundHeight(x * 16, z * 16)
 				for _, p in ipairs(points) do
 					if m and (p.x - x) * (p.x - x) + (p.z - z) * (p.z - z) <= (claimRadius2 / 16) * (claimRadius2 / 16) and math.abs(p.y - y) <= claimHeight then
 						p.m = p.m + m

common/springFunctions.lua

@@ -26,12 +26,12 @@ local utilities = {
 	GetRaptorAllyTeamID = team.GetRaptorAllyTeamID,
 
 	IsDevMode = function()
-		local devMode = Spring.GetGameRulesParam("isDevMode")
+		local devMode = SpringShared.GetGameRulesParam("isDevMode")
 		return (devMode and devMode > 0) and true or false
 	end,
 
 	ShowDevUI = function()
-		local devUI = Spring.GetConfigInt("DevUI", 0)
+		local devUI = SpringUnsynced.GetConfigInt("DevUI", 0)
 		return (devUI > 0) and true or false
 	end,
 
@@ -40,9 +40,9 @@ local utilities = {
 	_devModeCache = nil,
 	_devModeCacheFrame = -1,
 	IsDevModeCached = function()
-		local frame = Spring.GetGameFrame()
+		local frame = SpringShared.GetGameFrame()
 		if frame ~= utilities._devModeCacheFrame then
-			local devMode = Spring.GetGameRulesParam("isDevMode")
+			local devMode = SpringShared.GetGameRulesParam("isDevMode")
 			utilities._devModeCache = (devMode and devMode > 0) and true or false
 			utilities._devModeCacheFrame = frame
 		end
@@ -59,7 +59,7 @@ local utilities = {
 		if cached then
 			return cached
 		end
-		local accountInfo = select(11, Spring.GetPlayerInfo(playerID))
+		local accountInfo = select(11, SpringShared.GetPlayerInfo(playerID))
 		local accountID = (accountInfo and accountInfo.accountid) and tonumber(accountInfo.accountid) or -1
 		if accountID ~= -1 then
 			accountIDCache[playerID] = accountID

common/springOverrides.lua

@@ -1,5 +1,5 @@
-if Spring.GetModOptions then
-	local modOptions = Spring.GetModOptions()
+if SpringShared.GetModOptions then
+	local modOptions = SpringShared.GetModOptions()
 	local modOptionsFile = VFS.Include("modoptions.lua")
 
 	for _, modOption in ipairs(modOptionsFile) do
@@ -31,19 +31,19 @@ if Spring.GetModOptions then
 		end,
 	})
 
-	Spring.GetModOptions = function()
+	SpringShared.GetModOptions = function()
 		return readOnlyModOptions
 	end
 
 	-- Returns a copy of the modOptions table. Slower, but allows iterating over
 	-- the returned table using pairs/ipairs.
-	Spring.GetModOptionsCopy = function()
+	GetModOptionsCopy = function()
 		return table.copy(modOptions)
 	end
 end
 
-if Spring.Echo then
-	local echo = Spring.Echo
+if SpringShared.Echo then
+	local echo = SpringShared.Echo
 	local printOptions = { pretty = true }
 
 	local function multiEcho(...)
@@ -71,5 +71,5 @@ if Spring.Echo then
 		end
 	end
 
-	Spring.Echo = multiEcho
+	SpringShared.Echo = multiEcho
 end

common/springUtilities/debug.lua

@@ -1,8 +1,8 @@
 local function paramsEcho(...)
 	local called_from = "Called from: " .. tostring(debug.getinfo(2).name) .. " args:"
-	Spring.Echo(called_from)
+	SpringShared.Echo(called_from)
 	local args = { ... }
-	Spring.Echo(table.toString(args))
+	SpringShared.Echo(table.toString(args))
 	return ...
 end
 
@@ -41,7 +41,7 @@ local function traceEcho(...)
 			arguments = arguments .. sep .. ((name and tostring(name)) or "name?") .. "=" .. tostring(value)
 		end
 	end
-	Spring.Echo(infostr .. functionstr .. " Args:(" .. arguments .. ")")
+	SpringShared.Echo(infostr .. functionstr .. " Args:(" .. arguments .. ")")
 end
 
 local function traceFullEcho(maxdepth, maxwidth, maxtableelements, ...)
@@ -52,7 +52,7 @@ local function traceFullEcho(maxdepth, maxwidth, maxtableelements, ...)
 	-- It will also try to print the source file+line of each function
 	if debug then
 	else
-		Spring.Echo("traceFullEcho needs debug to work, this seems to be missing or overwritten", debug)
+		SpringShared.Echo("traceFullEcho needs debug to work, this seems to be missing or overwritten", debug)
 		return
 	end
 	local tracedebug = false -- to debug itself
@@ -68,11 +68,11 @@ local function traceFullEcho(maxdepth, maxwidth, maxtableelements, ...)
 			count = count + 1
 			if count < maxtableelements then
 				if tracedebug then
-					Spring.Echo(count, k)
+					SpringShared.Echo(count, k)
 				end
 				if type(k) == "number" and type(v) == "function" then -- try to get function lists?
 					if tracedebug then
-						Spring.Echo(k, v, debug.getinfo(v), debug.getinfo(v).name)
+						SpringShared.Echo(k, v, debug.getinfo(v), debug.getinfo(v).name)
 					end --debug.getinfo(v).short_src)?
 					res = res .. tostring(k) .. ":" .. ((debug.getinfo(v) and debug.getinfo(v).name) or "<function>") .. ", "
 				else
@@ -115,7 +115,7 @@ local function traceFullEcho(maxdepth, maxwidth, maxtableelements, ...)
 							break
 						end
 						if tracedebug then
-							Spring.Echo(i, j, funcName, name)
+							SpringShared.Echo(i, j, funcName, name)
 						end
 						local sep = ((arguments == "") and "") or "; "
 						if tostring(name) == "self" then
@@ -139,7 +139,7 @@ local function traceFullEcho(maxdepth, maxwidth, maxtableelements, ...)
 			break
 		end
 	end
-	Spring.Echo(infostr .. functionstr)
+	SpringShared.Echo(infostr .. functionstr)
 end
 
 return {

common/springUtilities/image_tga.lua

@@ -34,7 +34,7 @@ local function loadTGA(fileName) -- returns texture | nil, error on failure
 
 	local data = string.sub(file, 19, texture.width * texture.height * texture.channels + 18)
 	if string.len(data) ~= texture.width * texture.height * texture.channels then --WHY +1?????
-		Spring.Echo("Failed to load", fileName, string.len(data), texture.width, texture.height, texture.channels)
+		SpringShared.Echo("Failed to load", fileName, string.len(data), texture.width, texture.height, texture.channels)
 		return nil, "Error loading file, size mismatch"
 	end
 
@@ -62,7 +62,7 @@ local function loadTGA(fileName) -- returns texture | nil, error on failure
 end
 
 local function saveTGA(texture, fileName) --return nil | error on failure
-	Spring.Echo("Saving", fileName)
+	SpringShared.Echo("Saving", fileName)
 
 	local file = io.open(fileName, "wb")
 	if file == nil then
@@ -85,7 +85,7 @@ local function saveTGA(texture, fileName) --return nil | error on failure
 		end
 	end
 	file:close()
-	Spring.Echo("Saved", fileName)
+	SpringShared.Echo("Saved", fileName)
 	return nil
 end
 

common/springUtilities/synced.lua

@@ -1,7 +1,7 @@
 -- need this because SYNCED.tables are merely proxies, not real tables
 local function makeRealTable(proxy, debugTag)
 	if proxy == nil then
-		Spring.Log("Table Utilities", LOG.ERROR, "Proxy table is nil: " .. (debugTag or "unknown table"))
+		SpringShared.Log("Table Utilities", LOG.ERROR, "Proxy table is nil: " .. (debugTag or "unknown table"))
 		return
 	end
 	local proxyLocal = proxy

common/springUtilities/tableFunctions.lua

@@ -3,7 +3,7 @@ local function customKeyToUsefulTable(dataRaw)
 		return
 	end
 	if not type(dataRaw) == "string" then
-		Spring.Echo("Customkey data error! type == " .. type(dataRaw))
+		SpringShared.Echo("Customkey data error! type == " .. type(dataRaw))
 	else
 		dataRaw = string.gsub(dataRaw, "_", "=")
 		dataRaw = string.base64Decode(dataRaw)
@@ -18,7 +18,7 @@ local function customKeyToUsefulTable(dataRaw)
 			end
 		end
 		if err then
-			Spring.Echo("Customkey error", err)
+			SpringShared.Echo("Customkey error", err)
 		end
 	end
 	if collectgarbage then