make loading folder name independant

lord-ruby · lord-ruby · commit b4c62b2b1923 · 2025-06-17T19:53:26.000+01:00
diff --git a/big-num/notations.lua b/big-num/notations.lua
@@ -1,18 +1,18 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
 Notations = {
-    BaseLetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/baseletternotation.lua")(),
-    LetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/letternotation.lua")(),
-    CyrillicNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/cyrillicnotation.lua")(),
-    GreekNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/greeknotation.lua")(),
-    HebrewNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/hebrewnotation.lua")(),
-    ScientificNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/scientificnotation.lua")(),
-    EngineeringNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/engineeringnotation.lua")(),
-    BaseStandardNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/basestandardnotation.lua")(),
-    StandardNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/standardnotation.lua")(),
-    ThousandNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/thousandnotation.lua")(),
-    DynamicNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/dynamicnotation.lua")(),
-    Balatro = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/Balatro.lua")(),
+    BaseLetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/baseletternotation.lua")(),
+    LetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/letternotation.lua")(),
+    CyrillicNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/cyrillicnotation.lua")(),
+    GreekNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/greeknotation.lua")(),
+    HebrewNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/hebrewnotation.lua")(),
+    ScientificNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/scientificnotation.lua")(),
+    EngineeringNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/engineeringnotation.lua")(),
+    BaseStandardNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/basestandardnotation.lua")(),
+    StandardNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/standardnotation.lua")(),
+    ThousandNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/thousandnotation.lua")(),
+    DynamicNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/dynamicnotation.lua")(),
+    Balatro = nativefs.load(Talisman.mod_path.."/big-num/notations/Balatro.lua")(),
 }
 
 return Notations
diff --git a/big-num/notations/Balatro.lua b/big-num/notations/Balatro.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 BalaNotation = {}
 BalaNotation.__index = BalaNotation
 BalaNotation.__tostring = function ()
diff --git a/big-num/notations/baseletternotation.lua b/big-num/notations/baseletternotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 
 BaseLetterNotation = {}
 BaseLetterNotation.__index = BaseLetterNotation
diff --git a/big-num/notations/basestandardnotation.lua b/big-num/notations/basestandardnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 BaseStandardNotation = {}
 BaseStandardNotation.__index = BaseStandardNotation
 BaseStandardNotation.__tostring = function (notation)
diff --git a/big-num/notations/cyrillicnotation.lua b/big-num/notations/cyrillicnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-BaseLetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/baseletternotation.lua")()
+BaseLetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/baseletternotation.lua")()
 
 CyrillicNotation = {}
 CyrillicNotation.__index = LetterNotation
diff --git a/big-num/notations/dynamicnotation.lua b/big-num/notations/dynamicnotation.lua
@@ -1,7 +1,7 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
-ThousandNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/thousandnotation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
+ThousandNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/thousandnotation.lua")()
 
 DynamicNotation = {}
 DynamicNotation.__index = DynamicNotation
diff --git a/big-num/notations/engineeringnotation.lua b/big-num/notations/engineeringnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 
 EngineeringNotation = {}
 EngineeringNotation.__index = EngineeringNotation
diff --git a/big-num/notations/greeknotation.lua b/big-num/notations/greeknotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-BaseLetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/baseletternotation.lua")()
+BaseLetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/baseletternotation.lua")()
 
 GreekNotation = {}
 GreekNotation.__index = LetterNotation
diff --git a/big-num/notations/hebrewnotation.lua b/big-num/notations/hebrewnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-BaseLetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/baseletternotation.lua")()
+BaseLetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/baseletternotation.lua")()
 
 HebrewNotation = {}
 HebrewNotation.__index = LetterNotation
diff --git a/big-num/notations/letternotation.lua b/big-num/notations/letternotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-BaseLetterNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/baseletternotation.lua")()
+BaseLetterNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/baseletternotation.lua")()
 
 LetterNotation = {}
 LetterNotation.__index = LetterNotation
diff --git a/big-num/notations/scientificnotation.lua b/big-num/notations/scientificnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 ScientificNotation = {}
 ScientificNotation.__index = ScientificNotation
 ScientificNotation.__tostring = function ()
