1.7.11update, preliminary adaptation 1.17.31.01.

twoone-3 · Sep 30, 2021 · 6ea3608 · 6ea3608
1 parent c5a18ec
commit 6ea3608
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/DllMain.cpp b/DllMain.cpp
@@ -819,10 +819,8 @@ void Init() {
 	if (!exists(CACHE_PATH))
 		create_directory(CACHE_PATH);
 	//检测服务端版本
-	if (!GetBDSVersion()._Starts_with("1.17.11.01")) {
-		cerr << "[BDSpyrunner] The server version isn't the latest version, unknown problems may occur if you continue to use it" << endl;
-		exit(-1);
-	}
+	if (!GetBDSVersion()._Starts_with("1.17.31.01"))
+		Py_FatalError("[BDSpyrunner] The server version isn't the latest version, unknown problems may occur if you continue to use it");
 	//将plugins/py加入模块搜索路径
 	Py_SetPath((wstring(PLUGIN_PATH L";") + Py_GetPath()).c_str());
 #if 0
@@ -845,7 +843,7 @@ void Init() {
 	for (auto& info : directory_iterator(PLUGIN_PATH)) {
 		//whether the file is py
 		if (info.path().extension() == ".py") {
-			string name = info.path().stem().u8string();
+			string name(GbkToUtf8(info.path().stem().string().c_str()));
 			//ignore files starting with '_'
 			if (name.front() == '_')
 				continue;

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ![Liscense](https://img.shields.io/github/license/twoone-3/BDSpyrunner)
 ![Downloads](https://img.shields.io/github/downloads/twoone-3/BDSpyrunner/total)
 ![Release](https://img.shields.io/github/v/release/twoone-3/BDSpyrunner)
-![BDS](https://img.shields.io/badge/support--BDS--version-1.17.11.01-blue)
+![BDS](https://img.shields.io/badge/support--BDS--version-1.17.31.01-blue)
 
 [简体中文](README_ZH.md) | English
 # Introduction

diff --git a/README_ZH.md b/README_ZH.md
@@ -2,7 +2,7 @@
 ![Liscense](https://img.shields.io/github/license/twoone-3/BDSpyrunner)
 ![Downloads](https://img.shields.io/github/downloads/twoone-3/BDSpyrunner/total)
 ![Release](https://img.shields.io/github/v/release/twoone-3/BDSpyrunner)
-![BDS](https://img.shields.io/badge/support--BDS--version-1.17.11.01-blue)
+![BDS](https://img.shields.io/badge/support--BDS--version-1.17.31.01-blue)
 
 简体中文 | [English](README.md)
 # 简介

diff --git a/mod/Module.cpp b/mod/Module.cpp
@@ -286,7 +286,6 @@ static PyMethodDef Methods[]{
 	{"getBDSVersion", getBDSVersion, METH_NOARGS, nullptr},
 	{"logout", logout, METH_VARARGS, nullptr},
 	{"runcmd", runCommand, METH_VARARGS, nullptr},
-	{"runCommand", runCommand, METH_VARARGS, nullptr},
 	{"setListener", setListener, METH_VARARGS, nullptr},
 	{"setCommandDescription", setCommandDescription, METH_VARARGS, nullptr},
 	{"getPlayerByXuid", getPlayerByXuid, METH_VARARGS, nullptr},

diff --git a/mod/Version.h b/mod/Version.h
@@ -1,5 +1,5 @@
 #pragma once
 constexpr unsigned VERSION_1 = 1;
 constexpr unsigned VERSION_2 = 7;
-constexpr unsigned VERSION_3 = 10;
-constexpr const char* VERSION_STRING = "v1.7.10";
+constexpr unsigned VERSION_3 = 11;
+constexpr const char* VERSION_STRING = "v1.7.11";