From 3329cbfaae741c1056351c7d12ce33822ad6a56a Mon Sep 17 00:00:00 2001 From: Chris Bloomfield <43499897+ithinkandicode@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:06:53 +0000 Subject: [PATCH 1/4] API: Options - Rename `options_current.tres` to `options.tres` --- addons/mod_loader/{options => }/classes/options_current.gd | 0 addons/mod_loader/mod_loader.gd | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/mod_loader/{options => }/classes/options_current.gd (100%) diff --git a/addons/mod_loader/options/classes/options_current.gd b/addons/mod_loader/classes/options_current.gd similarity index 100% rename from addons/mod_loader/options/classes/options_current.gd rename to addons/mod_loader/classes/options_current.gd diff --git a/addons/mod_loader/mod_loader.gd b/addons/mod_loader/mod_loader.gd index bb0874e0..13be7d1f 100644 --- a/addons/mod_loader/mod_loader.gd +++ b/addons/mod_loader/mod_loader.gd @@ -95,7 +95,7 @@ var logged_messages := [] # Path to the options resource # See: res://addons/mod_loader/options/options_current_data.gd -var ml_options_path := "res://addons/mod_loader/options/options_current.tres" +var ml_options_path := "res://addons/mod_loader/options/options.tres" # These variables handle various options, which can be changed via Godot's GUI # by adding a ModLoaderOptions resource to the resource file specified by From 2c61f29929427789f78011a58dc30635360ef66c Mon Sep 17 00:00:00 2001 From: Chris Bloomfield <43499897+ithinkandicode@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:07:38 +0000 Subject: [PATCH 2/4] Revert "API: Options - Rename `options_current.tres` to `options.tres`" This reverts commit 3329cbfaae741c1056351c7d12ce33822ad6a56a. --- addons/mod_loader/mod_loader.gd | 2 +- addons/mod_loader/{ => options}/classes/options_current.gd | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/mod_loader/{ => options}/classes/options_current.gd (100%) diff --git a/addons/mod_loader/mod_loader.gd b/addons/mod_loader/mod_loader.gd index 13be7d1f..bb0874e0 100644 --- a/addons/mod_loader/mod_loader.gd +++ b/addons/mod_loader/mod_loader.gd @@ -95,7 +95,7 @@ var logged_messages := [] # Path to the options resource # See: res://addons/mod_loader/options/options_current_data.gd -var ml_options_path := "res://addons/mod_loader/options/options.tres" +var ml_options_path := "res://addons/mod_loader/options/options_current.tres" # These variables handle various options, which can be changed via Godot's GUI # by adding a ModLoaderOptions resource to the resource file specified by diff --git a/addons/mod_loader/classes/options_current.gd b/addons/mod_loader/options/classes/options_current.gd similarity index 100% rename from addons/mod_loader/classes/options_current.gd rename to addons/mod_loader/options/classes/options_current.gd From 3fcce02433d6904434c8436abd604e1d4d8ab5ff Mon Sep 17 00:00:00 2001 From: Chris Bloomfield <43499897+ithinkandicode@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:09:01 +0000 Subject: [PATCH 3/4] API: Options - Rename `options_current.tres` to `options.tres` --- addons/mod_loader/mod_loader.gd | 2 +- .../mod_loader/options/{options_current.tres => options.tres} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/mod_loader/options/{options_current.tres => options.tres} (100%) diff --git a/addons/mod_loader/mod_loader.gd b/addons/mod_loader/mod_loader.gd index bb0874e0..13be7d1f 100644 --- a/addons/mod_loader/mod_loader.gd +++ b/addons/mod_loader/mod_loader.gd @@ -95,7 +95,7 @@ var logged_messages := [] # Path to the options resource # See: res://addons/mod_loader/options/options_current_data.gd -var ml_options_path := "res://addons/mod_loader/options/options_current.tres" +var ml_options_path := "res://addons/mod_loader/options/options.tres" # These variables handle various options, which can be changed via Godot's GUI # by adding a ModLoaderOptions resource to the resource file specified by diff --git a/addons/mod_loader/options/options_current.tres b/addons/mod_loader/options/options.tres similarity index 100% rename from addons/mod_loader/options/options_current.tres rename to addons/mod_loader/options/options.tres From b0d51f91c191564dcfa5e6cdac9c0b7ac1b201db Mon Sep 17 00:00:00 2001 From: Chris Bloomfield <43499897+ithinkandicode@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:14:24 +0000 Subject: [PATCH 4/4] API: Options - Move options classes to new `classes` dir --- .../mod_loader/{options => }/classes/options_current.gd | 0 .../mod_loader/{options => }/classes/options_profile.gd | 0 addons/mod_loader/mod_loader_setup.gd | 4 ++-- addons/mod_loader/options/options.tres | 8 ++++---- addons/mod_loader/options/profiles/current.tres | 2 +- addons/mod_loader/options/profiles/default.tres | 3 ++- addons/mod_loader/options/profiles/disable_mods.tres | 3 ++- .../options/profiles/production_no_workshop.tres | 3 ++- .../mod_loader/options/profiles/production_workshop.tres | 3 ++- 9 files changed, 15 insertions(+), 11 deletions(-) rename addons/mod_loader/{options => }/classes/options_current.gd (100%) rename addons/mod_loader/{options => }/classes/options_profile.gd (100%) diff --git a/addons/mod_loader/options/classes/options_current.gd b/addons/mod_loader/classes/options_current.gd similarity index 100% rename from addons/mod_loader/options/classes/options_current.gd rename to addons/mod_loader/classes/options_current.gd diff --git a/addons/mod_loader/options/classes/options_profile.gd b/addons/mod_loader/classes/options_profile.gd similarity index 100% rename from addons/mod_loader/options/classes/options_profile.gd rename to addons/mod_loader/classes/options_profile.gd diff --git a/addons/mod_loader/mod_loader_setup.gd b/addons/mod_loader/mod_loader_setup.gd index 3339d039..7406113b 100644 --- a/addons/mod_loader/mod_loader_setup.gd +++ b/addons/mod_loader/mod_loader_setup.gd @@ -34,12 +34,12 @@ const new_global_classes := [ "base": "Resource", "class": "ModLoaderCurrentOptions", "language": "GDScript", - "path": "res://addons/mod_loader/options/classes/options_current.gd" + "path": "res://addons/mod_loader/classes/options_current.gd" }, { "base": "Resource", "class": "ModLoaderOptionsProfile", "language": "GDScript", - "path": "res://addons/mod_loader/options/classes/options_profile.gd" + "path": "res://addons/mod_loader/classes/options_profile.gd" } ] diff --git a/addons/mod_loader/options/options.tres b/addons/mod_loader/options/options.tres index 5cb9290b..95a8460f 100644 --- a/addons/mod_loader/options/options.tres +++ b/addons/mod_loader/options/options.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" load_steps=3 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_current.gd" type="Script" id=1] -[ext_resource path="res://addons/mod_loader/options/profiles/current.tres" type="Resource" id=2] +[ext_resource path="res://addons/mod_loader/options/profiles/current.tres" type="Resource" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_current.gd" type="Script" id=2] [resource] -script = ExtResource( 1 ) -current_options = ExtResource( 2 ) +script = ExtResource( 2 ) +current_options = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/current.tres b/addons/mod_loader/options/profiles/current.tres index d3f09c79..89457209 100644 --- a/addons/mod_loader/options/profiles/current.tres +++ b/addons/mod_loader/options/profiles/current.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/default.tres b/addons/mod_loader/options/profiles/default.tres index d3f09c79..a4f74609 100644 --- a/addons/mod_loader/options/profiles/default.tres +++ b/addons/mod_loader/options/profiles/default.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/disable_mods.tres b/addons/mod_loader/options/profiles/disable_mods.tres index 1c7e5713..0547ff16 100644 --- a/addons/mod_loader/options/profiles/disable_mods.tres +++ b/addons/mod_loader/options/profiles/disable_mods.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/production_no_workshop.tres b/addons/mod_loader/options/profiles/production_no_workshop.tres index 4c7b6f74..97dc1ca1 100644 --- a/addons/mod_loader/options/profiles/production_no_workshop.tres +++ b/addons/mod_loader/options/profiles/production_no_workshop.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/production_workshop.tres b/addons/mod_loader/options/profiles/production_workshop.tres index 3de9900b..f5af83de 100644 --- a/addons/mod_loader/options/profiles/production_workshop.tres +++ b/addons/mod_loader/options/profiles/production_workshop.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 )