Compare commits

...

2 commits

Author SHA1 Message Date
9f4c9edd43 some optimization on addons 2025-08-01 01:41:54 +02:00
186cb926e8 working on mod loader
should i enable the modload inside the engine itself ?
2025-08-01 01:40:57 +02:00
10 changed files with 125 additions and 38 deletions

View file

@ -23,7 +23,7 @@ static func _blank_for_func_class(code: String) -> String:
var comment_line_regex = RegEx.create_from_string(r"^\s*#")
var empty_line_regex = RegEx.create_from_string(r"^\s+$")
var lines := code.split('\n')
var modified_lines: Array[String] = []
var modified_lines: PackedStringArray = []
for line: String in lines:
# Spaces between functions & classes

View file

@ -8,10 +8,12 @@ const TodoItem := preload("res://addons/Todo_Manager/todoItem_class.gd")
var _dockUI: Dock
class TodoCacheValue:
var todos: Array
var last_modified_time: int
func _init(todos: Array, last_modified_time: int):
self.todos = todos
self.last_modified_time = last_modified_time
@ -19,7 +21,7 @@ class TodoCacheValue:
var todo_cache: Dictionary # { key: script_path, value: TodoCacheValue }
var remove_queue: Array
var combined_pattern: String
var cased_patterns : Array[String]
var cased_patterns: PackedStringArray
var refresh_lock := false # makes sure _on_filesystem_changed only triggers once
@ -51,7 +53,7 @@ func queue_remove(file: String):
_dockUI.todo_items.remove_at(i)
func find_tokens_from_path(scripts: Array[String]) -> void:
func find_tokens_from_path(scripts: PackedStringArray) -> void:
for script_path in scripts:
var file := FileAccess.open(script_path, FileAccess.READ)
var contents := file.get_as_text()
@ -178,8 +180,8 @@ func _on_filesystem_changed() -> void:
rescan_files(false)
func find_scripts() -> Array[String]:
var scripts : Array[String]
func find_scripts() -> PackedStringArray:
var scripts: PackedStringArray
var directory_queue: Array[String]
var dir := DirAccess.open("res://")
if dir.get_open_error() == OK:
@ -210,7 +212,8 @@ func get_cached_todos(script_path: String) -> Array:
return cached_value.todos
return []
func get_dir_contents(dir: DirAccess, scripts: Array[String], directory_queue: Array[String]) -> void:
func get_dir_contents(dir: DirAccess, scripts: PackedStringArray, directory_queue: PackedStringArray) -> void:
dir.include_navigational = false
dir.include_hidden = false
dir.list_dir_begin()

View file

@ -1,26 +1,44 @@
extends Object
class_name AssetLoader
#region declaration
# === CONST ===
const DEFAULT_ASSETS_PATH = "res://mods"
## If you want to change the mod extension. Keep in mind that it's still a json under the hood
const MOD_INFOS_EXTENSION = "modinfo"
## Path to the mods folder : [param res://mods] by default
## [br]
## (is not a const but should be treated as such, so the uppercase)
var ASSETS_PATH
# === VAR ===
var dir:DirAccess
var mod_folders:PackedStringArray
var critical_error := false
var mod_paths : PackedStringArray
var mod_manifests : Dictionary[String]
# === SIGNALS ===
signal loading_finished
#endregion
func _init() -> void:
print_verbose("------ MOD LOADING STARTED ------")
ASSETS_PATH = ProjectSettings.get_setting("game/mods/mod_path", DEFAULT_ASSETS_PATH)
var dir := DirAccess.open(ASSETS_PATH)
dir = DirAccess.open(ASSETS_PATH)
if not dir:
push_error("AssetLoader: Mods folder not found at '%s'" % ASSETS_PATH)
push_error("AssetLoader:",DirAccess.get_open_error())
_show_error_popup("Mods folder not found at '%s'" % ASSETS_PATH)
critical_error = true
return
var mod_folders := dir.get_directories()
mod_folders = dir.get_directories()
if mod_folders.is_empty():
push_error("AssetLoader: Mods folder '%s' is empty — no mods to load." % ASSETS_PATH)
_show_error_popup("Mods folder '%s' is empty — no mods to load." % ASSETS_PATH)
@ -35,4 +53,25 @@ func _show_error_popup(message: String) -> void:
func load_all():
pass
load_mods()
#load_mods_content()
func load_mods():
for mod in mod_folders:
var mod_name = mod
var mod_path = ASSETS_PATH + "/" + mod_name
var manifest_path = mod_path + "/" + mod_name + "." + MOD_INFOS_EXTENSION
if FileAccess.file_exists(manifest_path):
var manifest_file := FileAccess.open(manifest_path, FileAccess.READ)
var manifest: Dictionary = JSON.parse_string(manifest_file.get_as_text())
if typeof(manifest) == TYPE_DICTIONARY: # always true ?
mod_paths.append(mod_path)
if manifest["id"]:
mod_manifests[manifest["id"]] = manifest
print_verbose("Mod loaded: %s" % manifest["name"])
else:
mod_manifests[mod_name] = manifest
print_verbose("Mod loaded: %s" % manifest["name"])
print(dir.get_files())

