diff --git a/Difficult_Rocket/client/__init__.py b/Difficult_Rocket/client/__init__.py index 6670548..0cf97d7 100644 --- a/Difficult_Rocket/client/__init__.py +++ b/Difficult_Rocket/client/__init__.py @@ -20,6 +20,15 @@ import traceback from typing import List, Union from decimal import Decimal +# third function +import tomlkit +import pyglet +# from pyglet import gl +from pyglet.gl import * +# from pyglet.libs.win32 import _user32 +from pyglet.window import Window +from pyglet.window import key, mouse + # Difficult_Rocket function from Difficult_Rocket import Options, DR_runtime from Difficult_Rocket.command import line, tree @@ -32,14 +41,6 @@ from Difficult_Rocket.client.fps.fps_log import FpsLogger from Difficult_Rocket.client.guis.widgets import InputBox from Difficult_Rocket.exception.command import CommandError -import tomlkit -import pyglet -# from pyglet import gl -from pyglet.gl import * -# from pyglet.libs.win32 import _user32 -from pyglet.window import Window -from pyglet.window import key, mouse - class Client: def __init__(self, net_mode='local'): diff --git a/Difficult_Rocket/client/render/sr1_ship.py b/Difficult_Rocket/client/render/sr1_ship.py new file mode 100644 index 0000000..50d4925 --- /dev/null +++ b/Difficult_Rocket/client/render/sr1_ship.py @@ -0,0 +1,12 @@ +# ------------------------------- +# Difficult Rocket +# Copyright © 2021-2022 by shenjackyuanjie 3695888@qq.com +# All rights reserved +# ------------------------------- + +# third party package +from defusedxml.ElementTree import parse + +# Difficult Rocket +from Difficult_Rocket.client.screen import BaseScreen + diff --git a/Difficult_Rocket/main.py b/Difficult_Rocket/main.py index 4da0294..60722fb 100644 --- a/Difficult_Rocket/main.py +++ b/Difficult_Rocket/main.py @@ -22,7 +22,7 @@ if __name__ == '__main__': # been start will not run this sys.path.append('/bin/libs') sys.path.append('/bin') -from Difficult_Rocket import client, server, DR_option +from Difficult_Rocket import client, DR_option from Difficult_Rocket.utils import tools from Difficult_Rocket.utils.translate import tr @@ -56,7 +56,6 @@ class Game: def setup(self) -> None: self.client = client.Client(net_mode='local') - self.server = server.Server(net_mode='local') def python_version_check(self) -> None: # best 3.8+ and write at 3.8.10 self.logger.info('{} {}'.format(tr['main']['version.now_on'], self.on_python_v)) @@ -69,7 +68,6 @@ class Game: # @new_thread('main') def _start(self): - self.server.run() threaded = False if threaded: try: diff --git a/pyproject.toml b/pyproject.toml index 78b19b6..b505e79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,8 +18,9 @@ setuptools = "^65.5.0" viztracer = "^0.15.4" vizplugins = "^0.1.2" Cython = "^0.29.32" +defusedxml = "*" [build-system] -requires = ["poetry-core"] +requires = ["setuptools"] build-backend = "poetry.core.masonry.api" diff --git a/requirement.txt b/requirement.txt index 3033524..4b67b52 100644 --- a/requirement.txt +++ b/requirement.txt @@ -2,7 +2,7 @@ psutil pillow objprint # selenium - +defusedxml tomlkit pymunk rtoml