diff --git a/big-num/notations/standardnotation.lua b/big-num/notations/standardnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-BaseStandardNotation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/basestandardnotation.lua")()
+BaseStandardNotation = nativefs.load(Talisman.mod_path.."/big-num/notations/basestandardnotation.lua")()
 
 StandardNotation = {}
 StandardNotation.__index = StandardNotation
diff --git a/big-num/notations/thousandnotation.lua b/big-num/notations/thousandnotation.lua
@@ -1,6 +1,6 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
-Notation = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations/notation.lua")()
+Notation = nativefs.load(Talisman.mod_path.."/big-num/notations/notation.lua")()
 
 ThousandNotation = {}
 ThousandNotation.__index = ThousandNotation
diff --git a/talisman.lua b/talisman.lua
@@ -1,9 +1,15 @@
 local lovely = require("lovely")
 local nativefs = require("nativefs")
 
-if not nativefs.getInfo(lovely.mod_dir .. "/Talisman") then
+local info = nativefs.getDirectoryItemsInfo(lovely.mod_dir)
+local talisman_path = ""
+for i, v in pairs(info) do
+  if v.type == "directory" and nativefs.getInfo(lovely.mod_dir .. "/" .. v.name .. "/talisman.lua") then talisman_path = lovely.mod_dir .. "/" .. v.name end
+end
+
+if not nativefs.getInfo(talisman_path) then
     error(
-        'Could not find proper Talisman folder.\nPlease make sure the folder for Talisman is named exactly "Talisman" and not "Talisman-main" or anything else.')
+        'Could not find proper Talisman folder.\nPlease make sure that Talisman is installed correctly and the folders arent nested.')
 end
 
 -- "Borrowed" from Trance
@@ -21,8 +27,8 @@ end
 local talismanloc = init_localization
 function init_localization()
 	local abc = load_file_with_fallback2(
-		lovely.mod_dir .. "/Talisman/localization/" .. (G.SETTINGS.language or "en-us") .. ".lua",
-		lovely.mod_dir .. "/Talisman/localization/en-us.lua"
+		talisman_path .. "/localization/" .. (G.SETTINGS.language or "en-us") .. ".lua",
+		talisman_path .. "/localization/en-us.lua"
 	)
 	for k, v in pairs(abc) do
 		if k ~= "descriptions" then
@@ -34,9 +40,9 @@ function init_localization()
 	talismanloc()
 end
 
-Talisman = {config_file = {disable_anims = true, break_infinity = "omeganum", score_opt_id = 2}}
-if nativefs.read(lovely.mod_dir.."/Talisman/config.lua") then
-    Talisman.config_file = STR_UNPACK(nativefs.read(lovely.mod_dir.."/Talisman/config.lua"))
+Talisman = {config_file = {disable_anims = false, break_infinity = "omeganum", score_opt_id = 2}, mod_path = talisman_path}
+if nativefs.read(Talisman.mod_path.."/config.lua") then
+    Talisman.config_file = STR_UNPACK(nativefs.read(Talisman.mod_path.."/config.lua"))
 
     if Talisman.config_file.break_infinity and type(Talisman.config_file.break_infinity) ~= 'string' then
       Talisman.config_file.break_infinity = "omeganum"
@@ -113,9 +119,9 @@ G.FUNCS.talisman_upd_score_opt = function(e)
   nativefs.write(lovely.mod_dir .. "/Talisman/config.lua", STR_PACK(Talisman.config_file))
 end
 if Talisman.config_file.break_infinity then
-  Big, err = nativefs.load(lovely.mod_dir.."/Talisman/big-num/"..Talisman.config_file.break_infinity..".lua")
+  Big, err = nativefs.load(Talisman.mod_path.."/big-num/"..Talisman.config_file.break_infinity..".lua")
   if not err then Big = Big() else Big = nil end
-  Notations = nativefs.load(lovely.mod_dir.."/Talisman/big-num/notations.lua")()
+  Notations = nativefs.load(Talisman.mod_path.."/big-num/notations.lua")()
   -- We call this after init_game_object to leave room for mods that add more poker hands
   Talisman.igo = function(obj)
       for _, v in pairs(obj.hands) do
