v2.1.6更新

- 更改 MobSpawnEvent 为 MobTrySpawnEvent
- 更新 python 3.11.2
- 更新 SDK
- 新增 lip 适配

Author: twoone3

.gitmodules

@@ -1,4 +1,3 @@
-[submodule "SDK"]
-	path = SDK
-	url = https://github.com/LiteLDev/LiteLoaderSDK
-	branch = develop
+[submodule "sdk"]
+	path = sdk
+	url = https://github.com/LiteLDev/SDK-cpp.git

README.md

@@ -4,7 +4,6 @@
 ![Downloads](https://img.shields.io/github/downloads/twoone-3/BDSpyrunner/latest/total)
 ![Release](https://img.shields.io/github/v/release/twoone-3/BDSpyrunner)
 ![BDS](https://img.shields.io/badge/support--BDS--version-1.19-blue)
-![CodeFactor](https://www.codefactor.io/repository/github/twoone-3/bdspyrunner/badge)
 
 [Wiki](https://github.com/twoone-3/BDSpyrunner/wiki)
 

RELEASENOTE.md

@@ -1,3 +1,5 @@
-v2.1.5更新
-- 修改action
-- 更新SDK
+v2.1.6更新
+- 更改 MobSpawnEvent 为 MobTrySpawnEvent
+- 更新 python 3.11.2
+- 更新 SDK
+- 新增 lip 适配

SDK

@@ -1 +1 @@
-Subproject commit 02d254c0b5120c185a4521b385295822ee324797
+Subproject commit 96f2f8e863e1b26d9fe6aab4577fd7c8e54dbd35

include/cpython/longintrepr.h

@@ -71,6 +71,9 @@ typedef long stwodigits; /* signed variant of twodigits */
         0 <= ob_digit[i] <= MASK.
    The allocation function takes care of allocating extra memory
    so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
+   We always allocate memory for at least one digit, so accessing ob_digit[0]
+   is always safe. However, in the case ob_size == 0, the contents of
+   ob_digit[0] may be undefined.
 
    CAUTION:  Generic code manipulating subtypes of PyVarObject has to
    aware that ints abuse  ob_size's sign bit.

include/dynamic_annotations.h

@@ -44,7 +44,7 @@
    Actual implementation of these macros may differ depending on the
    dynamic analysis tool being used.
 
-   See http://code.google.com/p/data-race-test/  for more information.
+   See https://code.google.com/p/data-race-test/  for more information.
 
    This file supports the following dynamic analysis tools:
    - None (DYNAMIC_ANNOTATIONS_ENABLED is not defined or zero).
@@ -140,7 +140,7 @@
      of the mutex's critical sections individually using the annotations above.
      This annotation makes sense only for hybrid race detectors. For pure
      happens-before detectors this is a no-op. For more details see
-     http://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid . */
+     https://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid . */
 #define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) \
     AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
 

include/internal/pycore_frame.h

@@ -94,7 +94,10 @@ static inline void _PyFrame_StackPush(_PyInterpreterFrame *f, PyObject *value) {
 
 void _PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest);
 
-/* Consumes reference to func */
+/* Consumes reference to func and locals.
+   Does not initialize frame->previous, which happens
+   when frame is linked into the frame stack.
+ */
 static inline void
 _PyFrame_InitializeSpecials(
     _PyInterpreterFrame *frame, PyFunctionObject *func,

include/patchlevel.h

@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        11
-#define PY_MICRO_VERSION        0
+#define PY_MICRO_VERSION        2
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.11.0"
+#define PY_VERSION              "3.11.2"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

src/api/command.cpp

@@ -2,6 +2,8 @@
 
 #include <llapi/LoggerAPI.h>
 
+#include <llapi/mc/CommandBlockName.hpp>
+#include <llapi/mc/CommandBlockNameResult.hpp>
 #include <llapi/mc/Dimension.hpp>
 #include <llapi/mc/ItemInstance.hpp>
 #include <llapi/mc/ItemStack.hpp>
@@ -69,8 +71,9 @@ py::object CastResult(const DynamicCommand::Result& result) {
                                       .value_or(ItemInstance::EMPTY_ITEM))));
     case DynamicCommand::ParameterType::Block:
       return py::cast(BlockClass(BlockInstance::createBlockInstance(
-          const_cast<Block*>(result.getRaw<Block const*>()), BlockPos::MIN,
-          -1)));
+          const_cast<Block*>(
+              result.getRaw<CommandBlockName>().resolveBlock(0).getBlock()),
+          BlockPos::MIN, -1)));
     case DynamicCommand::ParameterType::Effect:
       return py::str(result.getRaw<MobEffect const*>()->getResourceName());
     case DynamicCommand::ParameterType::Enum:

src/api/event.cpp

@@ -295,13 +295,13 @@ void EnableEventListener(EventCode event_code) {
       break;
     case EventCode::onMove:
       logger.warn("onMove was invaliable!");
-      //PlayerMoveEvent::subscribe([](const PlayerMoveEvent& ev) {
-      //  EVENT_BEGIN(EventCode::onMove);
-      //  EVENT_INSERT(Player);
-      //  EVENT_INSERT(Pos);
-      //  EVENT_END;
-      //});
-      //break;
+      // PlayerMoveEvent::subscribe([](const PlayerMoveEvent& ev) {
+      //   EVENT_BEGIN(EventCode::onMove);
+      //   EVENT_INSERT(Player);
+      //   EVENT_INSERT(Pos);
+      //   EVENT_END;
+      // });
+      // break;
     case EventCode::onChangeSprinting:
       PlayerSprintEvent::subscribe([](const PlayerSprintEvent& ev) {
         EVENT_BEGIN(EventCode::onChangeSprinting);
@@ -626,9 +626,9 @@ void EnableEventListener(EventCode event_code) {
         EVENT_END;
       });
       break;
-    case EventCode::onMobSpawn:
-      MobSpawnEvent::subscribe([](const MobSpawnEvent& ev) {
-        EVENT_BEGIN(EventCode::onMobSpawn);
+    case EventCode::onMobTrySpawn:
+      MobTrySpawnEvent::subscribe([](const MobTrySpawnEvent& ev) {
+        EVENT_BEGIN(EventCode::onMobTrySpawn);
         EVENT_INSERT(TypeName);
         EVENT_INSERT(Pos);
         EVENT_INSERT(DimensionId);