From 82f012dd2208d73c88c4da413ff727f358d5b5f6 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 12 Feb 2022 20:09:30 +0100
Subject: [PATCH] Also moved the menu folder under scenes.

---
 game/project.godot                   | 2 +-
 game/scenes/Main.tscn                | 2 +-
 game/{ => scenes}/menu/ExitButton.gd | 0
 game/{ => scenes}/menu/Menu.gd       | 0
 game/{ => scenes}/menu/Menu.tscn     | 6 +++---
 game/{ => scenes}/menu/MenuWorld.gd  | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename game/{ => scenes}/menu/ExitButton.gd (100%)
 rename game/{ => scenes}/menu/Menu.gd (100%)
 rename game/{ => scenes}/menu/Menu.tscn (99%)
 rename game/{ => scenes}/menu/MenuWorld.gd (100%)

diff --git a/game/project.godot b/game/project.godot
index 4da31e60..deff1d00 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -173,7 +173,7 @@ _global_script_classes=[ {
 "base": "Control",
 "class": "Menu",
 "language": "GDScript",
-"path": "res://menu/Menu.gd"
+"path": "res://scenes/menu/Menu.gd"
 }, {
 "base": "Entity",
 "class": "MobGD",
diff --git a/game/scenes/Main.tscn b/game/scenes/Main.tscn
index 27934c15..b2719f98 100644
--- a/game/scenes/Main.tscn
+++ b/game/scenes/Main.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://scenes/MainScene.gd" type="Script" id=1]
 [ext_resource path="res://scenes/world/TerrainWorldBlocky.tscn" type="PackedScene" id=2]
-[ext_resource path="res://menu/Menu.tscn" type="PackedScene" id=3]
+[ext_resource path="res://scenes/menu/Menu.tscn" type="PackedScene" id=3]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4]
 [ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5]
 [ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=6]
diff --git a/game/menu/ExitButton.gd b/game/scenes/menu/ExitButton.gd
similarity index 100%
rename from game/menu/ExitButton.gd
rename to game/scenes/menu/ExitButton.gd
diff --git a/game/menu/Menu.gd b/game/scenes/menu/Menu.gd
similarity index 100%
rename from game/menu/Menu.gd
rename to game/scenes/menu/Menu.gd
diff --git a/game/menu/Menu.tscn b/game/scenes/menu/Menu.tscn
similarity index 99%
rename from game/menu/Menu.tscn
rename to game/scenes/menu/Menu.tscn
index f1463fd4..6cf9fc66 100644
--- a/game/menu/Menu.tscn
+++ b/game/scenes/menu/Menu.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
 [ext_resource path="res://ui/player/menu/CharacterEntry.tscn" type="PackedScene" id=2]
-[ext_resource path="res://menu/Menu.gd" type="Script" id=3]
+[ext_resource path="res://scenes/menu/Menu.gd" type="Script" id=3]
 [ext_resource path="res://ui/player/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
 [ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5]
 [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6]
@@ -15,12 +15,12 @@
 [ext_resource path="res://scenes/DisconnectButton.gd" type="Script" id=13]
 [ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14]
 [ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15]
-[ext_resource path="res://menu/MenuWorld.gd" type="Script" id=16]
+[ext_resource path="res://scenes/menu/MenuWorld.gd" type="Script" id=16]
 [ext_resource path="res://scenes/world/new_terramanlibrarymerger.tres" type="TerrainLibraryMerger" id=17]
 [ext_resource path="res://scenes/world/new_terramanlevelgenerator.tres" type="TerrainLevelGenerator" id=18]
 [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
 [ext_resource path="res://ui/windows/about/About.tscn" type="PackedScene" id=20]
-[ext_resource path="res://menu/ExitButton.gd" type="Script" id=21]
+[ext_resource path="res://scenes/menu/ExitButton.gd" type="Script" id=21]
 [ext_resource path="res://ui/scripts/Window.gd" type="Script" id=22]
 
 [sub_resource type="TerrainChunkBlocky" id=1]
diff --git a/game/menu/MenuWorld.gd b/game/scenes/menu/MenuWorld.gd
similarity index 100%
rename from game/menu/MenuWorld.gd
rename to game/scenes/menu/MenuWorld.gd