From c7eb316a81975403dd34822b725706cc8d67ce68 Mon Sep 17 00:00:00 2001 From: Patrick Reis Date: Sun, 26 Jan 2025 22:06:32 -0300 Subject: [PATCH 1/3] refactor: move pasta shared para dentro da pasta modules --- .../Shared}/Resources/defaultTheme.tres | 0 {Shared => Modules/Shared}/Resources/font1.ttf | Bin .../Shared}/Resources/font1.ttf.import | 7 ++++--- .../Shared}/Scripts/Constants/MappedInputs.cs | 0 .../Shared}/Scripts/Constants/MappedInputs.cs.uid | 0 .../Shared}/Scripts/Constants/TilesConstants.cs | 0 .../Shared}/Scripts/Constants/TilesConstants.cs.uid | 0 .../Shared}/Scripts/Extensions/NodeExtensions.cs | 0 8 files changed, 4 insertions(+), 3 deletions(-) rename {Shared => Modules/Shared}/Resources/defaultTheme.tres (100%) rename {Shared => Modules/Shared}/Resources/font1.ttf (100%) rename {Shared => Modules/Shared}/Resources/font1.ttf.import (65%) rename {Shared => Modules/Shared}/Scripts/Constants/MappedInputs.cs (100%) rename {Shared => Modules/Shared}/Scripts/Constants/MappedInputs.cs.uid (100%) rename {Shared => Modules/Shared}/Scripts/Constants/TilesConstants.cs (100%) rename {Shared => Modules/Shared}/Scripts/Constants/TilesConstants.cs.uid (100%) rename {Shared => Modules/Shared}/Scripts/Extensions/NodeExtensions.cs (100%) diff --git a/Shared/Resources/defaultTheme.tres b/Modules/Shared/Resources/defaultTheme.tres similarity index 100% rename from Shared/Resources/defaultTheme.tres rename to Modules/Shared/Resources/defaultTheme.tres diff --git a/Shared/Resources/font1.ttf b/Modules/Shared/Resources/font1.ttf similarity index 100% rename from Shared/Resources/font1.ttf rename to Modules/Shared/Resources/font1.ttf diff --git a/Shared/Resources/font1.ttf.import b/Modules/Shared/Resources/font1.ttf.import similarity index 65% rename from Shared/Resources/font1.ttf.import rename to Modules/Shared/Resources/font1.ttf.import index dfefd23..5cf9f58 100644 --- a/Shared/Resources/font1.ttf.import +++ b/Modules/Shared/Resources/font1.ttf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://4gd2xpuyufru" -path="res://.godot/imported/font1.ttf-6e7ba9975eab5806005bb5a794c32bb2.fontdata" +path="res://.godot/imported/font1.ttf-a1e3d7eaf2a3dd96c6c75edf31a94005.fontdata" [deps] -source_file="res://Shared/Resources/font1.ttf" -dest_files=["res://.godot/imported/font1.ttf-6e7ba9975eab5806005bb5a794c32bb2.fontdata"] +source_file="res://Modules/Shared/Resources/font1.ttf" +dest_files=["res://.godot/imported/font1.ttf-a1e3d7eaf2a3dd96c6c75edf31a94005.fontdata"] [params] @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=4 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/Shared/Scripts/Constants/MappedInputs.cs b/Modules/Shared/Scripts/Constants/MappedInputs.cs similarity index 100% rename from Shared/Scripts/Constants/MappedInputs.cs rename to Modules/Shared/Scripts/Constants/MappedInputs.cs diff --git a/Shared/Scripts/Constants/MappedInputs.cs.uid b/Modules/Shared/Scripts/Constants/MappedInputs.cs.uid similarity index 100% rename from Shared/Scripts/Constants/MappedInputs.cs.uid rename to Modules/Shared/Scripts/Constants/MappedInputs.cs.uid diff --git a/Shared/Scripts/Constants/TilesConstants.cs b/Modules/Shared/Scripts/Constants/TilesConstants.cs similarity index 100% rename from Shared/Scripts/Constants/TilesConstants.cs rename to Modules/Shared/Scripts/Constants/TilesConstants.cs diff --git a/Shared/Scripts/Constants/TilesConstants.cs.uid b/Modules/Shared/Scripts/Constants/TilesConstants.cs.uid similarity index 100% rename from Shared/Scripts/Constants/TilesConstants.cs.uid rename to Modules/Shared/Scripts/Constants/TilesConstants.cs.uid diff --git a/Shared/Scripts/Extensions/NodeExtensions.cs b/Modules/Shared/Scripts/Extensions/NodeExtensions.cs similarity index 100% rename from Shared/Scripts/Extensions/NodeExtensions.cs rename to Modules/Shared/Scripts/Extensions/NodeExtensions.cs From 5452ff0a084bd7b3ec09ed7f7313b687ab297fd8 Mon Sep 17 00:00:00 2001 From: Patrick Reis Date: Sun, 26 Jan 2025 22:27:33 -0300 Subject: [PATCH 2/3] refactor: ajusta namespaces restantes --- Modules/GameManagers/Scripts/TilesManager.cs | 2 +- Modules/Player/Scripts/Player.cs | 2 +- Modules/Shared/Scripts/Constants/MappedInputs.cs | 2 +- .../Scripts/Constants/{TilesConstants.cs => TileConstants.cs} | 2 +- Modules/Shared/Scripts/Extensions/NodeExtensions.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename Modules/Shared/Scripts/Constants/{TilesConstants.cs => TileConstants.cs} (56%) diff --git a/Modules/GameManagers/Scripts/TilesManager.cs b/Modules/GameManagers/Scripts/TilesManager.cs index a13003d..6d470c0 100644 --- a/Modules/GameManagers/Scripts/TilesManager.cs +++ b/Modules/GameManagers/Scripts/TilesManager.cs @@ -1,8 +1,8 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; +using DungeonRoyale.Modules.Shared.Scripts.Constants; using DungeonRoyale.Modules.Tiles.Scripts; -using DungeonRoyale.Shared.Scripts.Constants; namespace DungeonRoyale.Modules.GameManagers.Scripts; diff --git a/Modules/Player/Scripts/Player.cs b/Modules/Player/Scripts/Player.cs index f000913..ab006c4 100644 --- a/Modules/Player/Scripts/Player.cs +++ b/Modules/Player/Scripts/Player.cs @@ -1,4 +1,4 @@ -using DungeonRoyale.Shared.Scripts.Constants; +using DungeonRoyale.Modules.Shared.Scripts.Constants; namespace DungeonRoyale.Modules.Player.Scripts; diff --git a/Modules/Shared/Scripts/Constants/MappedInputs.cs b/Modules/Shared/Scripts/Constants/MappedInputs.cs index 4ab32f0..2f3dc77 100644 --- a/Modules/Shared/Scripts/Constants/MappedInputs.cs +++ b/Modules/Shared/Scripts/Constants/MappedInputs.cs @@ -1,4 +1,4 @@ -namespace DungeonRoyale.Shared.Scripts.Constants; +namespace DungeonRoyale.Modules.Shared.Scripts.Constants; public static class MappedInputs { diff --git a/Modules/Shared/Scripts/Constants/TilesConstants.cs b/Modules/Shared/Scripts/Constants/TileConstants.cs similarity index 56% rename from Modules/Shared/Scripts/Constants/TilesConstants.cs rename to Modules/Shared/Scripts/Constants/TileConstants.cs index bafa12e..053a554 100644 --- a/Modules/Shared/Scripts/Constants/TilesConstants.cs +++ b/Modules/Shared/Scripts/Constants/TileConstants.cs @@ -1,4 +1,4 @@ -namespace DungeonRoyale.Shared.Scripts.Constants; +namespace DungeonRoyale.Modules.Shared.Scripts.Constants; public static class TileConstants { diff --git a/Modules/Shared/Scripts/Extensions/NodeExtensions.cs b/Modules/Shared/Scripts/Extensions/NodeExtensions.cs index f96aa87..f489eb3 100644 --- a/Modules/Shared/Scripts/Extensions/NodeExtensions.cs +++ b/Modules/Shared/Scripts/Extensions/NodeExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DungeonRoyale.Shared.Scripts.Extensions; +namespace DungeonRoyale.Modules.Shared.Scripts.Extensions; public static class NodeExtensions { From 5625839c628f6f0f125d068d4d92897256b9ccca Mon Sep 17 00:00:00 2001 From: Patrick Reis Date: Sun, 26 Jan 2025 22:32:53 -0300 Subject: [PATCH 3/3] fix: remove importacao Shared em GlobalUsings.cs --- GlobalUsings.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GlobalUsings.cs b/GlobalUsings.cs index e3b8650..789d320 100644 --- a/GlobalUsings.cs +++ b/GlobalUsings.cs @@ -1,2 +1 @@ -global using Godot; -global using DungeonRoyale.Shared.Scripts.Extensions; \ No newline at end of file +global using Godot; \ No newline at end of file