From abf4e82737b9a319da455fd543d6260d861f4846 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 31 Jul 2021 15:13:55 +0200 Subject: [PATCH] Move Factorio data from /data/factorio to /worlds/factorio/data, to contain it in its world folder --- FactorioClient.py | 2 +- Utils.py | 1 + worlds/factorio/Mod.py | 4 ++-- worlds/factorio/Technologies.py | 2 +- .../factorio => worlds/factorio/data}/machines.json | 0 .../factorio/data}/mod/LICENSE.md | 0 .../factorio/data}/mod/graphics/icons/ap.png | Bin .../data}/mod/graphics/icons/ap_unimportant.png | Bin .../factorio => worlds/factorio/data}/mod/info.json | 0 {data/factorio => worlds/factorio/data}/mod/lib.lua | 0 .../factorio/data}/mod/thumbnail.png | Bin .../factorio/data}/mod_template/control.lua | 0 .../data}/mod_template/data-final-fixes.lua | 0 .../factorio/data}/mod_template/data.lua | 0 .../data}/mod_template/locale/en/locale.cfg | 0 .../factorio/data}/mod_template/macros.lua | 0 .../factorio => worlds/factorio/data}/recipes.json | 0 {data/factorio => worlds/factorio/data}/techs.json | 0 18 files changed, 5 insertions(+), 4 deletions(-) rename {data/factorio => worlds/factorio/data}/machines.json (100%) rename {data/factorio => worlds/factorio/data}/mod/LICENSE.md (100%) rename {data/factorio => worlds/factorio/data}/mod/graphics/icons/ap.png (100%) rename {data/factorio => worlds/factorio/data}/mod/graphics/icons/ap_unimportant.png (100%) rename {data/factorio => worlds/factorio/data}/mod/info.json (100%) rename {data/factorio => worlds/factorio/data}/mod/lib.lua (100%) rename {data/factorio => worlds/factorio/data}/mod/thumbnail.png (100%) rename {data/factorio => worlds/factorio/data}/mod_template/control.lua (100%) rename {data/factorio => worlds/factorio/data}/mod_template/data-final-fixes.lua (100%) rename {data/factorio => worlds/factorio/data}/mod_template/data.lua (100%) rename {data/factorio => worlds/factorio/data}/mod_template/locale/en/locale.cfg (100%) rename {data/factorio => worlds/factorio/data}/mod_template/macros.lua (100%) rename {data/factorio => worlds/factorio/data}/recipes.json (100%) rename {data/factorio => worlds/factorio/data}/techs.json (100%) diff --git a/FactorioClient.py b/FactorioClient.py index 9e3595d2..a13f83bf 100644 --- a/FactorioClient.py +++ b/FactorioClient.py @@ -325,7 +325,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser(description="Optional arguments to FactorioClient follow. " "Remaining arguments get passed into bound Factorio instance." - "Refer to factorio --help for those.") + "Refer to Factorio --help for those.") parser.add_argument('--rcon-port', default='24242', type=int, help='Port to use to communicate with Factorio') parser.add_argument('--rcon-password', help='Password to authenticate with RCON.') parser.add_argument('--connect', default=None, help='Address of the multiworld host.') diff --git a/Utils.py b/Utils.py index ddcfabfe..09a525d8 100644 --- a/Utils.py +++ b/Utils.py @@ -354,6 +354,7 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]: return romfile, adjusted return romfile, False + @cache_argsless def get_unique_identifier(): uuid = persistent_load().get("client", {}).get("uuid", None) diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py index 388138c3..8d39b353 100644 --- a/worlds/factorio/Mod.py +++ b/worlds/factorio/Mod.py @@ -49,7 +49,7 @@ def generate_mod(world, output_directory: str): global data_final_template, locale_template, control_template, data_template with template_load_lock: if not data_final_template: - mod_template_folder = Utils.local_path("data", "factorio", "mod_template") + mod_template_folder = os.path.join(os.path.dirname(__file__), "data", "mod_template") template_env: Optional[jinja2.Environment] = \ jinja2.Environment(loader=jinja2.FileSystemLoader([mod_template_folder])) data_template = template_env.get_template("data.lua") @@ -95,7 +95,7 @@ def generate_mod(world, output_directory: str): mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__) en_locale_dir = os.path.join(mod_dir, "locale", "en") os.makedirs(en_locale_dir, exist_ok=True) - shutil.copytree(Utils.local_path("data", "factorio", "mod"), mod_dir, dirs_exist_ok=True) + shutil.copytree(os.path.join(os.path.dirname(__file__), "data", "mod"), mod_dir, dirs_exist_ok=True) with open(os.path.join(mod_dir, "data.lua"), "wt") as f: f.write(data_template_code) with open(os.path.join(mod_dir, "data-final-fixes.lua"), "wt") as f: diff --git a/worlds/factorio/Technologies.py b/worlds/factorio/Technologies.py index 0ab5b92e..f34f9a37 100644 --- a/worlds/factorio/Technologies.py +++ b/worlds/factorio/Technologies.py @@ -13,7 +13,7 @@ import functools from . import Options factorio_id = 2 ** 17 -source_folder = Utils.local_path("data", "factorio") +source_folder = os.path.join(os.path.dirname(__file__), "data") with open(os.path.join(source_folder, "techs.json")) as f: raw = json.load(f) diff --git a/data/factorio/machines.json b/worlds/factorio/data/machines.json similarity index 100% rename from data/factorio/machines.json rename to worlds/factorio/data/machines.json diff --git a/data/factorio/mod/LICENSE.md b/worlds/factorio/data/mod/LICENSE.md similarity index 100% rename from data/factorio/mod/LICENSE.md rename to worlds/factorio/data/mod/LICENSE.md diff --git a/data/factorio/mod/graphics/icons/ap.png b/worlds/factorio/data/mod/graphics/icons/ap.png similarity index 100% rename from data/factorio/mod/graphics/icons/ap.png rename to worlds/factorio/data/mod/graphics/icons/ap.png diff --git a/data/factorio/mod/graphics/icons/ap_unimportant.png b/worlds/factorio/data/mod/graphics/icons/ap_unimportant.png similarity index 100% rename from data/factorio/mod/graphics/icons/ap_unimportant.png rename to worlds/factorio/data/mod/graphics/icons/ap_unimportant.png diff --git a/data/factorio/mod/info.json b/worlds/factorio/data/mod/info.json similarity index 100% rename from data/factorio/mod/info.json rename to worlds/factorio/data/mod/info.json diff --git a/data/factorio/mod/lib.lua b/worlds/factorio/data/mod/lib.lua similarity index 100% rename from data/factorio/mod/lib.lua rename to worlds/factorio/data/mod/lib.lua diff --git a/data/factorio/mod/thumbnail.png b/worlds/factorio/data/mod/thumbnail.png similarity index 100% rename from data/factorio/mod/thumbnail.png rename to worlds/factorio/data/mod/thumbnail.png diff --git a/data/factorio/mod_template/control.lua b/worlds/factorio/data/mod_template/control.lua similarity index 100% rename from data/factorio/mod_template/control.lua rename to worlds/factorio/data/mod_template/control.lua diff --git a/data/factorio/mod_template/data-final-fixes.lua b/worlds/factorio/data/mod_template/data-final-fixes.lua similarity index 100% rename from data/factorio/mod_template/data-final-fixes.lua rename to worlds/factorio/data/mod_template/data-final-fixes.lua diff --git a/data/factorio/mod_template/data.lua b/worlds/factorio/data/mod_template/data.lua similarity index 100% rename from data/factorio/mod_template/data.lua rename to worlds/factorio/data/mod_template/data.lua diff --git a/data/factorio/mod_template/locale/en/locale.cfg b/worlds/factorio/data/mod_template/locale/en/locale.cfg similarity index 100% rename from data/factorio/mod_template/locale/en/locale.cfg rename to worlds/factorio/data/mod_template/locale/en/locale.cfg diff --git a/data/factorio/mod_template/macros.lua b/worlds/factorio/data/mod_template/macros.lua similarity index 100% rename from data/factorio/mod_template/macros.lua rename to worlds/factorio/data/mod_template/macros.lua diff --git a/data/factorio/recipes.json b/worlds/factorio/data/recipes.json similarity index 100% rename from data/factorio/recipes.json rename to worlds/factorio/data/recipes.json diff --git a/data/factorio/techs.json b/worlds/factorio/data/techs.json similarity index 100% rename from data/factorio/techs.json rename to worlds/factorio/data/techs.json