refactor: adapt to ll develop

OEOTYAN · Oct 11, 2024 · 36d6f2a · 36d6f2a
1 parent 0c8c978
commit 36d6f2a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 21 deletions.
diff --git a/src/command/CommandMacro.h b/src/command/CommandMacro.h
@@ -3,7 +3,7 @@
 #include "data/LocalContextManager.h"
 #include "worldedit/WorldEdit.h"
 
-#include <mc/enums/FacingID.h>
+#include <mc/common/FacingID.h>
 
 namespace we {
 

diff --git a/src/data/LocalContext.h b/src/data/LocalContext.h
@@ -3,7 +3,7 @@
 #include "Config.h"
 #include "region/Region.h"
 
-#include <mc/deps/core/mce/UUID.h>
+#include <mc/platform/UUID.h>
 #include <mc/world/level/Tick.h>
 
 namespace we {

diff --git a/src/data/LocalContextManager.h b/src/data/LocalContextManager.h
@@ -4,8 +4,8 @@
 
 #include <ll/api/data/KeyValueDB.h>
 #include <ll/api/event/ListenerBase.h>
-#include <mc/deps/core/mce/UUID.h>
-#include <mc/enums/FacingID.h>
+#include <mc/common/FacingID.h>
+#include <mc/platform/UUID.h>
 
 class Player;
 class ItemStack;

diff --git a/src/utils/FacingUtils.h b/src/utils/FacingUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <mc/enums/FacingID.h>
-#include <mc/math/Vec3.h>
+#include <mc/common/FacingID.h>
+#include <mc/deps/core/math/Vec3.h>
 #include <mc/world/level/BlockPos.h>
 
 namespace we {

diff --git a/src/utils/Serialize.h b/src/utils/Serialize.h
@@ -3,8 +3,8 @@
 #include <ll/api/reflection/Deserialization.h>
 #include <ll/api/reflection/Serialization.h>
 
-#include <mc/deps/core/mce/Color.h>
-#include <mc/world/AutomaticID.h>
+#include <mc/deps/core/math/Color.h>
+#include <mc/deps/core/utility/AutomaticID.h>
 
 namespace mce {
 template <class J>

diff --git a/src/utils/WithDim.h b/src/utils/WithDim.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mc/world/AutomaticID.h>
+#include <mc/deps/core/utility/AutomaticID.h>
 
 namespace we {
 template <class T>

diff --git a/src/worldedit/Global.h b/src/worldedit/Global.h
@@ -23,8 +23,8 @@
 #include <ll/api/utils/ErrorUtils.h>
 #include <ll/api/utils/HashUtils.h>
 #include <ll/api/utils/StringUtils.h>
-#include <mc/math/Vec2.h>
-#include <mc/math/Vec3.h>
+#include <mc/deps/core/math/Vec2.h>
+#include <mc/deps/core/math/Vec3.h>
 #include <mc/nbt/CompoundTag.h>
 #include <mc/server/commands/CommandPermissionLevel.h>
 #include <mc/world/item/VanillaItemNames.h>

diff --git a/xmake.lua b/xmake.lua
@@ -3,17 +3,10 @@ add_rules("mode.release")
 add_rules("plugin.compile_commands.autoupdate", {outputdir=".vscode"})
 
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
-
-package("bscidev")
-    add_urls("https://github.com/OEOTYAN/BedrockServerClientInterface.git")
-    add_versions("0.1.5", "50503ed2f734a9d13145b38d9a18961d7e8ac8d3")
-    on_install(function (package)
-        import("package.tools.xmake").install(package)
-    end)
-package_end()
+add_repositories("oeo-repo https://github.com/OEOTYAN/xmake-repo.git")
 
 add_requires("levilamina develop")
-add_requires("bscidev")
+add_requires("bsci main")
 add_requires("parallel-hashmap")
 -- add_requires("openimageio 2.5.10+1", {verify = false})
 add_requires("tinyobjloader")
@@ -34,7 +27,7 @@ target("WorldEdit") -- Change this to your mod name.
     add_files("thirdparty/**.cpp")
     add_includedirs("thirdparty")
     set_pcxxheader("src/worldedit/Global.h")
-    add_packages("levilamina", "bscidev", "parallel-hashmap", "tinyobjloader")
+    add_packages("levilamina", "bsci", "parallel-hashmap", "tinyobjloader")
     set_kind("shared")
     set_languages("c++20")
     set_symbols("debug")