完善代码

twoone-3 · Jan 2, 2022 · fca883a · fca883a
1 parent 58d877b
commit fca883a
Show file tree

Hide file tree

Showing 13 changed files with 559 additions and 679 deletions.
diff --git a/BDSpyrunner.vcxproj b/BDSpyrunner.vcxproj
@@ -46,7 +46,7 @@
       <PreprocessorDefinitions>NDEBUG;_AMD64_;_CONSOLE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4996;4471;4499</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4996;4471;4499;4244</DisableSpecificWarnings>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
     <Link>
@@ -64,13 +64,13 @@ copy $(OutputPath)$(ProjectName).pdb ..\BDS\plugins\$(ProjectName).pdb
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="mod.cpp" />
-    <ClCompile Include="mod\DataIO.cpp" />
+    <ClCompile Include="mod\Main.cpp" />
     <ClCompile Include="mod\Module.cpp" />
     <ClCompile Include="mod\Entity.cpp" />
+    <ClCompile Include="mod\Listener.cpp" />
+    <ClCompile Include="mod\NBT.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="mod\DataIO.h" />
     <ClInclude Include="mod\Module.h" />
     <ClInclude Include="mod\Event.h" />
     <ClInclude Include="mod\NBT.h" />

diff --git a/BDSpyrunner.vcxproj.filters b/BDSpyrunner.vcxproj.filters
@@ -18,7 +18,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mod.cpp">
+    <ClCompile Include="mod\Main.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="mod\Entity.cpp">
@@ -27,7 +27,10 @@
     <ClCompile Include="mod\Module.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="mod\DataIO.cpp">
+    <ClCompile Include="mod\Listener.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="mod\NBT.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
@@ -53,9 +56,6 @@
     <ClInclude Include="mod\NBT.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="mod\DataIO.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="lib\python37.lib">

diff --git a/mod/CPython.h b/mod/CPython.h
@@ -1,16 +1,14 @@
 #pragma once
 #define PY_SSIZE_T_CLEAN
 #include "../include/Python.h"
-#include <vector>
-#include <string>
 #include <Global.h>
 
 #define Py_PARSE(format,...) if (!PyArg_ParseTuple(args, format ":" __FUNCTION__, __VA_ARGS__))return nullptr
 #define Py_KERWORDS_LIST(...) static const char* kwlist[]{ __VA_ARGS__,nullptr }
 #define Py_PARSE_WITH_KERWORDS(format,...) if (!PyArg_ParseTupleAndKeywords(args, kwds, format ":" __FUNCTION__, const_cast<char**>(kwlist), __VA_ARGS__))return nullptr
 
 #define Py_RETURN_ERROR(str) return PyErr_SetString(PyExc_Exception, str), nullptr
-#define Py_PRINT_REFCOUNT(obj) cout << "引用计数：" << obj->ob_refcnt << endl
+#define Py_PRINT_REFCOUNT(obj) logger.info(#obj " 的引用计数 : {}",  obj->ob_refcnt)
 
 //#define Py_BEGIN_CALL\
 //	int _has_gil = PyGILState_Check();\

diff --git a/mod/DataIO.cpp b/mod/DataIO.cpp
diff --git a/mod/DataIO.h b/mod/DataIO.h
diff --git a/mod/Entity.h b/mod/Entity.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <string>
 #include "CPython.h"
 //Entity类型
 extern PyTypeObject PyEntity_Type;