From 7de65f6145fa36d5b23c444b0920cf848b7f87ac Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 15 Sep 2026 07:30:01 +0300 Subject: [PATCH] Refactor workflow and configuration files; enhance Android build process with import options, update .gitignore for entity imports, correct entity file names, and add missing import files for localization and entities. --- .gitea/workflows/android.yml | 4 +++- .gitignore | 1 + autoload/global.gd | 2 +- data/locale.en.txt.import | 3 +++ data/locale.ru.txt.import | 3 +++ data/{owniverse_entitites.txt => owniverse_entities.txt} | 0 data/owniverse_entities.txt.import | 3 +++ data/owniverse_items.txt.import | 3 +++ data/templates.en.txt.import | 3 +++ project.godot | 4 ++++ 10 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 data/locale.en.txt.import create mode 100644 data/locale.ru.txt.import rename data/{owniverse_entitites.txt => owniverse_entities.txt} (100%) create mode 100644 data/owniverse_entities.txt.import create mode 100644 data/owniverse_items.txt.import create mode 100644 data/templates.en.txt.import diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml index de66290..0208e64 100644 --- a/.gitea/workflows/android.yml +++ b/.gitea/workflows/android.yml @@ -25,6 +25,7 @@ jobs: --headless \ --path . \ --editor \ + --import \ --quit \ --verbose @@ -37,6 +38,7 @@ jobs: --headless \ --path . \ --editor \ + --import \ --quit godot \ @@ -89,4 +91,4 @@ jobs: -X POST \ -H "Authorization: token ${GITEA_TOKEN}" \ -F "attachment=@build/app.apk" \ - "https://gt.owad.ru/api/v1/repos/K/owniverse/releases/${RELEASE_ID}/assets?name=owniverse-${GITHUB_REF_NAME}.apk" \ No newline at end of file + "https://gt.owad.ru/api/v1/repos/K/owniverse/releases/${RELEASE_ID}/assets?name=owniverse-${GITHUB_REF_NAME}.apk" diff --git a/.gitignore b/.gitignore index 39b509f..9925fca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .vscode/ /android/ *.import +!data/*.txt.import # MacOS specific ignores .DS_Store diff --git a/autoload/global.gd b/autoload/global.gd index c3b2052..fcb45f4 100644 --- a/autoload/global.gd +++ b/autoload/global.gd @@ -51,7 +51,7 @@ func format_number(value: float, digits: int = 0) -> String: func _ready() -> void: - OwniverseEntities = _read_from_csv("res://data/owniverse_entitites.txt") + OwniverseEntities = _read_from_csv("res://data/owniverse_entities.txt") OwniverseItems = _read_from_csv("res://data/owniverse_items.txt") Locales["en"] = _read_from_csv("res://data/locale.en.txt") diff --git a/data/locale.en.txt.import b/data/locale.en.txt.import new file mode 100644 index 0000000..8dd0c09 --- /dev/null +++ b/data/locale.en.txt.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/data/locale.ru.txt.import b/data/locale.ru.txt.import new file mode 100644 index 0000000..8dd0c09 --- /dev/null +++ b/data/locale.ru.txt.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/data/owniverse_entitites.txt b/data/owniverse_entities.txt similarity index 100% rename from data/owniverse_entitites.txt rename to data/owniverse_entities.txt diff --git a/data/owniverse_entities.txt.import b/data/owniverse_entities.txt.import new file mode 100644 index 0000000..8dd0c09 --- /dev/null +++ b/data/owniverse_entities.txt.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/data/owniverse_items.txt.import b/data/owniverse_items.txt.import new file mode 100644 index 0000000..8dd0c09 --- /dev/null +++ b/data/owniverse_items.txt.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/data/templates.en.txt.import b/data/templates.en.txt.import new file mode 100644 index 0000000..8dd0c09 --- /dev/null +++ b/data/templates.en.txt.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/project.godot b/project.godot index ea7e4c5..d5d3f2f 100644 --- a/project.godot +++ b/project.godot @@ -8,6 +8,10 @@ config_version=5 +[accessibility] + +general/updates_per_second=5 + [application] config/name="Owniverse"