DR -> DR SDK #16

Merged
shenjackyuanjie merged 41 commits from feature/dr-sdk into main 2023-05-03 00:40:53 +08:00
24 changed files with 12 additions and 16 deletions
Showing only changes of commit 93b6f70dab - Show all commits

View File

@ -1,4 +1,4 @@
Set-Location .\libs\Difficult_Rocket_rs\src
Set-Location .\mods\dr_game\Difficult_Rocket_rs\src
Write-Output $args[0]
@ -25,4 +25,4 @@ if ($do -or "311" -in $args) {
python3.8 post_build.py
Set-Location ..\..\..\
Set-Location ..\..\..\..\

View File

@ -35,7 +35,7 @@
- `game.config`
- 已删除
- Removed
- `DR_option` & `DR_runtime`
- `DR_option` & `DR_runtime`(`long_version` `15`)
- 完全移除 `DR_rust` 部分
- Completely removed the `DR_rust` part

Binary file not shown.

View File

@ -3,22 +3,16 @@
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
import os
import sys
import shutil
from setuptools import setup
from setuptools_rust import Binding, RustExtension
sys.path.append('../../../')
sys.path.append(os.curdir)
if '../../../' in sys.path:
from Difficult_Rocket import DR_runtime
package_path = 'Difficult_Rocket_rs'
setup(
name='Difficult_Rocket_rs',
version=DR_runtime.DR_Rust_version.__str__(),
version="0.2.6.2",
author='shenjackyuanjie',
author_email='3695888@qq.com',
rust_extensions=[RustExtension(target="Difficult_Rocket_rs.Difficult_Rocket_rs",

View File

@ -28,7 +28,7 @@ class _DR_mod_runtime(Options):
def init(self, **kwargs) -> None:
try:
from libs.Difficult_Rocket_rs import get_version_str
from .Difficult_Rocket_rs import get_version_str
self.DR_rust_get_version = Version(get_version_str())
self.DR_rust_available = True
if self.DR_rust_get_version != self.DR_rust_version:
@ -36,7 +36,12 @@ class _DR_mod_runtime(Options):
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')
self.use_DR_rust = self.use_DR_rust and self.DR_rust_available
except ImportError as e:
except Exception as e:
try:
from .Difficult_Rocket_rs import get_version_str
print(type(get_version_str))
except:
...
traceback.print_exc()
self.DR_rust_available = False
self.use_DR_rust = False

View File

@ -35,7 +35,7 @@ if TYPE_CHECKING:
from Difficult_Rocket.client import ClientWindow
if DR_mod_runtime.use_DR_rust:
from libs.Difficult_Rocket_rs import CenterCamera_rs, SR1PartList_rs
from .Difficult_Rocket_rs import CenterCamera_rs, SR1PartList_rs
logger = logging.getLogger('client')