From b903edebc2cafc66c61b4583da6abea937882981 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Tue, 2 May 2023 15:50:50 +0800 Subject: [PATCH] =?UTF-8?q?DR=5Frs=20=E5=AE=8C=E5=85=A8=E8=A7=A3=E8=80=A6?= =?UTF-8?q?=20=EF=BC=88=E4=BF=AE=E5=A4=8D=E4=BA=86=20mods=20=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E4=BC=9A=E5=B4=A9=E6=BA=83=E7=9A=84bug=EF=BC=88?= =?UTF-8?q?=E6=8C=87=E4=B8=8A=E4=B8=80=E4=B8=AAcommit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Difficult_Rocket/__init__.py | 25 +++---------------------- docs/src/update_logs.md | 7 ++++++- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index d31da66..df1e4cd 100644 --- a/Difficult_Rocket/__init__.py +++ b/Difficult_Rocket/__init__.py @@ -14,6 +14,7 @@ from pathlib import Path from typing import Optional, List, Tuple from Difficult_Rocket.api.types import Options +from Difficult_Rocket.utils.new_thread import new_thread from libs.MCDR.version import Version @@ -22,14 +23,10 @@ build_version = Version("1.2.1.0") # 编译文件版本(与游戏本体无关) Api_version = Version("0.0.2.0") # API 版本 __version__ = game_version -# TODO 解耦 DR SDK 与 DR_mod 和 DR_rs -DR_rust_version = Version("0.2.6.2") # DR 的 Rust 编写部分的版本 -# 后面会移除的 DR_rs 相关信息 -# DR_rs和 DR_mod 的部分正在和 DR SDK 解耦 - -long_version: int = 14 +long_version: int = 15 """ long_version: 一个用于标记内部协议的整数 +15: 完全移除 DR_rust 相关内容 解耦完成 14: BaseScreen 的每一个函数都添加了一个参数: window: "ClientWindow" 13: 为 DR_runtime 添加 API_version 12: 去除 DR_runtime 的 global_logger @@ -65,7 +62,6 @@ class _DR_option(Options): DR_rust_available: bool = False use_cProfile: bool = False use_local_logging: bool = False - # use_DR_rust: bool = True # tests playing: bool = False @@ -93,9 +89,6 @@ class _DR_runtime(Options): DR_long_version: int = long_version # DR SDK 内部协议版本 （不要问我为什么不用 Version，我也在考虑） DR_Mod_List: List[Tuple[str, Version]] = [] # DR Mod 列表 (name, version) - - DR_Rust_version: Version = DR_rust_version # 后面要去掉的 DR_rs 版本 - DR_Rust_get_version: Optional[Version] = None # 后面也要去掉的 DR_rs 版本 # run status running: bool = False @@ -111,15 +104,6 @@ class _DR_runtime(Options): language: str = 'zh-CN' default_language: str = 'zh-CN' - def init(self, **kwargs) -> None: - with contextlib.suppress(ImportError): - from libs.Difficult_Rocket_rs import get_version_str - self.DR_Rust_get_version = Version(get_version_str()) - if self.DR_Rust_get_version != self.DR_Rust_version: - relationship = 'larger' if self.DR_Rust_version > self.DR_Rust_get_version else 'smaller' - warnings.warn(f'DR_rust builtin version is {self.DR_Rust_version} but true version is {get_version_str()}.\n' - f'Builtin version {relationship} than true version') - def load_file(self) -> bool: with contextlib.suppress(FileNotFoundError): with open('./configs/main.toml', 'r', encoding='utf-8') as f: @@ -165,9 +149,6 @@ DR_option = _DR_option() DR_runtime = _DR_runtime() if DR_option.playing: - from Difficult_Rocket.utils import new_thread - - def think_it(something): return something diff --git a/docs/src/update_logs.md b/docs/src/update_logs.md index 5b63528..5936995 100644 --- a/docs/src/update_logs.md +++ b/docs/src/update_logs.md @@ -22,17 +22,22 @@ - [![Readme-gitee](https://img.shields.io/badge/Readme-中文(点我!)-blue.svg?style=flat-square)](../../README.md) - Using [SemVer 2.0.0](https://semver.org/) to manage version -## 202305 DR `0.8.0.0` + DR_api `0.1.0.0` +## 202305 DR `0.8.0.0` + DR_api `0.1.0.0` + 15 > 啊哈！ mod 加载来啦！ > 啊啊啊啊啊 大重构 api + + ### Remove - `game.config` - 已删除 - Removed +- `DR_option` & `DR_runtime` + - 完全移除 `DR_rust` 部分 + - Completely removed the `DR_rust` part ### Changes