1.9.4更新，修复部分监听器无效的问题，新增onCmdBlockExecute事件

BDSpyrunner.vcxproj

@@ -83,6 +83,7 @@ copy $(OutputPath)$(ProjectName).pdb ..\BDS\plugins\$(ProjectName).pdb
     <ClInclude Include="mod\CPython.h" />
     <ClInclude Include="mod\PyItemStack.h" />
     <ClInclude Include="mod\PyBlockInstance.h" />
+    <ClInclude Include="mod\Version.h" />
   </ItemGroup>
   <ItemGroup>
     <Library Include="lib\python37.lib" />

BDSpyrunner.vcxproj.filters

@@ -71,6 +71,9 @@
     <ClInclude Include="mod\PyBlockInstance.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="mod\Version.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="lib\python37.lib">

mod/Event.cpp

@@ -83,12 +83,12 @@ class Callbacker {
 	PyGILGuard gil_;
 };
 
-#define EVENT_BEGIN(evt) if(!evt::hasListener())evt::subscribe([code](evt e){Callbacker h(code); h.insert("Event",magic_enum::enum_name(code))
+#define EVENT_BEGIN(evt) evt::subscribe([code](evt e){Callbacker h(code); h.insert("Event",magic_enum::enum_name(code))
 #define EVENT_INSERT(key) h.insert(#key, e.m##key)
 #define EVENT_INSERT2(key,value) h.insert(#key, value)
 #define EVENT_END return h.callback();})
 
-void EnableEventListener(EventCode code, PyObject* func) {
+void EnableEventListener(EventCode code) {
 	using namespace Event;
 	switch (code) {
 	case EventCode::onPreJoin:
@@ -315,6 +315,12 @@ void EnableEventListener(EventCode code, PyObject* func) {
 		EVENT_END;
 		break;
 	case EventCode::onCmdBlockExecute:
+		EVENT_BEGIN(CmdBlockExecuteEvent);
+		EVENT_INSERT(BlockInstance);
+		EVENT_INSERT(Command);
+		EVENT_INSERT(IsMinecart);
+		EVENT_INSERT(Minecart);
+		EVENT_END;
 		break;
 	case EventCode::onRedStoneUpdate:
 		break;
@@ -416,5 +422,4 @@ void EnableEventListener(EventCode code, PyObject* func) {
 	default:
 		break;
 	}
-	g_callback_functions[code].push_back(func);
 }

mod/Event.h

@@ -1,9 +1,8 @@
 #pragma once
 #include <EventAPI.h>
-#include "CPython.h"
 #include "magic_enum.hpp"
 
-enum class EventCode : int {
+enum class EventCode {
 	onPreJoin, onJoin, onLeft, onPlayerCmd, onChat, onPlayerDie,
 	onRespawn, onChangeDim, onJump, onSneak, onAttack, onEat, onMove, onChangeSprinting, onSpawnProjectile,
 	onFireworkShootWithCrossbow, onSetArmor, onRide, onStepOnPressurePlate,
@@ -18,4 +17,4 @@ enum class EventCode : int {
 	onMoneyAdd, onMoneyReduce, onMoneyTrans, onMoneySet, onConsumeTotem, onEffectChanged,
 };
 
-void EnableEventListener(EventCode e, PyObject* func);
+void EnableEventListener(EventCode e);

mod/Main.cpp

@@ -1,5 +1,6 @@
 #include "Module.h"
 #include "NBT.h"
+#include "Version.h"
 
 #define PLUGIN_PATH "plugins\\py\\"
 
@@ -17,7 +18,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
 		//Return FALSE to fail DLL load.
 		LL::registerPlugin(
 			"BDSpyrunner", "For .py plugins' loading",
-			LL::Version(1, 9, 3, LL::Version::Release),
+			LL::Version(PYR_VERSION_MAJOR, PYR_VERSION_MINOR, PYR_VERSION_MICRO, LL::Version::Release),
 			{ { "Author", "twoone3" } }
 		);
 		break;

mod/Module.cpp

@@ -52,7 +52,15 @@ static PyObject* setListener(PyObject*, PyObject* args) {
 	auto event_code = magic_enum::enum_cast<EventCode>(event_name);
 	if (!event_code.has_value())
 		Py_RETURN_ERROR_FORMAT("Invalid Listener key words %s", event_name);
-	EnableEventListener(event_code.value(), func);
+	//在全局回调表中查找code
+	auto funcs = g_callback_functions.find(event_code.value());
+	//如果是第一次设置则订阅监听器
+	if (funcs == g_callback_functions.end()) {
+		g_callback_functions[event_code.value()];
+		EnableEventListener(event_code.value());
+	}
+	//添加回调函数
+	funcs->second.push_back(func);
 	Py_RETURN_NONE;
 }
 //设置指令说明

mod/Tool.h

@@ -48,8 +48,6 @@
 
 using json_t = nlohmann::detail::value_t;
 
-constexpr const char* PYR_VERSION = "v1.9.3";
-
 //字符串转JSON，本插件采用 https://json.nlohmann.me 的JSON库
 fifo_json CompoundTagToJson(std::string_view str);
 

mod/Version.h

@@ -0,0 +1,5 @@
+#pragma once
+constexpr unsigned PYR_VERSION_MAJOR = 1;
+constexpr unsigned PYR_VERSION_MINOR = 9;
+constexpr unsigned PYR_VERSION_MICRO = 4;
+constexpr const char* PYR_VERSION = "v1.9.4";