2.0.6更新

- 修复mc.pyi中setSoftEnum的返回值错误
- 新增cmd.py注册命令样例

Author: twoone3

BDSpyrunner.vcxproj

@@ -60,6 +60,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DelayLoadDLLs>bedrock_server.dll</DelayLoadDLLs>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>if exist ..\BDS\plugins (

BDSpyrunner.vcxproj.filters

@@ -127,20 +127,12 @@
     <Library Include="Lib\python37.lib">
       <Filter>库文件</Filter>
     </Library>
-    <Library Include="SDK\Lib\LiteLoader.lib">
-      <Filter>库文件</Filter>
-    </Library>
-    <Library Include="SDK\Lib\SymDBHelper.lib">
-      <Filter>库文件</Filter>
-    </Library>
-    <Library Include="SDK\Lib\bedrock_server_api.lib">
-      <Filter>库文件</Filter>
-    </Library>
-    <Library Include="SDK\Lib\bedrock_server_var.lib">
-      <Filter>库文件</Filter>
-    </Library>
     <Library Include="SDK\Lib\bedrock_server_var.lib" />
     <Library Include="SDK\Lib\bedrock_server_api.lib" />
+    <Library Include="SDK\Lib\bedrock_server_api.lib" />
+    <Library Include="SDK\Lib\bedrock_server_var.lib" />
+    <Library Include="SDK\Lib\LiteLoader.lib" />
+    <Library Include="SDK\Lib\SymDBHelper.lib" />
   </ItemGroup>
   <ItemGroup>
     <None Include=".clang-format" />

Example/_form.py

@@ -1,4 +1,3 @@
-import mc
 import json
 
 

Example/cmd.py

@@ -0,0 +1,16 @@
+from mc import *
+
+
+def cb(p: CommandOrigin, result):
+	p.player.sendText(str(result))
+
+
+c = Command('test', 'test cmd', CommandPermissionLevel.Any)
+c.mandatory('ssss', ParameterType.String)
+c.mandatory(
+    'aaa', ParameterType.SoftEnum,
+    c.setSoftEnum('asdasdasd', ['az,', 'azzzzz'])
+)
+c.overload(['ssss', 'aaa'])
+c.setCallback(cb)
+c.setup()

Example/mc.pyi

@@ -288,9 +288,24 @@ class Command:
 	def setAlias(self, alias: str) -> bool:
 		pass
 
+	def setSoftEnum(self, name, enums: list[str]) -> str:
+		pass
+
+	def addSoftEnumValues(self, name, values: list[str]) -> bool:
+		pass
+
+	def removeSoftEnumValues(self, name, values: list[str]) -> bool:
+		pass
+
+	def getSoftEnumValues(self, name) -> list[str]:
+		pass
+
+	def getSoftEnumNames(self) -> list[str]:
+		pass
+
 	def mandatory2(
 	    self,
-	    name,
+	    name: str,
 	    type: ParameterType,
 	    description: str = "",
 	    identifier: str = "",
@@ -300,7 +315,7 @@ class Command:
 
 	def mandatory(
 	    self,
-	    name,
+	    name: str,
 	    type: ParameterType,
 	    description: str = "",
 	    option=CommandParameterOption.None_
@@ -326,21 +341,6 @@ class Command:
 	) -> int:
 		pass
 
-	def setSoftEnum(self, name, enums: list[str]) -> bool:
-		pass
-
-	def addSoftEnumValues(self, name, values: list[str]) -> bool:
-		pass
-
-	def removeSoftEnumValues(self, name, values: list[str]) -> bool:
-		pass
-
-	def getSoftEnumValues(self, name) -> list[str]:
-		pass
-
-	def getSoftEnumNames(self) -> list[str]:
-		pass
-
 	def overload(self, value=None) -> bool:
 		pass
 
@@ -473,6 +473,9 @@ class NBT:
 	def asDouble(self) -> float:
 		pass
 
+	def asString(self) -> str:
+		pass
+
 	def toBinary(self) -> bytes:
 		pass
 
@@ -954,6 +957,7 @@ def runCommandEx(cmd) -> tuple[str, bool]:
 def setListener(event, callback) -> bool:
 	pass
 
+
 # callback: (player: Player, result: dict[str, CommandResult]) -> None
 def registerCommand(
     name, desc, callback, perm=CommandPermissionLevel.GameMasters

Example/pshop.py

@@ -14,7 +14,7 @@
 pshop = {}
 
 
-def str2json(data):
+def str2json(data: str):
 	jsondata = json.loads(data)
 	return jsondata
 

ModuleDef.cpp

@@ -130,15 +130,15 @@ PYBIND11_EMBEDDED_MODULE(mc, mc_module) {
 
 	    .def("setEnum", &CommandClass::setEnum)
 	    .def("setAlias", &CommandClass::setAlias)
-	    .def("mandatory2", py::overload_cast<const string&, DynamicCommand::ParameterType, string, string, CommandParameterOption>(&CommandClass::mandatory), "name"_a, "type"_a, "description"_a = "", "identifier"_a = "", "option"_a = None)
-	    .def("mandatory", py::overload_cast<const string&, DynamicCommand::ParameterType, string, CommandParameterOption>(&CommandClass::mandatory), "name"_a, "type"_a, "description"_a = "", "option"_a = None)
-	    .def("optional2", py::overload_cast<const string&, DynamicCommand::ParameterType, string, string, CommandParameterOption>(&CommandClass::optional), "name"_a, "type"_a, "description"_a = "", "identifier"_a = "", "option"_a = None)
-	    .def("optional", py::overload_cast<const string&, DynamicCommand::ParameterType, string, CommandParameterOption>(&CommandClass::optional), "name"_a, "type"_a, "description"_a = "", "option"_a = None)
 	    .def("setSoftEnum", &CommandClass::setSoftEnum)
 	    .def("addSoftEnumValues", &CommandClass::addSoftEnumValues)
 	    .def("removeSoftEnumValues", &CommandClass::removeSoftEnumValues)
 	    .def("getSoftEnumValues", &CommandClass::getSoftEnumValues)
 	    .def("getSoftEnumNames", &CommandClass::getSoftEnumNames)
+	    .def("mandatory2", py::overload_cast<const string&, DynamicCommand::ParameterType, string, string, CommandParameterOption>(&CommandClass::mandatory), "name"_a, "type"_a, "description"_a = "", "identifier"_a = "", "option"_a = None)
+	    .def("mandatory", py::overload_cast<const string&, DynamicCommand::ParameterType, string, CommandParameterOption>(&CommandClass::mandatory), "name"_a, "type"_a, "description"_a = "", "option"_a = None)
+	    .def("optional2", py::overload_cast<const string&, DynamicCommand::ParameterType, string, string, CommandParameterOption>(&CommandClass::optional), "name"_a, "type"_a, "description"_a = "", "identifier"_a = "", "option"_a = None)
+	    .def("optional", py::overload_cast<const string&, DynamicCommand::ParameterType, string, CommandParameterOption>(&CommandClass::optional), "name"_a, "type"_a, "description"_a = "", "option"_a = None)
 	    .def("overload", py::overload_cast<>(&CommandClass::addOverload))
 	    .def("overload", py::overload_cast<const vector<size_t>&>(&CommandClass::addOverload))
 	    .def("overload", py::overload_cast<vector<string>&&>(&CommandClass::addOverload))