refactor: move devtools related files to endstone_devtools

EndstoneMC · Jun 30, 2024 · 748f9c5 · 748f9c5
1 parent c66ccc1
commit 748f9c5
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 666 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,6 +116,7 @@ if (ENDSTONE_DEVTOOLS_ENABLED)
     add_library(endstone_devtools ${ENDSTONE_DEVTOOLS_SOURCE_FILES})
     add_library(endstone::devtools ALIAS endstone_devtools)
 
+    target_include_directories(endstone_devtools PRIVATE "include/endstone/detail/devtools/imgui")
     target_link_libraries(endstone_devtools PUBLIC endstone::core GLEW::GLEW glfw imgui::imgui)
 
     include(GNUInstallDirs)

diff --git a/include/endstone/detail/gui/dev_tools.h → include/endstone/detail/devtools/devtools.h b/include/endstone/detail/gui/dev_tools.h → include/endstone/detail/devtools/devtools.h
@@ -14,25 +14,8 @@
 
 #pragma once
 
-#ifndef ENDSTONE_DISABLE_DEVTOOLS
-
-#include <nlohmann/json.hpp>
-
-#include "endstone/detail/server.h"
-
-namespace endstone::detail {
-class DevTools {
-public:
-    static void render();
-    static void show();
-    static void hide();
-
-private:
-    static void showAboutWindow(bool *open);
-    static void showBlockWindow(bool *open, EndstoneServer *server, nlohmann::json &block_types,
-                                nlohmann::json &block_states, nlohmann::json &block_tags, nlohmann::json &materials);
-    static void showItemWindow(bool *open, EndstoneServer *server, nlohmann::json &items, nlohmann::json &item_tags);
-};
-}  // namespace endstone::detail
-
-#endif
+namespace endstone::detail::devtools {
+void render();
+void show();
+void hide();
+}  // namespace endstone::detail::devtools
diff --git a/...e/detail/command/defaults/debug_command.h → ...dstone/detail/devtools/devtools_command.h b/...e/detail/command/defaults/debug_command.h → ...dstone/detail/devtools/devtools_command.h
@@ -17,9 +17,9 @@
 #include "endstone/detail/command/endstone_command.h"
 
 namespace endstone::detail {
-class DebugCommand : public EndstoneCommand {
+class DevToolsCommand : public EndstoneCommand {
 public:
-    DebugCommand();
+    DevToolsCommand();
     bool execute(CommandSender &sender, const std::vector<std::string> &args) const override;
 };
 

diff --git a/include/imgui/imgui_file_browser.h → ...etail/devtools/imgui/imgui_file_browser.h b/include/imgui/imgui_file_browser.h → ...etail/devtools/imgui/imgui_file_browser.h
@@ -913,7 +913,7 @@ inline std::string ImGui::FileBrowser::u8StrToStr(std::string s)
 
 #endif  // #ifndef WIN32_LEAN_AND_MEAN
 
-#include <windows.h>
+#include <Windows.h>
 
 #ifdef IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN
 #undef IMGUI_FILEBROWSER_UNDEF_WIN32_LEAN_AND_MEAN

diff --git a/include/imgui/imgui_impl_glfw.h → ...e/detail/devtools/imgui/imgui_impl_glfw.h b/include/imgui/imgui_impl_glfw.h → ...e/detail/devtools/imgui/imgui_impl_glfw.h
diff --git a/include/imgui/imgui_impl_opengl3.h → ...etail/devtools/imgui/imgui_impl_opengl3.h b/include/imgui/imgui_impl_opengl3.h → ...etail/devtools/imgui/imgui_impl_opengl3.h
diff --git a/include/imgui/imgui_impl_opengl3_loader.h → ...evtools/imgui/imgui_impl_opengl3_loader.h b/include/imgui/imgui_impl_opengl3_loader.h → ...evtools/imgui/imgui_impl_opengl3_loader.h
@@ -103,7 +103,7 @@ extern "C" {
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
 #endif
-#include <windows.h>
+#include <Windows.h>
 #endif
 #ifndef APIENTRY
 #define APIENTRY

diff --git a/src/endstone_core/command/command_map.cpp b/src/endstone_core/command/command_map.cpp
@@ -25,9 +25,9 @@
 #include "endstone/detail/command/bedrock_command.h"
 #include "endstone/detail/command/command_adapter.h"
 #include "endstone/detail/command/command_usage_parser.h"
-#include "endstone/detail/command/defaults/debug_command.h"
 #include "endstone/detail/command/defaults/plugins_command.h"
 #include "endstone/detail/command/defaults/version_command.h"
+#include "endstone/detail/devtools/devtools_command.h"
 #include "endstone/detail/permissions/default_permissions.h"
 #include "endstone/detail/server.h"
 
@@ -64,9 +64,11 @@ Command *EndstoneCommandMap::getCommand(std::string name) const
 
 void EndstoneCommandMap::setDefaultCommands()
 {
-    registerCommand(std::make_unique<DebugCommand>());
     registerCommand(std::make_unique<PluginsCommand>());
     registerCommand(std::make_unique<VersionCommand>());
+#ifdef ENDSTONE_DEVTOOLS
+    registerCommand(std::make_unique<DevToolsCommand>());
+#endif
 }
 
 void EndstoneCommandMap::setMinecraftCommands()