View file

@ -4,13 +4,11 @@ extends Node
func _ready() -> void:
var loader := AssetLoader.new()
# If there was a critical error, quit immediately
# No point to load the game if no asset are loaded
if loader.critical_error:
Engine.get_main_loop().quit(1)
return
loader.load_all() # TODO: Making it async
# Otherwise, continue startup
_start_game()

View file

@ -16,7 +16,7 @@ func _process(_delta):
#update_cursor(shape)
func update_cursor(image: Resource, shape: Input.CursorShape = 0, hotspot: Vector2 = Vector2(0, 0)):
func update_cursor(image: Resource, _shape:= 0 as Input.CursorShape, hotspot: Vector2 = Vector2(0, 0)):
# Get the custom cursor data from the main script
if image != null:
texture_rect.texture = image

View file

@ -0,0 +1,23 @@
# meta-name: Clean Code Template
# meta-description: Use this format to structure your code into clear sections
# meta-default: true
# meta-space-indent: 4
extends _BASE_
#region declaration
# === CONST === # Constants and immutables, in UPPERCASE
# === STATIC === # Static variables/functions
#endregion
# === Init === # Initialization logic, if needed
func _init() -> void:
pass
# === PUBLIC FUNCTIONS ===
# === PRIVATE FUNCTIONS === # use _underscore() to make the difference between private and public functions
# ====================

View file

@ -0,0 +1 @@
uid://d524ti2uyikh

View file

@ -0,0 +1,9 @@
{
"id": "base_content",
"name": "Core Game Elements",
"version": 1.0,
"desc": "Factions, unités, bâtiments et cartes de base.",
"author": "TonStudio",
"dependencies": [],
"tags": ["units","vehicles","buildings","textures","maps","quests"]
}

View file

@ -0,0 +1,9 @@
{
"id": "base_content",
"name": "Core Game Elements",
"version": 1.0,
"desc": "Factions, unités, bâtiments et cartes de base.",
"author": "TonStudio",
"dependencies": [],
"tags": ["units","vehicles","buildings","textures","maps","quests"]
}

View file

@ -38,6 +38,11 @@ window/size/window_height_override=720
mouse_cursor/custom_image="uid://dp4ed16rb1754"
mouse_cursor/custom_image_hotspot=Vector2(14, 2)
[editor]
script/search_in_file_extensions=PackedStringArray("gd", "gdshader", "json", "modinfo")
script/templates_search_path="res://editor/script_templates"
[editor_plugins]
enabled=PackedStringArray("res://addons/SimpleFormatOnSave/plugin.cfg", "res://addons/Todo_Manager/plugin.cfg")